Skip to content

Commit 4215d45

Browse files
committed
Fix release workflow to test the right wheels
Also removed no-longer-used "trigger" workflow.
1 parent f07f108 commit 4215d45

File tree

3 files changed

+28
-28
lines changed

3 files changed

+28
-28
lines changed

Diff for: .github/workflows/release-trigger.yml

-25
This file was deleted.

Diff for: .github/workflows/release.yml

+21-3
Original file line numberDiff line numberDiff line change
@@ -73,20 +73,36 @@ jobs:
7373
strategy:
7474
matrix:
7575
python-version: [3.5, 3.6, 3.7, 3.8, 3.9]
76-
os: [ubuntu-16.04, macos-latest, windows-latest]
76+
os: [ubuntu-20.04, macos-latest, windows-latest]
7777
exclude:
7878
# Python 3.5 is unable to properly
7979
# find the recent VS tooling
8080
# https://bugs.python.org/issue30389
8181
- os: windows-latest
8282
python-version: 3.5
8383

84+
defaults:
85+
run:
86+
shell: bash
87+
8488
steps:
8589
- uses: actions/checkout@v1
8690
with:
8791
fetch-depth: 50
8892
submodules: true
8993

94+
- uses: actions/download-artifact@v1
95+
with:
96+
name: dist
97+
path: dist/
98+
99+
- name: Extract Release Version
100+
id: relver
101+
run: |
102+
set -e
103+
echo ::set-output name=version::$(cat dist/VERSION)
104+
rm dist/*
105+
90106
- name: Set up Python ${{ matrix.python-version }}
91107
uses: actions/setup-python@v1
92108
with:
@@ -114,9 +130,11 @@ jobs:
114130
if: |
115131
!startsWith(matrix.os, 'windows')
116132
&& !contains(github.event.pull_request.labels.*.name, 'skip wheel tests')
133+
env:
134+
OS: ${{ matrix.os }}
135+
PKG_VERSION: ${{ steps.relver.outputs.version }}
117136
run: |
118-
pip install --pre httptools -f "file:///${GITHUB_WORKSPACE}/dist"
119-
make -C "${GITHUB_WORKSPACE}" testinstalled
137+
"${GITHUB_WORKSPACE}/.github/workflows/test-wheels.sh"
120138
121139
- uses: actions/upload-artifact@v1
122140
with:

Diff for: .github/workflows/test-wheels.sh

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
3+
set -Eexuo pipefail
4+
shopt -s nullglob
5+
6+
pip install -f "file:///${GITHUB_WORKSPACE}/dist" "httptools[test]==${PKG_VERSION}"
7+
make -C "${GITHUB_WORKSPACE}" testinstalled

0 commit comments

Comments
 (0)