Skip to content

Commit 5797936

Browse files
authored
Github workflows touchups (#804)
Bump versions of various actions used in the workflow, add Python 3.10 to the release list and silence pointless pip warnings which get surfaced as error annotations.
1 parent 26e0660 commit 5797936

File tree

2 files changed

+29
-16
lines changed

2 files changed

+29
-16
lines changed

.github/workflows/release.yml

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
mkdir -p dist/
3838
echo "${VERSION}" > dist/VERSION
3939
40-
- uses: actions/upload-artifact@v1
40+
- uses: actions/upload-artifact@v2
4141
with:
4242
name: dist
4343
path: dist/
@@ -46,23 +46,24 @@ jobs:
4646
needs: validate-release-request
4747
runs-on: ubuntu-latest
4848

49+
env:
50+
PIP_DISABLE_PIP_VERSION_CHECK: 1
51+
4952
steps:
50-
- uses: actions/checkout@v1
53+
- uses: actions/checkout@v2
5154
with:
5255
fetch-depth: 50
5356
submodules: true
5457

55-
- name: Set up Python 3.7
56-
uses: actions/setup-python@v1
57-
with:
58-
python-version: 3.7
58+
- name: Set up Python
59+
uses: actions/setup-python@v2
5960

6061
- name: Build source distribution
6162
run: |
6263
pip install -U setuptools wheel pip
6364
python setup.py sdist
6465
65-
- uses: actions/upload-artifact@v1
66+
- uses: actions/upload-artifact@v2
6667
with:
6768
name: dist
6869
path: dist/
@@ -72,8 +73,8 @@ jobs:
7273
runs-on: ${{ matrix.os }}
7374
strategy:
7475
matrix:
75-
python-version: [3.6, 3.7, 3.8, 3.9]
76-
os: [ubuntu-20.04, macos-latest, windows-latest]
76+
python-version: [3.6, 3.7, 3.8, 3.9, 3.10.0.rc.1]
77+
os: [ubuntu-latest, macos-latest, windows-latest]
7778
arch: [x86_64]
7879
exclude:
7980
- os: windows-latest
@@ -85,8 +86,11 @@ jobs:
8586
run:
8687
shell: bash
8788

89+
env:
90+
PIP_DISABLE_PIP_VERSION_CHECK: 1
91+
8892
steps:
89-
- uses: actions/checkout@v1
93+
- uses: actions/checkout@v2
9094
with:
9195
fetch-depth: 50
9296
submodules: true
@@ -96,7 +100,7 @@ jobs:
96100
uses: docker/setup-qemu-action@v1
97101

98102
- name: Set up Python ${{ matrix.python-version }}
99-
uses: actions/setup-python@v1
103+
uses: actions/setup-python@v2
100104
with:
101105
python-version: ${{ matrix.python-version }}
102106

@@ -202,7 +206,7 @@ jobs:
202206
&& su -l test /github/workspace/.github/workflows/test-wheels.sh \
203207
'
204208
205-
- uses: actions/upload-artifact@v1
209+
- uses: actions/upload-artifact@v2
206210
with:
207211
name: dist
208212
path: dist/
@@ -211,6 +215,9 @@ jobs:
211215
needs: validate-release-request
212216
runs-on: ubuntu-latest
213217

218+
env:
219+
PIP_DISABLE_PIP_VERSION_CHECK: 1
220+
214221
steps:
215222
- name: Checkout source
216223
uses: actions/checkout@v2
@@ -255,12 +262,12 @@ jobs:
255262
runs-on: ubuntu-latest
256263

257264
steps:
258-
- uses: actions/checkout@v1
265+
- uses: actions/checkout@v2
259266
with:
260267
fetch-depth: 5
261268
submodules: false
262269

263-
- uses: actions/download-artifact@v1
270+
- uses: actions/download-artifact@v2
264271
with:
265272
name: dist
266273
path: dist/

.github/workflows/tests.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
# job.
1818
strategy:
1919
matrix:
20-
python-version: [3.6, 3.7, 3.8, 3.9, 3.10.0-beta.4]
20+
python-version: [3.6, 3.7, 3.8, 3.9, 3.10.0-rc.1]
2121
os: [ubuntu-latest, macos-latest, windows-latest]
2222
loop: [asyncio, uvloop]
2323
exclude:
@@ -34,6 +34,9 @@ jobs:
3434
run:
3535
shell: bash
3636

37+
env:
38+
PIP_DISABLE_PIP_VERSION_CHECK: 1
39+
3740
steps:
3841
- uses: actions/checkout@v2
3942
with:
@@ -85,6 +88,9 @@ jobs:
8588

8689
runs-on: ubuntu-latest
8790

91+
env:
92+
PIP_DISABLE_PIP_VERSION_CHECK: 1
93+
8894
steps:
8995
- uses: actions/checkout@v2
9096
with:
@@ -93,10 +99,10 @@ jobs:
9399

94100
- name: Check if release PR.
95101
uses: edgedb/action-release/validate-pr@master
96-
continue-on-error: true
97102
id: release
98103
with:
99104
github_token: ${{ secrets.RELEASE_BOT_GITHUB_TOKEN }}
105+
missing_version_ok: yes
100106
version_file: asyncpg/_version.py
101107
version_line_pattern: |
102108
__version__\s*=\s*(?:['"])([[:PEP440:]])(?:['"])

0 commit comments

Comments
 (0)