move CI to llvm 16

aguinet · Sep 9, 2023 · 70584aa · 70584aa
1 parent 95ee5ab
commit 70584aa
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/.github/workflows/dist_publish.yml b/.github/workflows/dist_publish.yml
@@ -20,13 +20,13 @@ jobs:
         path: llvm/install
         # TODO: would be really better to add the hash of the LLVM commit cloned
         # TODO: add "14.16" as a variable easy to replace
-        key: ${{ runner.os }}-llvm-release-13-msvc1416
+        key: ${{ runner.os }}-llvm-release-16-msvc1416
     - name: Get LLVM
       if: steps.cache-llvm.outputs.cache-hit != 'true'
       uses: actions/checkout@v2
       with:
         repository: 'llvm/llvm-project'
-        ref: 'release/13.x'
+        ref: 'release/16.x'
         path: 'llvm'
     - uses: ilammy/msvc-dev-cmd@v1
       if: steps.cache-llvm.outputs.cache-hit != 'true'
@@ -47,9 +47,9 @@ jobs:
     strategy:
       matrix:
         include:
-          - tag: "manylinux2010_x86_64"
+          - tag: "manylinux2014_x86_64"
             docker_host: quay.io/pypa
-          - tag: "manylinux2010_i686"
+          - tag: "manylinux2014_i686"
             docker_host: quay.io/pypa
           - tag: "manylinux2014_aarch64_cross_x64"
             docker_host: aguinet
@@ -95,16 +95,13 @@ jobs:
     strategy:
       matrix:
         tag:
-          - "manylinux2010_x86_64"
-          - "manylinux2010_i686"
+          - "manylinux2014_x86_64"
+          - "manylinux2014_i686"
           - "manylinux2014_aarch64_cross_x64"
         py_vers:
-          - "cp36-cp36m cp37-cp37m"
-          - "cp38-cp38 cp39-cp39"
-          - "cp310-cp310"
-        exclude:
-          - tag: "manylinux2014_aarch64_cross_x64"
-            py_vers: "cp310-cp310"
+          - "cp37-cp37m cp38-cp38 "
+          - "cp39-cp39 cp310-cp310"
+          - "cp311-cp311"
 
     env:
       PY_VERS: ${{ matrix.py_vers }}

diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
@@ -25,7 +25,7 @@ jobs:
         choco install ninja
         C:\Miniconda\condabin\conda.bat activate base
         C:\Miniconda\condabin\conda.bat update  -c conda-forge python
-        C:\Miniconda\condabin\conda.bat install -c conda-forge llvmdev==13.0.0 clangdev==13.0.0
+        C:\Miniconda\condabin\conda.bat install -c conda-forge llvmdev==16.0.0 clangdev==16.0.0
         python -m pip install --upgrade pip
         python -m pip install lit purectypes==0.2 six
         mkdir build