Skip to content

Commit dd387f8

Browse files
dirtycajunricedirtycajunrice
authored
Merge pull request #353 from pyouroboros/pipeline-and-dependancy
v1.4.3 to develop
2 parents 646cb95 + c68a635 commit dd387f8

File tree

5 files changed

+168
-146
lines changed

5 files changed

+168
-146
lines changed

‎.gitlab-ci.yml‎

Lines changed: 148 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
stages:
2+
- test
3+
- build and push
4+
- manifests
5+
- release
6+
7+
.common_build: &common_build
8+
image: docker:stable
9+
stage: build and push
10+
variables:
11+
DOCKER_HOST: tcp://docker:2375/
12+
DOCKER_DRIVER: overlay2
13+
services:
14+
- docker:dind
15+
except:
16+
- tags
17+
only:
18+
changes:
19+
- "Dockerfile*"
20+
- ouroboros
21+
- pyouroboros/*
22+
- .gitlab-ci.yml
23+
before_script:
24+
- mkdir $HOME/.docker
25+
- echo '{"experimental":"enabled"}' > $HOME/.docker/config.json
26+
- if [[ $CI_COMMIT_REF_NAME == "master" ]]; then
27+
export TAG=$(grep -i version varken/__init__.py | cut -d \ -f3 | tr -d \");
28+
else
29+
export TAG="develop";
30+
fi
31+
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USER" --password-stdin
32+
- export CI_PROJECT_PATH=$(echo $CI_PROJECT_PATH | tr "[:upper:]" "[:lower:]")
33+
34+
.common_release: &common_release
35+
<<: *common_build
36+
tags:
37+
- docker
38+
- shared
39+
only:
40+
refs:
41+
- master
42+
43+
flake8:
44+
image: python:3.7.3-alpine
45+
stage: test
46+
cache:
47+
key: "ouroboros-cache"
48+
paths:
49+
- .cache/pip
50+
- venv/
51+
variables:
52+
PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
53+
tags:
54+
- shared
55+
before_script:
56+
- python -m venv venv
57+
- source venv/bin/activate
58+
- pip install -U flake8
59+
script:
60+
- flake8 --max-line-length 120 ouroboros *.py pyouroboros/*.py
61+
62+
amd64:
63+
<<: *common_build
64+
tags:
65+
- docker
66+
- shared
67+
script:
68+
- docker build --pull
69+
--cache-from "$CI_PROJECT_PATH":"$TAG-amd64"
70+
-t "$CI_PROJECT_PATH":"$TAG-amd64" .
71+
- docker push "$CI_PROJECT_PATH":"$TAG-amd64"
72+
73+
armv6:
74+
<<: *common_build
75+
tags:
76+
- docker
77+
- arm
78+
script:
79+
- docker build --pull
80+
--cache-from "$CI_PROJECT_PATH":"$TAG-arm"
81+
-t "$CI_PROJECT_PATH":"$TAG-arm"
82+
-f Dockerfile.arm .
83+
- docker push "$CI_PROJECT_PATH":"$TAG-arm"
84+
85+
arm64v8:
86+
<<: *common_build
87+
tags:
88+
- docker
89+
- arm64
90+
script:
91+
- docker build --pull
92+
--cache-from "$CI_PROJECT_PATH":"$TAG-arm64"
93+
-t "$CI_PROJECT_PATH":"$TAG-arm64"
94+
-f Dockerfile.arm64 .
95+
- docker push "$CI_PROJECT_PATH":"$TAG-arm64"
96+
97+
versioned:
98+
<<: *common_build
99+
stage: manifests
100+
tags:
101+
- docker
102+
- shared
103+
script:
104+
- docker manifest create "$CI_PROJECT_PATH":"$TAG"
105+
"$CI_PROJECT_PATH":"$TAG-amd64"
106+
"$CI_PROJECT_PATH":"$TAG-arm64"
107+
"$CI_PROJECT_PATH":"$TAG-arm"
108+
- docker manifest push -p "$CI_PROJECT_PATH":"$TAG"
109+
110+
latest:
111+
<<: *common_release
112+
stage: manifests
113+
tags:
114+
- docker
115+
script:
116+
- docker manifest create "$CI_PROJECT_PATH":latest
117+
"$CI_PROJECT_PATH":"$TAG-amd64"
118+
"$CI_PROJECT_PATH":"$TAG-arm64"
119+
"$CI_PROJECT_PATH":"$TAG-arm"
120+
- docker manifest push -p "$CI_PROJECT_PATH":latest
121+
122+
github:
123+
<<: *common_release
124+
stage: release
125+
script:
126+
- apk add git
127+
- git remote set-url origin "https://$GITHUB_USER:[email protected]/$CI_PROJECT_PATH.git"
128+
- git tag $TAG
129+
- git push --tags
130+
131+
pypi:
132+
image: python:3.7.3-alpine
133+
stage: release
134+
cache:
135+
key: "ouroboros-cache"
136+
paths:
137+
- .cache/pip
138+
- venv/
139+
variables:
140+
PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
141+
tags:
142+
- shared
143+
before_script:
144+
- python -m venv venv
145+
- source venv/bin/activate
146+
- pip install -U twine
147+
script:
148+
- venv/bin/python setup.py sdist && venv/bin/python -m twine upload --skip-existing -u ${PYPI_CREDS_USR} -p ${PYPI_CREDS_PSW} dist/*

‎CHANGELOG.md‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,28 @@
11
# Change Log
22

3-
## [1.4.2](https://github.com/pyouroboros/ouroboros/tree/1.4.2) (2019-07-31)
4-
[Full Changelog](https://github.com/pyouroboros/ouroboros/compare/v1.4.1...1.4.2)
3+
## [1.4.3](https://github.com/pyouroboros/ouroboros/tree/1.4.3) (2019-12-11)
4+
[Full Changelog](https://github.com/pyouroboros/ouroboros/compare/1.4.3...1.4.2)
55

6-
**Closed issues:**
6+
**Fixed bugs:**
77

88
- Join Notifications truncated and icon returning 404 [\#325](https://github.com/pyouroboros/ouroboros/issues/325)
99

10-
## [1.4.1](https://github.com/pyouroboros/ouroboros/tree/1.4.1) (2019-06-03)
11-
[Full Changelog](https://github.com/pyouroboros/ouroboros/compare/v1.4.0...1.4.1)
10+
**Other Pull Requests**
1211

13-
**Closed issues:**
12+
- v1.4.3 Merge [\#354](https://github.com/pyouroboros/ouroboros/pull/354) ([DirtyCajunRice](https://github.com/DirtyCajunRice))
13+
- v1.4.3 to develop [\#353](https://github.com/pyouroboros/ouroboros/pull/353) ([DirtyCajunRice](https://github.com/DirtyCajunRice))
14+
- Update requirements.txt [\#349](https://github.com/pyouroboros/ouroboros/pull/349) ([nemchik](https://github.com/nemchik))
1415

15-
- Slack won't work [\#313](https://github.com/pyouroboros/ouroboros/issues/313)
16+
## [1.4.2](https://github.com/pyouroboros/ouroboros/tree/1.4.2) (2019-08-01)
17+
[Full Changelog](https://github.com/pyouroboros/ouroboros/compare/1.4.1...1.4.2)
18+
19+
**Other Pull Requests**
20+
21+
- 1.4.2 Merge [\#327](https://github.com/pyouroboros/ouroboros/pull/327) ([circa10a](https://github.com/circa10a))
22+
- 1.4.2 to develop [\#326](https://github.com/pyouroboros/ouroboros/pull/326) ([circa10a](https://github.com/circa10a))
23+
24+
## [1.4.1](https://github.com/pyouroboros/ouroboros/tree/1.4.1) (2019-06-04)
25+
[Full Changelog](https://github.com/pyouroboros/ouroboros/compare/v1.4.0...1.4.1)
1626

1727
**Other Pull Requests**
1828

‎Jenkinsfile‎

Lines changed: 0 additions & 136 deletions
This file was deleted.

‎pyouroboros/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
VERSION = "1.4.2"
1+
VERSION = "1.4.3"
22
BRANCH = "master"

‎requirements.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ docker>=3.7.0
22
prometheus_client>=0.5.0
33
requests>=2.21.0
44
influxdb>=5.2.1
5-
apprise>=0.7.9
6-
apscheduler>=3.5.3
5+
apprise>=0.8.2
6+
apscheduler>=3.5.3

0 commit comments

Comments
 (0)