More stabs in the dark

chrisjbillington · Nov 27, 2024 · ee3f65d · ee3f65d
1 parent 33b32dc
commit ee3f65d
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -119,18 +119,23 @@ jobs:
           architecture: ${{ matrix.arch }}
           miniconda-version: "latest"
 
-      # - name: Workaround conda-build incompatibility with xcode 12+
-      #   if: runner.os == 'macOS'
-      #   uses: maxim-lobanov/setup-xcode@v1
-      #   with:
-      #     xcode-version: latest-stable
+      - name: Setup xcode
+        if: runner.os == 'macOS'
+        uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: 14.2
+
+      - name: Setup Command Line Tools
+        if: runner.os == 'macOS'
+        run: |
+          sudo xcode-select --switch /Applications/Xcode.app
+          sudo xcode-select --install || true
 
-      - name: Install Command Line Tools
+      - name: Configure conda-build
         if: runner.os == 'macOS'
         run: |
-          sudo rm -rf /Library/Developer/CommandLineTools
-          sudo xcode-select --install
-          sudo xcode-select --switch /Library/Developer/CommandLineTools
+          echo "CONDA_BUILD_SYSROOT=$(xcrun --show-sdk-path)" >> $GITHUB_ENV
+          echo "CONDA_FORGE_MACOS_SYSROOT=$(xcrun --show-sdk-path)" >> $GITHUB_ENV
 
       - name: Conda package (Unix)
         if: (matrix.conda && runner.os != 'Windows')