Skip to content

Commit 6fd1519

Browse files
committed
Reorder deployment stages (GitHub release first)
1 parent 260470c commit 6fd1519

File tree

3 files changed

+18
-13
lines changed

3 files changed

+18
-13
lines changed

.travis.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,6 @@ jobs:
2626
# This happens completely outside of the CI, however.
2727

2828
# Deploy stages are separated for easier inspection of output.
29-
- stage: 'Deploy to PyPI'
30-
if: tag IS present
31-
install: skip
32-
script: skip
33-
deploy:
34-
- provider: pypi
35-
username: __token__
36-
password:
37-
secure: U6JJcByjLv2PutUpnpqDT7cNIUYu9Ap9t4G90KULEn6Syxa49aX14BT6k2jBakWbQgrPCxLLNSWeCoC4xPl/Z2/9HLEFxZLVovtVbiaJ8HrTcoWmEZijnGob9Ofh94TFP8VtifjqHXeIrPi78XyZEks/ed0Sj3jSH4BL74PDHvqbD1RnsezFm4QGI2ESOWY+laJ2ralcpHRJh0hJb0QHxOpbKPVM+QefiFs+VFkFP25hQcn/G3qdduzW5NQ8OHBYCbevy6/1yt/M67ZzAeA0n4UrkZ/3vBsMJJ3wynWWZ3xO+lGs6eqZ31E8vicogYbw5hXs119JRkKUrcU5uqVL1mogf8N6y76w2xNV6Aul/XtpBiuPQsHm0tChwTI6yyGzAZBRPMB1KzRclDKGQThIBhpX+wfqHSpvdj1CZV5AMm3+6nHA0LSGWiuJ1BW7pTrAp9YFPbrQfH59JWMhy8ng5lexcQQj7spSO/DPw0VMIfUiw644BfSfyZwls5du4yYfWOkd8RoELEa2IGqCp1sTqjWvSuX3nzKCbJhxAwrVU5mK9fiMPcL1jURIwlFvooI+qKAp3CdGZ1IM+HFmpzXym2kvZvmrNXduVSZcqG3DrCFxt77FYsN5SNB/uly1vLq/6Y0BaCw9ao6YWfW3fvU2cCcyejjzPyfGzZ2jA5uOpZ8=
38-
distributions: "sdist bdist_wheel"
39-
on: { tags: true }
40-
4129
- stage: 'Build rpm & deploy to GitHub Releases'
4230
if: tag IS present
4331
install: skip
@@ -51,6 +39,18 @@ jobs:
5139
file: dist/git-machete-*.noarch.rpm
5240
on: { tags: true }
5341

42+
- stage: 'Deploy to PyPI'
43+
if: tag IS present
44+
install: skip
45+
script: skip
46+
deploy:
47+
- provider: pypi
48+
username: __token__
49+
password:
50+
secure: U6JJcByjLv2PutUpnpqDT7cNIUYu9Ap9t4G90KULEn6Syxa49aX14BT6k2jBakWbQgrPCxLLNSWeCoC4xPl/Z2/9HLEFxZLVovtVbiaJ8HrTcoWmEZijnGob9Ofh94TFP8VtifjqHXeIrPi78XyZEks/ed0Sj3jSH4BL74PDHvqbD1RnsezFm4QGI2ESOWY+laJ2ralcpHRJh0hJb0QHxOpbKPVM+QefiFs+VFkFP25hQcn/G3qdduzW5NQ8OHBYCbevy6/1yt/M67ZzAeA0n4UrkZ/3vBsMJJ3wynWWZ3xO+lGs6eqZ31E8vicogYbw5hXs119JRkKUrcU5uqVL1mogf8N6y76w2xNV6Aul/XtpBiuPQsHm0tChwTI6yyGzAZBRPMB1KzRclDKGQThIBhpX+wfqHSpvdj1CZV5AMm3+6nHA0LSGWiuJ1BW7pTrAp9YFPbrQfH59JWMhy8ng5lexcQQj7spSO/DPw0VMIfUiw644BfSfyZwls5du4yYfWOkd8RoELEa2IGqCp1sTqjWvSuX3nzKCbJhxAwrVU5mK9fiMPcL1jURIwlFvooI+qKAp3CdGZ1IM+HFmpzXym2kvZvmrNXduVSZcqG3DrCFxt77FYsN5SNB/uly1vLq/6Y0BaCw9ao6YWfW3fvU2cCcyejjzPyfGzZ2jA5uOpZ8=
51+
distributions: 'sdist bdist_wheel'
52+
on: { tags: true }
53+
5454
- stage: 'Open PR to NixOS/nixpkgs' # Artifacts must be released to PyPI first
5555
if: tag IS present
5656
install: skip

RELEASE_NOTES.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Release notes
22

3+
## New in git-machete 2.13.5
4+
5+
- fixed: build of rpm package
6+
- improved: organization of deployment stages on CI
7+
38
## New in git-machete 2.13.4
49

510
- added: automatic opening of a PR to NixOS/nixpkgs on each release

git_machete/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '2.13.4'
1+
__version__ = '2.13.5'

0 commit comments

Comments
 (0)