Do not special case NUMA support on macOS

autonomys · Jan 19, 2024 · b9ca141 · b9ca141
1 parent 35b23e0
commit b9ca141
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -74,6 +74,7 @@ jobs:
         with:
           # GitHub's runners are still on x86-64 that only supports LLVM 15 in official releases
           version: ${{ github.repository_owner == 'subspace' && '17' || '15' }}
+          env: true
         if: runner.os == 'macOS'
 
       - name: Install Protoc
@@ -152,6 +153,7 @@ jobs:
         with:
           # GitHub's runners are still on x86-64 that only supports LLVM 15 in official releases
           version: ${{ github.repository_owner == 'subspace' && '17' || '15' }}
+          env: true
         if: runner.os == 'macOS'
 
       - name: Install Protoc

diff --git a/.github/workflows/snapshot-build.yml b/.github/workflows/snapshot-build.yml
@@ -131,6 +131,7 @@ jobs:
         with:
           # GitHub's runners are still on x86-64 that only supports LLVM 15 in official releases
           version: ${{ github.repository_owner == 'subspace' && '17' || '15' }}
+          env: true
         if: runner.os == 'macOS'
 
       - name: Install Protoc
@@ -190,20 +191,11 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-cargo-
 
-      - name: Build farmer (Linux and Windows)
+      - name: Build farmer
         uses: actions-rs/cargo@ae10961054e4aa8b4aa7dffede299aaf087aa33b # @v1.0.1
         with:
           command: build
           args: --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)
-        uses: actions-rs/cargo@ae10961054e4aa8b4aa7dffede299aaf087aa33b # @v1.0.1
-        with:
-          command: build
-          args: --locked -Z build-std --target ${{ matrix.build.target }} --profile production --bin subspace-farmer --no-default-features
-        if: runner.os == 'macOS'
 
       - name: Build node
         uses: actions-rs/cargo@ae10961054e4aa8b4aa7dffede299aaf087aa33b # @v1.0.1