update deploy scripts

potassco · Jun 21, 2024 · 15dd568 · 15dd568
1 parent 8330180
commit 15dd568
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 8 deletions.
diff --git a/.github/conda/conda_build_config.yaml b/.github/conda/conda_build_config.yaml
@@ -13,4 +13,5 @@ pin_run_as_build:
 
 # from https://github.com/phracker/MacOSX-SDKs
 CONDA_BUILD_SYSROOT:
-    - /opt/MacOSX10.9.sdk # [osx]
+- /opt/MacOSX10.9.sdk # [osx and not arm64]
+- /opt/MacOSX11.3.sdk # [osx and arm64]
diff --git a/.github/deploy.yml b/.github/deploy.yml
@@ -13,9 +13,10 @@ conda:
     os: 
         - 'ubuntu-latest'
         - 'macos-latest'
-        - 'windows-latest'
+        - 'windows-2019'
     macosx-sdk:
-        'MacOSX10.9.sdk.tar.xz'
+        - 'MacOSX10.9.sdk.tar.xz'
+        - 'MacOSX11.3.sdk.tar.xz'
     channels_release:
         - 'potassco'
     channels_dev:
@@ -108,7 +109,8 @@ conda:
 
         # from https://github.com/phracker/MacOSX-SDKs
         CONDA_BUILD_SYSROOT:
-            - /opt/MacOSX10.9.sdk # [osx]
+        - /opt/MacOSX10.9.sdk # [osx and not arm64]
+        - /opt/MacOSX11.3.sdk # [osx and arm64]
 
 ppa:
     package_name:

diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml
@@ -103,7 +103,7 @@ jobs:
         run: python .github/adjust_version.py --release
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.16.5
+        uses: pypa/cibuildwheel@v2.19.1
         env: ${{ matrix.cfg.env }}
 
       - uses: actions/upload-artifact@v3

diff --git a/.github/workflows/conda-dev.yml b/.github/workflows/conda-dev.yml
@@ -18,7 +18,7 @@ jobs:
         os:
         - ubuntu-latest
         - macos-latest
-        - windows-latest
+        - windows-2019
         python-version: ['3.8']
 
     steps:
@@ -28,7 +28,7 @@ jobs:
         submodules: recursive
 
     - name: setup miniconda
-      uses: conda-incubator/setup-miniconda@v2
+      uses: conda-incubator/setup-miniconda@v3
       with:
         auto-update-conda: true
         python-version: ${{ matrix.python-version }}
@@ -44,8 +44,10 @@ jobs:
       if: ${{ matrix.os == 'macos-latest' }}
       shell: pwsh
       run: |
-        Invoke-WebRequest -Uri 'https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.9.sdk.tar.xz' -OutFile 'MacOSX10.9.sdk.tar.xz'
+        Invoke-WebRequest -Uri 'https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX10.9.sdk.tar.xz' -OutFile 'MacOSX10.9.sdk.tar.xz'
         sudo tar xf MacOSX10.9.sdk.tar.xz -C /opt
+        Invoke-WebRequest -Uri 'https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX11.3.sdk.tar.xz' -OutFile 'MacOSX11.3.sdk.tar.xz'
+        sudo tar xf MacOSX11.3.sdk.tar.xz -C /opt
 
     - name: print info
       shell: pwsh
@@ -68,3 +70,21 @@ jobs:
         python .github/conda.py --release
       env:
         ANACONDA_API_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
+
+    - name: publish conda package (wip; osx-64)
+      if: ${{ github.event.inputs.wip == 'true' && matrix.os == 'macos-latest' }}
+      shell: pwsh
+      run: |
+        python .github/conda.py
+      env:
+        CONDA_SUBDIR: osx-64
+        ANACONDA_API_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
+
+    - name: publish conda package (release; osx-64)
+      if: ${{ github.event.inputs.wip == 'false' && matrix.os == 'macos-latest' }}
+      shell: pwsh
+      run: |
+        python .github/conda.py --release
+      env:
+        CONDA_SUBDIR: osx-64
+        ANACONDA_API_TOKEN: ${{ secrets.ANACONDA_TOKEN }}