fine tune last commit

potassco · Jun 20, 2024 · 2d30e26 · 2d30e26
1 parent 4dd0429
commit 2d30e26
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/.github/conda/conda_build_config.yaml b/.github/conda/conda_build_config.yaml
@@ -7,5 +7,5 @@ python:
 
 # from https://github.com/phracker/MacOSX-SDKs
 CONDA_BUILD_SYSROOT:
-- /opt/MacOSX11.3.sdk # [osx and arm64]
 - /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:
@@ -121,7 +122,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/conda-dev.yml b/.github/workflows/conda-dev.yml
@@ -45,8 +45,8 @@ jobs:
       shell: pwsh
       run: |
         Invoke-WebRequest -Uri 'https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX10.9.sdk.tar.xz' -OutFile 'MacOSX10.9.sdk.tar.xz'
-        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 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
@@ -71,7 +71,7 @@ jobs:
       env:
         ANACONDA_API_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
 
-    - name: publish conda package (wip)
+    - name: publish conda package (wip; arm64)
       if: ${{ github.event.inputs.wip == 'true' && matrix.os == 'macos-latest' }}
       shell: pwsh
       run: |
@@ -80,7 +80,7 @@ jobs:
         CONDA_SUBDIR: osx-64
         ANACONDA_API_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
 
-    - name: publish conda package (release)
+    - name: publish conda package (release; arm64)
       if: ${{ github.event.inputs.wip == 'false' && matrix.os == 'macos-latest' }}
       shell: pwsh
       run: |