Merge pull request #456 from zodb/issue454

Temporarily pin to pypy 2.7-7.3.3
zodb · Apr 19, 2021 · 9c24aaf · 9c24aaf
2 parents b0553d8 + 7fb8890
commit 9c24aaf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.github/actions/config-cc/action.yml b/.github/actions/config-cc/action.yml
@@ -9,8 +9,8 @@ runs:
         if [ "`uname`" = "Darwin" ]; then
           brew update
           brew install ccache
-          echo CFLAGS=$CFLAGS -Wno-parentheses-equality -Wno-constant-logical-operand >> $GITHUB_ENV
-          echo CXXFLAGS=$CXXFLAGS -Wno-parentheses-equality -Wno-constant-logical-operand >> $GITHUB_ENV
+          echo CFLAGS=$CFLAGS -Wno-parentheses-equality -Wno-constant-logical-operand -stdlib=libc++ >> $GITHUB_ENV
+          echo CXXFLAGS=$CXXFLAGS -Wno-parentheses-equality -Wno-constant-logical-operand -stdlib=libc++ >> $GITHUB_ENV
           echo CC=ccache /usr/bin/clang >> $GITHUB_ENV
           echo CXX=ccache /usr/bin/clang++ >> $GITHUB_ENV
           echo LDCXXSHARED=ccache /usr/bin/clang -bundle -undefined dynamic_lookup >> $GITHUB_ENV

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -88,13 +88,13 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: [2.7, pypy-2.7, pypy-3.6, 3.6, 3.7, 3.8, 3.9]
+        python-version: [2.7, pypy-2.7-7.3.3, pypy-3.6, 3.6, 3.7, 3.8, 3.9]
         # ubuntu 18.04 ships with mysql 5.7; ubuntu 20.04 ships with
         # mysql 8.0
         os: [ubuntu-18.04, macos-latest]
         exclude:
           - os: macos-latest
-            python-version: pypy-2.7
+            python-version: pypy-2.7-7.3.3
           - os: macos-latest
             python-version: pypy-3.6
           - os: macos-latest
@@ -183,13 +183,13 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: [2.7, pypy-2.7, pypy-3.6, 3.6, 3.7, 3.8, 3.9]
+        python-version: [2.7, pypy-2.7-7.3.3, pypy-3.6, 3.6, 3.7, 3.8, 3.9]
         # ubuntu 18.04 ships with mysql 5.7; ubuntu 20.04 ships with
         # mysql 8.0
         os: [ubuntu-18.04, macos-latest]
         exclude:
           - os: macos-latest
-            python-version: pypy-2.7
+            python-version: pypy-2.7-7.3.3
           - os: macos-latest
             python-version: pypy-3.6
           - os: macos-latest
@@ -300,7 +300,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: [2.7, 3.9, pypy-2.7, pypy-3.6]
+        python-version: [2.7, 3.9, pypy-2.7-7.3.3, pypy-3.6]
         os: [ubuntu-18.04]
     services:
       # Label used to access the service container
@@ -417,6 +417,8 @@ jobs:
           key: ${{ runner.os }}-pip3-${{ matrix.python-version }}
           restore-keys: |
             ${{ runner.os }}-pip3-
+      - name: Install ccache, configure CFLAGS (ubuntu)
+        uses: ./.github/actions/config-cc
 
       - name: Download RelStorage wheel
         uses: actions/download-artifact@v2