Merge branch 'main' into numpy2

letmaik · Jul 8, 2024 · 3b6c72f · 3b6c72f
2 parents ea17693 + b6dc175
commit 3b6c72f
Showing 1 changed file with 28 additions and 23 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -58,25 +58,25 @@ jobs:
           python-version: '3.12'
           numpy-version: '2.0.*'
 
-        - os-image: macos-11
+        - os-image: macos-12
           os-name: mac
           arch: x86_64
           macos-min-version: '10.9'
           python-version: '3.9'
           numpy-version: '2.0.*'
-        - os-image: macos-11
+        - os-image: macos-12
           os-name: mac
           arch: x86_64
           macos-min-version: '10.9'
           python-version: '3.10'
           numpy-version: '2.0.*'
-        - os-image: macos-11
+        - os-image: macos-12
           os-name: mac
           arch: x86_64
           macos-min-version: '10.9'
           python-version: '3.11'
           numpy-version: '2.0.*'
-        - os-image: macos-11
+        - os-image: macos-12
           os-name: mac
           arch: x86_64
           macos-min-version: '10.9'
@@ -127,23 +127,27 @@ jobs:
       security-events: write
 
     runs-on: ${{ matrix.config.os-image }}
-    container: ${{ matrix.config.docker-image }}
+    # For Linux, don't run all steps in container anymore to avoid issue with glibc versions.
+    # See https://github.com/actions/checkout/issues/1809.
+    # container: ${{ matrix.config.docker-image }}
 
     steps:
     - uses: actions/checkout@v3
       with:
         submodules: true
 
-    - name: Initialize CodeQL
-      if: matrix.config.python-version == '3.10'
-      uses: github/codeql-action/init@v2
-      with:
-        languages: python, cpp
-        setup-python-dependencies: false
+    # - name: Initialize CodeQL
+    #   if: matrix.config.python-version == '3.10'
+    #   uses: github/codeql-action/init@v3
+    #   with:
+    #     languages: python, cpp
+    #     setup-python-dependencies: false
 
     - name: Build wheel (Linux)
       if: matrix.config.os-name == 'linux'
-      run: .github/scripts/build-linux.sh
+      # See comment above.
+      # run: .github/scripts/build-linux.sh
+      run: docker run --rm -e PYTHON_VERSION -e NUMPY_VERSION -w /io -v `pwd`:/io ${{ matrix.config.docker-image }} /io/.github/scripts/build-linux.sh
       env:
         PYTHON_VERSION: ${{ matrix.config.python-version }}
         NUMPY_VERSION: ${{ matrix.config.numpy-version }}
@@ -178,11 +182,11 @@ jobs:
         name: wheels
         path: dist
 
-    - name: Perform CodeQL Analysis
-      if: matrix.config.python-version == '3.10'
-      uses: github/codeql-action/analyze@v2
-      with:
-        category: ${{ matrix.config.os-name }}
+    # - name: Perform CodeQL Analysis
+    #   if: matrix.config.python-version == '3.10'
+    #   uses: github/codeql-action/analyze@v3
+    #   with:
+    #     category: ${{ matrix.config.os-name }}
 
   test:
     strategy:
@@ -212,25 +216,25 @@ jobs:
           python-version: '3.12'
           numpy-version: '2.0.*'
 
-        - os-image: macos-11
+        - os-image: macos-12
           os-name: mac
           arch: x86_64
           macos-min-version: '10.9'
           python-version: '3.9'
           numpy-version: '2.0.*'
-        - os-image: macos-11
+        - os-image: macos-12
           os-name: mac
           arch: x86_64
           macos-min-version: '10.9'
           python-version: '3.10'
           numpy-version: '2.0.*'
-        - os-image: macos-11
+        - os-image: macos-12
           os-name: mac
           arch: x86_64
           macos-min-version: '10.9'
           python-version: '3.11'
           numpy-version: '2.0.*'
-        - os-image: macos-11
+        - os-image: macos-12
           os-name: mac
           arch: x86_64
           macos-min-version: '10.9'
@@ -278,7 +282,7 @@ jobs:
           numpy-version: '2.0.*'
 
     runs-on: ${{ matrix.config.os-image }}
-    container: ${{ matrix.config.docker-image }}
+    # container: ${{ matrix.config.docker-image }}
 
     needs: build
 
@@ -295,7 +299,8 @@ jobs:
 
     - name: Test wheel (Linux)
       if: matrix.config.os-name == 'linux'
-      run: .github/scripts/test-linux.sh
+      # run: .github/scripts/test-linux.sh
+      run: docker run --rm -e PYTHON_VERSION -w /io -v `pwd`:/io ${{ matrix.config.docker-image }} /io/.github/scripts/test-linux.sh
       env:
         PYTHON_VERSION: ${{ matrix.config.python-version }}