From 3f691ab2a16bd6920a9d99ab6a25a4fd1c6f391f Mon Sep 17 00:00:00 2001
From: Elvis Pranskevichus <elvis@edgedb.com>
Date: Tue, 10 Aug 2021 10:34:30 -0700
Subject: [PATCH] Workflow touchups

---
 .github/workflows/release.yml | 14 ++++++++++----
 .github/workflows/tests.yml   |  9 ++++++++-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4cd54fc9..a3ec0c6a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -46,6 +46,9 @@ jobs:
     needs: validate-release-request
     runs-on: ubuntu-latest
 
+    env:
+      PIP_DISABLE_PIP_VERSION_CHECK: 1
+
     steps:
     - uses: actions/checkout@v2
       with:
@@ -85,6 +88,9 @@ jobs:
       run:
         shell: bash
 
+    env:
+      PIP_DISABLE_PIP_VERSION_CHECK: 1
+
     steps:
     - uses: actions/checkout@v2
       with:
@@ -107,12 +113,12 @@ jobs:
         CIBW_BUILD_VERBOSITY: 1
         CIBW_BUILD: ${{ matrix.cibw_python }}
         CIBW_ARCHS: ${{ matrix.cibw_arch }}
+        # This is needed for now because cffi has no cp310 wheels
+        CIBW_BEFORE_ALL_LINUX: "yum -y install libffi-devel"
         CIBW_TEST_EXTRAS: "test"
-        CIBW_TEST_COMMAND: "cd .. && python {project}/tests/__init__.py"
-        CIBW_TEST_COMMAND_WINDOWS: "cd .. && python {project}\\tests\\__init__.py"
+        CIBW_TEST_COMMAND: "python {project}/tests/__init__.py"
+        CIBW_TEST_COMMAND_WINDOWS: "python {project}\\tests\\__init__.py"
         CIBW_TEST_SKIP: "*universal2:arm64"
-        # This is needed for now because cffi has no cp310 wheels
-        CIBW_BEFORE_BUILD_LINUX: "yum -y install libffi-devel"
 
     - uses: actions/upload-artifact@v2
       with:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 3931bfe1..d6ce8890 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -17,6 +17,9 @@ jobs:
         python-version: [3.7, 3.8, 3.9, 3.10.0-rc.1]
         os: [ubuntu-latest, macos-latest]
 
+    env:
+      PIP_DISABLE_PIP_VERSION_CHECK: 1
+
     steps:
     - uses: actions/checkout@v2
       with:
@@ -52,7 +55,11 @@ jobs:
     - name: Test
       if: steps.release.outputs.version == 0
       run: |
-        make distclean && make && make test
+        make test
+
+    - name: Test (debug build)
+      if: steps.release.outputs.version == 0
+      run: |
         make distclean && make debug && make test
 
   # This job exists solely to act as the test job aggregate to be