Fix release workflow to test the right wheels

fantix · fantix · commit 40404907f271 · 2021-04-26T11:56:29.000-04:00
Also removed no-longer-used "trigger" workflow.
diff --git a/.github/workflows/release-trigger.yml b/.github/workflows/release-trigger.yml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -73,20 +73,36 @@ jobs:
     strategy:
       matrix:
         python-version: [3.5, 3.6, 3.7, 3.8, 3.9]
-        os: [ubuntu-16.04, macos-latest, windows-latest]
+        os: [ubuntu-20.04, macos-latest, windows-latest]
         exclude:
           # Python 3.5 is unable to properly
           # find the recent VS tooling
           # https://bugs.python.org/issue30389
           - os: windows-latest
             python-version: 3.5
 
+    defaults:
+      run:
+        shell: bash
+
     steps:
     - uses: actions/checkout@v1
       with:
         fetch-depth: 50
         submodules: true
 
+    - uses: actions/download-artifact@v1
+      with:
+        name: dist
+        path: dist/
+
+    - name: Extract Release Version
+      id: relver
+      run: |
+        set -e
+        echo ::set-output name=version::$(cat dist/VERSION)
+        rm dist/*
+
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v1
       with:
@@ -114,9 +130,11 @@ jobs:
       if: |
         !startsWith(matrix.os, 'windows')
         && !contains(github.event.pull_request.labels.*.name, 'skip wheel tests')
+      env:
+        OS: ${{ matrix.os }}
+        PKG_VERSION: ${{ steps.relver.outputs.version }}
       run: |
-        pip install --pre httptools -f "file://github.com/${GITHUB_WORKSPACE}/dist"
-        make -C "${GITHUB_WORKSPACE}" testinstalled
+        "${GITHUB_WORKSPACE}/.github/workflows/test-wheels.sh"
 
     - uses: actions/upload-artifact@v1
       with:
diff --git a/.github/workflows/test-wheels.sh b/.github/workflows/test-wheels.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -Eexuo pipefail
+shopt -s nullglob
+
+pip install -f "file://github.com/${GITHUB_WORKSPACE}/dist" "httptools[test]==${PKG_VERSION}"
+make -C "${GITHUB_WORKSPACE}" testinstalled
