Skip to content

Commit 77580e0

Browse files
committed
Fix release workflow
1 parent 63a7bfe commit 77580e0

File tree

2 files changed

+45
-27
lines changed

2 files changed

+45
-27
lines changed

.github/workflows/release.yml

+37-22
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,32 @@ on:
77

88
jobs:
99

10-
prod:
11-
name: Release version
10+
wait:
11+
name: Wait for tests
1212
runs-on: ubuntu-latest
1313

1414
steps:
15-
- name: Wait for tests
16-
uses: fountainhead/[email protected]
15+
- uses: fountainhead/[email protected]
1716
id: wait-for-tests
1817
with:
1918
token: ${{ secrets.GITHUB_TOKEN }}
20-
checkName: Run tests
19+
checkName: Tests done
2120
ref: ${{ github.ref }}
2221
timeoutSeconds: 3600
2322

2423
- name: Fail the Build
2524
uses: cutenode/action-always-fail@v1
2625
if: steps.wait-for-tests.outputs.conclusion != 'success'
2726

27+
build:
28+
name: Build package
29+
runs-on: ubuntu-latest
30+
needs: [wait]
31+
strategy:
32+
matrix:
33+
python-version: ['2.7', '3.6']
34+
35+
steps:
2836
- name: Checkout code
2937
uses: actions/checkout@v2
3038

@@ -33,6 +41,8 @@ jobs:
3341

3442
- name: Set up Python ${{ matrix.python-version }}
3543
uses: actions/setup-python@v2
44+
with:
45+
python-version: ${{ matrix.python-version }}
3646

3747
- name: Cache pip
3848
uses: actions/cache@v2
@@ -48,15 +58,28 @@ jobs:
4858
- name: Upgrade pip
4959
run: python -m pip install --upgrade pip setuptools wheel twine
5060

51-
- name: Download artifacts
52-
uses: dawidd6/action-download-artifact@v2
53-
with:
54-
github_token: ${{ secrets.GITHUB_TOKEN }}
55-
workflow: test.yml
56-
workflow_conclusion: success
57-
name: dist
58-
path: ./dist/
61+
- name: Install dependencies
62+
run: pip install -r requirements.txt
63+
64+
- name: Build package
65+
run: python setup.py bdist_wheel sdist
66+
67+
- name: Check package
68+
run: twine check dist/*
69+
70+
- name: Publish package
71+
env:
72+
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
73+
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
74+
run: |
75+
twine upload --skip-existing dist/*
76+
77+
release:
78+
name: Release version
79+
runs-on: ubuntu-latest
80+
needs: [wait, build]
5981

82+
steps:
6083
- name: Create release
6184
id: create_release
6285
uses: actions/create-release@v1
@@ -66,12 +89,4 @@ jobs:
6689
tag_name: ${{ github.ref }}
6790
release_name: ${{ github.ref }}
6891
draft: false
69-
prerelease: false
70-
71-
- name: Build and publish
72-
env:
73-
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
74-
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
75-
TWINE_REPOSITORY_URL: dolfinus/setuptools-git-versioning
76-
run: |
77-
twine upload dist/*
92+
prerelease: false

.github/workflows/test.yml

+8-5
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,11 @@ jobs:
5555
- name: Build package
5656
run: python setup.py bdist_wheel sdist
5757

58-
- name: Push build artifacts
59-
uses: actions/upload-artifact@v2
60-
with:
61-
name: dist
62-
path: dist/*
58+
all_done:
59+
name: Tests done
60+
runs-on: ubuntu-latest
61+
needs: [tests]
62+
63+
steps:
64+
- name: All done
65+
run: echo 1

0 commit comments

Comments
 (0)