finialize [skip ci]

potassco · Sep 13, 2024 · f297150 · f297150
1 parent 1bc6d6e
commit f297150
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 9 deletions.
diff --git a/.github/conda/conda_build_config.yaml b/.github/conda/conda_build_config.yaml
@@ -11,6 +11,8 @@ clingo:
 pin_run_as_build:
     clingo: x.x
 
-MACOSX_DEPLOYMENT_TARGET: 10.15  # [osx]
+MACOSX_DEPLOYMENT_TARGET: 10.15  # [osx and not arm64]
+MACOSX_DEPLOYMENT_TARGET: 11.3   # [osx and arm64]
 CONDA_BUILD_SYSROOT:             # [osx]
-    - /opt/MacOSX10.15.sdk       # [osx]
+    - /opt/MacOSX10.15.sdk       # [osx and not arm64]
+    - /opt/MacOSX11.3.sdk        # [osx and arm64]
diff --git a/.github/deploy.yml b/.github/deploy.yml
@@ -18,6 +18,7 @@ conda:
         - 'macos-latest'
         - 'windows-2019'
     macosx-sdk:
+        - 'MacOSX10.15.sdk.tar.xz'
         - 'MacOSX11.3.sdk.tar.xz'
     channels_release:
         - 'potassco'
@@ -111,10 +112,11 @@ conda:
         pin_run_as_build:
             clingo: x.x
 
-        c_stdlib_version:          # [osx]
-            - 11.3                 # [osx]
-        CONDA_BUILD_SYSROOT:       # [osx]
-            - /opt/MacOSX11.3.sdk  # [osx]
+        MACOSX_DEPLOYMENT_TARGET: 10.15  # [osx and not arm64]
+        MACOSX_DEPLOYMENT_TARGET: 11.3   # [osx and arm64]
+        CONDA_BUILD_SYSROOT:             # [osx]
+            - /opt/MacOSX10.15.sdk       # [osx and not arm64]
+            - /opt/MacOSX11.3.sdk        # [osx and arm64]
 
 ppa:
     package_name:

diff --git a/.github/trigger.sh b/.github/trigger.sh
@@ -95,10 +95,10 @@ case "$action" in
     dev)
         branch="${@:$OPTIND+1:1}"
         # .github/workflows/cibuildwheel.yml
-        #dispatch 35181474 "$wip" "$branch"
+        dispatch 35181474 "$wip" "$branch"
         # .github/workflows/conda-dev.yml
         dispatch 5943107 "$wip" "$branch"
         # .github/workflows/ppa-dev.yml
-        #dispatch 5947898 "$wip" "$branch"
+        dispatch 5947898 "$wip" "$branch"
         ;;
 esac
diff --git a/.github/workflows/conda-dev.yml b/.github/workflows/conda-dev.yml
@@ -16,7 +16,9 @@ jobs:
       fail-fast: false
       matrix:
         os:
+        - ubuntu-latest
         - macos-latest
+        - windows-2019
         python-version: ['3.8']
 
     steps:
@@ -35,7 +37,7 @@ jobs:
     - name: Install prerequisites
       shell: pwsh
       run: |
-        conda config --set anaconda_upload no
+        conda config --set anaconda_upload yes
         conda install conda-build anaconda-client
 
     - name: Install macos SDK
@@ -53,6 +55,22 @@ jobs:
         conda info
         conda list
 
+    - name: publish conda package (wip)
+      if: ${{ github.event.inputs.wip == 'true' }}
+      shell: pwsh
+      run: |
+        python .github/conda.py
+      env:
+        ANACONDA_API_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
+
+    - name: publish conda package (release)
+      if: ${{ github.event.inputs.wip == 'false' }}
+      shell: pwsh
+      run: |
+        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
@@ -61,3 +79,12 @@ jobs:
       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 }}