Update some CI settings.

scoder · Apr 3, 2023 · a566075 · a566075
1 parent 98de6c0
commit a566075
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,9 +10,28 @@ jobs:
       fail-fast: false
 
       matrix:
-        os: [windows-2019, ubuntu-20.04, macos-11, macos-12]
-        python-version: ["2.7", "3.11", "3.10", "3.9", "3.8", "3.7", "3.6", "pypy-2.7", "pypy-3.7", "pypy-3.8"]
-        lua-version: ["bundle", "lua5.3", "lua5.2", "luajit-5.1"]
+        os:
+          - windows-2019
+          - ubuntu-20.04
+          - macos-11
+          - macos-latest
+        python-version:
+          - "2.7"
+          - "3.11"
+          - "3.10"
+          - "3.9"
+          - "3.8"
+          - "3.7"
+          - "3.6"
+          - "pypy-2.7"
+          - "pypy-3.7"
+          - "pypy-3.8"
+          - "pypy-3.9"
+        lua-version:
+          - "bundle"
+          - "lua5.3"
+          - "lua5.2"
+          - "luajit-5.1"
 
         exclude:
           - os: windows-2019
@@ -37,23 +56,23 @@ jobs:
             lua-version: lua5.4
           - os: macos-11
             lua-version: luajit-5.1
-          - os: macos-12
+          - os: macos-latest
             python-version: 2.7
-          - os: macos-12
+          - os: macos-latest
             lua-version: lua5.2
-          - os: macos-12
+          - os: macos-latest
             lua-version: lua5.3
-          - os: macos-12
+          - os: macos-latest
             lua-version: lua5.4
-          - os: macos-12
+          - os: macos-latest
             lua-version: luajit-5.1
 
     runs-on: ${{ matrix.os }}
 
     env:
       CFLAGS_LTO: ${{ contains(matrix.lua-version, 'bundle')  && (contains(matrix.os, 'windows') && '/LTCG' || '-flto') || '' }}
       CFLAGS: ${{ contains(matrix.os, 'windows') && '/O2' || '-O2 -fPIC' }} -g
-      MACOSX_DEPLOYMENT_TARGET: "10.15"
+      MACOSX_DEPLOYMENT_TARGET: "11.0"
 
     steps:
     - uses: actions/checkout@v3
@@ -74,7 +93,7 @@ jobs:
       run: sudo apt-get install lib${{ matrix.lua-version }}-dev
 
     - name: Build wheel
-      run: python setup.py sdist ${{ contains(matrix.python-version, '3.') && 'build_ext -j5' || '' }} bdist_wheel ${{ contains(matrix.os, 'macos-12') && '--universal' || '' }}
+      run: python setup.py sdist ${{ contains(matrix.python-version, '3.') && 'build_ext -j5' || '' }} bdist_wheel
       env:
         SETUP_OPTIONS: ${{ !contains(matrix.lua-version, 'luajit') && (contains(matrix.lua-version, 'bundle') && '--use-bundle' || '--no-luajit') || '' }}
         CFLAGS: ${{ env.CFLAGS }} ${{ env.CFLAGS_LTO }}

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -126,7 +126,7 @@ jobs:
 
       matrix:
         os:
-          - macos-12
+          - macos-latest
           - windows-latest
         #os: [macos-11, windows-latest, macOS-M1]
         #os: [macos-11, macOS-M1]
@@ -149,7 +149,7 @@ jobs:
             python_version: 2.7
 
     runs-on: ${{ matrix.os }}
-    env: { MACOSX_DEPLOYMENT_TARGET: 10.15 }
+    env: { MACOSX_DEPLOYMENT_TARGET: 11.0 }
 
     steps:
     - uses: actions/checkout@v3