From 2737e8cb20acb59a0bd7d2747e16fb4b8a216843 Mon Sep 17 00:00:00 2001 From: Edmund Noble Date: Thu, 16 Jan 2025 13:11:15 -0500 Subject: [PATCH] Use -j --semaphore in CI --- .github/workflows/applications.yml | 10 ++++------ .github/workflows/macos.yaml | 11 ++++------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/.github/workflows/applications.yml b/.github/workflows/applications.yml index 32f5c9b993..c29f44f03b 100644 --- a/.github/workflows/applications.yml +++ b/.github/workflows/applications.yml @@ -354,13 +354,11 @@ jobs: store_path: ${{ steps.setup.outputs.cabal-store }} aws_access_key_id: "${{ secrets.kadena_cabal_cache_aws_access_key_id }}" aws_secret_access_key: "${{ secrets.kadena_cabal_cache_aws_secret_access_key }}" - - name: Install build dependencies - run: cabal build chainweb --only-dependencies - - name: Build chainweb library - run: cabal build --ghc-options=-j2 lib:chainweb + - name: Build chainweb + run: cabal build -j --semaphore lib:chainweb - name: Build chainweb applications run: | - cabal build -j2 --ghc-options=-j2 \ + cabal build -j --semaphore \ chainweb:bench:bench \ exe:b64 \ exe:calculate-release \ @@ -379,7 +377,7 @@ jobs: test:remote-tests \ test:chainweb-storage-tests - name: Build chainweb-node application - run: cabal build -j2 --ghc-options=-j2 chainweb-node:exe:chainweb-node + run: cabal build -j --semaphore chainweb-node:exe:chainweb-node # Checks - name: Check that working directory tree is clean diff --git a/.github/workflows/macos.yaml b/.github/workflows/macos.yaml index 17b8da7873..07821a225e 100644 --- a/.github/workflows/macos.yaml +++ b/.github/workflows/macos.yaml @@ -111,13 +111,11 @@ jobs: store_path: ${{ steps.setup.outputs.cabal-store }} aws_access_key_id: "${{ secrets.kadena_cabal_cache_aws_access_key_id }}" aws_secret_access_key: "${{ secrets.kadena_cabal_cache_aws_secret_access_key }}" - - name: Install build dependencies - run: cabal build chainweb --only-dependencies - - name: Build chainweb library - run: cabal build lib:chainweb + - name: Build chainweb + run: cabal build -j --semaphore chainweb - name: Build chainweb applications run: | - cabal build -j \ + cabal build -j --semaphore \ chainweb:bench:bench \ exe:b64 \ exe:calculate-release \ @@ -135,7 +133,7 @@ jobs: test:multi-node-network-tests \ test:remote-tests - name: Build chainweb-node application - run: cabal build -j chainweb-node:exe:chainweb-node + run: cabal build -j --semaphore chainweb-node:exe:chainweb-node - uses: actions/cache/save@v4 name: Save dist-newstyle cache if: steps.cabal-dist-cache.outputs.cache-hit != 'true' @@ -171,4 +169,3 @@ jobs: exit 1 fi mv cabal.project.freeze.backup cabal.project.freeze -