Remove macOS workaround for numa feature not really working there

autonomys · Apr 15, 2024 · b83e2ba · b83e2ba
1 parent 8c1280c
commit b83e2ba
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -69,9 +69,16 @@ jobs:
       - name: Install LLVM and Clang for macOS
         uses: KyleMayes/install-llvm-action@dec985c8d7b46a2f363ea1a78f660c946a3349ea # v2.0.1
         with:
+          env: true
           version: 17
         if: runner.os == 'macOS'
 
+      # Because macOS, see https://andreasfertig.blog/2021/02/clang-and-gcc-on-macos-catalina-finding-the-include-paths/
+      - name: Configure C compiler macOS
+        run: |
+          echo "SDKROOT='$(xcrun --show-sdk-path)'" >> $GITHUB_ENV
+        if: runner.os == 'macOS'
+
       # TODO: Workaround for https://github.com/actions/runner-images/issues/9290
       - name: Install glibtoolize (macOS)
         run: brew install libtool
@@ -149,9 +156,16 @@ jobs:
       - name: Install LLVM and Clang for macOS
         uses: KyleMayes/install-llvm-action@dec985c8d7b46a2f363ea1a78f660c946a3349ea # v2.0.1
         with:
+          env: true
           version: 17
         if: runner.os == 'macOS'
 
+      # Because macOS, see https://andreasfertig.blog/2021/02/clang-and-gcc-on-macos-catalina-finding-the-include-paths/
+      - name: Configure C compiler macOS
+        run: |
+          echo "SDKROOT='$(xcrun --show-sdk-path)'" >> $GITHUB_ENV
+        if: runner.os == 'macOS'
+
       # TODO: Workaround for https://github.com/actions/runner-images/issues/9290
       - name: Install glibtoolize (macOS)
         run: brew install libtool

diff --git a/.github/workflows/snapshot-build.yml b/.github/workflows/snapshot-build.yml
@@ -138,9 +138,16 @@ jobs:
       - name: Install LLVM and Clang for macOS
         uses: KyleMayes/install-llvm-action@dec985c8d7b46a2f363ea1a78f660c946a3349ea # v2.0.1
         with:
+          env: true
           version: 17
         if: runner.os == 'macOS'
 
+      # Because macOS, see https://andreasfertig.blog/2021/02/clang-and-gcc-on-macos-catalina-finding-the-include-paths/
+      - name: Configure C compiler macOS
+        run: |
+          echo "SDKROOT='$(xcrun --show-sdk-path)'" >> $GITHUB_ENV
+        if: runner.os == 'macOS'
+
       # TODO: Workaround for https://github.com/actions/runner-images/issues/9290
       - name: Install glibtoolize (macOS)
         run: brew install libtool
@@ -206,13 +213,6 @@ jobs:
       - name: Build farmer (Linux and Windows)
         run: |
           cargo -Zgitoxide -Zgit build --locked -Z build-std --target ${{ matrix.build.target }} --profile production --bin subspace-farmer
-        if: runner.os != 'macOS'
-
-      # We build macOS without `numa` feature, primarily because of https://github.com/HadrienG2/hwlocality/issues/31
-      - name: Build farmer (macOS)
-        run: |
-          cargo -Zgitoxide -Zgit build --locked -Z build-std --target ${{ matrix.build.target }} --profile production --bin subspace-farmer --no-default-features
-        if: runner.os == 'macOS'
 
       - name: Build node
         run: |