Build cache improvements (risc0#1137)

* Refactor env vars to part of composite actions * Attempt to speed up C++ builds
0xZRA · Nov 10, 2023 · 4ab1f0b · 4ab1f0b
1 parent ba4f01b
commit 4ab1f0b
Show file tree

Hide file tree

Showing 17 changed files with 113 additions and 101 deletions.
diff --git a/.github/actions/rustup/action.yml b/.github/actions/rustup/action.yml
@@ -39,7 +39,10 @@ runs:
       run: rustup component add ${{ inputs.components }}
       shell: bash
 
-    - run: echo CARGO_TERM_COLOR=always >> $GITHUB_ENV
+    - run: |
+        echo "CARGO_NET_RETRY=10" >> $GITHUB_ENV
+        echo "CARGO_TERM_COLOR=always" >> $GITHUB_ENV
+        echo "RUSTUP_MAX_RETRIES=10" >> $GITHUB_ENV
       shell: bash
 
     - run: rustc --version --verbose

diff --git a/.github/actions/sccache/action.yml b/.github/actions/sccache/action.yml
@@ -41,14 +41,20 @@ runs:
       shell: bash
 
     - if: runner.os == 'Linux'
-      env:
-        SCCACHE_REGION: us-west-2
-        SCCACHE_BUCKET: risc0-ci-cache
-        SCCACHE_S3_KEY_PREFIX: public/${{ inputs.key }}/sccache
       run: |
-        echo "SCCACHE_REGION=${{ env.SCCACHE_REGION }}" >> $GITHUB_ENV
-        echo "SCCACHE_BUCKET=${{ env.SCCACHE_BUCKET }}" >> $GITHUB_ENV
-        echo "SCCACHE_S3_KEY_PREFIX=${{ env.SCCACHE_S3_KEY_PREFIX }}" >> $GITHUB_ENV
+        echo "SCCACHE_REGION=us-west-2" >> $GITHUB_ENV
+        echo "SCCACHE_BUCKET=risc0-ci-cache" >> $GITHUB_ENV
+        echo "SCCACHE_S3_KEY_PREFIX=public/${{ inputs.key }}/sccache" >> $GITHUB_ENV
+      shell: bash
+
+    - run: |
+        echo "CARGO_INCREMENTAL=0" >> $GITHUB_ENV
+        echo "CARGO_PROFILE_DEV_DEBUG=0" >> $GITHUB_ENV
+        echo "CC=sccache clang" >> $GITHUB_ENV
+        echo "CMAKE_C_COMPILER_LAUNCHER=sccache" >> $GITHUB_ENV
+        echo "CMAKE_CXX_COMPILER_LAUNCHER=sccache" >> $GITHUB_ENV
+        echo "CXX=sccache clang++" >> $GITHUB_ENV
+        echo "RUSTC_WRAPPER=sccache" >> $GITHUB_ENV
       shell: bash
 
     - if: runner.os == 'Linux'

diff --git a/.github/workflows/bench_applications.yml b/.github/workflows/bench_applications.yml
@@ -54,7 +54,6 @@ jobs:
     env:
       CUDA_LIBRARY_PATH: /usr/lib/cuda
       FEATURE: ${{ matrix.feature }}
-      RUSTC_WRAPPER: sccache
 
     steps:
       # This is a workaround from: https://github.com/actions/checkout/issues/590#issuecomment-970586842

diff --git a/.github/workflows/bench_datasheet.yml b/.github/workflows/bench_datasheet.yml
@@ -55,7 +55,6 @@ jobs:
     env:
       CUDA_LIBRARY_PATH: /usr/lib/cuda
       FEATURE: ${{ matrix.feature }}
-      RUSTC_WRAPPER: sccache
 
     steps:
       # This is a workaround from: https://github.com/actions/checkout/issues/590#issuecomment-970586842

diff --git a/.github/workflows/bench_pr.yml b/.github/workflows/bench_pr.yml
@@ -37,7 +37,6 @@ jobs:
     env:
       CUDA_LIBRARY_PATH: /usr/lib/cuda
       FEATURE: ${{ matrix.feature }}
-      RUSTC_WRAPPER: sccache
 
     steps:
       # This is a workaround from: https://github.com/actions/checkout/issues/590#issuecomment-970586842

diff --git a/.github/workflows/bench_trends.yml b/.github/workflows/bench_trends.yml
@@ -46,7 +46,6 @@ jobs:
     env:
       CUDA_LIBRARY_PATH: /usr/lib/cuda
       FEATURE: ${{ matrix.feature }}
-      RUSTC_WRAPPER: sccache
 
     steps:
       # This is a workaround from: https://github.com/actions/checkout/issues/590#issuecomment-970586842

diff --git a/.github/workflows/bonsai.yml b/.github/workflows/bonsai.yml
@@ -16,13 +16,8 @@ permissions:
   contents: read
 
 env:
-  CARGO_INCREMENTAL: 0
-  CARGO_NET_RETRY: 10
-  CARGO_PROFILE_DEV_DEBUG: 0
   RISC0_BUILD_LOCKED: 1
   RISC0_TOOLCHAIN_VERSION: test-release-2
-  RUSTC_WRAPPER: sccache
-  RUSTUP_MAX_RETRIES: 10
 
 jobs:
   changes:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -16,11 +16,7 @@ permissions:
   contents: read
 
 env:
-  CARGO_INCREMENTAL: 0
-  CARGO_NET_RETRY: 10
-  CARGO_PROFILE_DEV_DEBUG: 0
   RISC0_TOOLCHAIN_VERSION: test-release-2
-  RUSTUP_MAX_RETRIES: 10
 
 jobs:
   changes:
@@ -147,7 +143,6 @@ jobs:
       FEATURE: ${{ matrix.feature }}
       RISC0_BUILD_LOCKED: 1
       RUST_BACKTRACE: full
-      RUSTC_WRAPPER: sccache
     steps:
       # This is a workaround from: https://github.com/actions/checkout/issues/590#issuecomment-970586842
       - run: "git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :"
@@ -218,7 +213,6 @@ jobs:
       RISC0_PROVER: ipc
       RISC0_SERVER_PATH: ${{ github.workspace }}/target/release/r0vm
       RUST_BACKTRACE: full
-      RUSTC_WRAPPER: sccache
     steps:
       # This is a workaround from: https://github.com/actions/checkout/issues/590#issuecomment-970586842
       - run: "git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :"
@@ -247,8 +241,6 @@ jobs:
     if: needs.changes.outputs.doc == 'true'
     needs: changes
     runs-on: [self-hosted, prod, macOS, cpu]
-    env:
-      RUSTC_WRAPPER: sccache
     steps:
       # This is a workaround from: https://github.com/actions/checkout/issues/590#issuecomment-970586842
       - run: "git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :"
@@ -268,8 +260,6 @@ jobs:
     if: needs.changes.outputs.check-benchmarks == 'true'
     needs: changes
     runs-on: [self-hosted, prod, macOS, cpu]
-    env:
-      RUSTC_WRAPPER: sccache
     steps:
       # This is a workaround from: https://github.com/actions/checkout/issues/590#issuecomment-970586842
       - run: "git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :"
@@ -293,8 +283,6 @@ jobs:
       fail-fast: false
       matrix:
         os: [Linux, macOS]
-    env:
-      RUSTC_WRAPPER: sccache
     steps:
       # This is a workaround from: https://github.com/actions/checkout/issues/590#issuecomment-970586842
       - run: "git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :"
@@ -326,7 +314,6 @@ jobs:
     runs-on: [self-hosted, prod, macOS, cpu]
     env:
       RISC0_BUILD_LOCKED: 1
-      RUSTC_WRAPPER: sccache
     steps:
       # This is a workaround from: https://github.com/actions/checkout/issues/590#issuecomment-970586842
       - run: "git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :"
@@ -350,7 +337,6 @@ jobs:
     runs-on: ubuntu-latest-8-cores
     env:
       RISC0_BUILD_LOCKED: 1
-      RUSTC_WRAPPER: sccache
     steps:
       # This is a workaround from: https://github.com/actions/checkout/issues/590#issuecomment-970586842
       - run: "git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :"
@@ -379,8 +365,6 @@ jobs:
     if: needs.changes.outputs.test == 'true'
     needs: changes
     runs-on: [self-hosted, prod, Linux, cpu, docker]
-    env:
-      RUSTC_WRAPPER: sccache
     steps:
       # This is a workaround from: https://github.com/actions/checkout/issues/590#issuecomment-970586842
       - run: "git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :"

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -30,7 +30,6 @@ jobs:
           - os: macOS
             target: aarch64-apple-darwin
     env:
-      RUSTC_WRAPPER: sccache
       TARGET: ${{ matrix.target }}
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/website-test.yml b/.github/workflows/website-test.yml
@@ -16,12 +16,7 @@ permissions:
   contents: read
 
 env:
-  CARGO_INCREMENTAL: 0
-  CARGO_NET_RETRY: 10
-  CARGO_PROFILE_DEV_DEBUG: 0
   RISC0_TOOLCHAIN_VERSION: test-release-2
-  RUSTC_WRAPPER: sccache
-  RUSTUP_MAX_RETRIES: 10
 
 jobs:
   doc-test:

diff --git a/benchmarks/Cargo.lock b/benchmarks/Cargo.lock
diff --git a/bonsai/Cargo.lock b/bonsai/Cargo.lock
diff --git a/bonsai/examples/governance/Cargo.lock b/bonsai/examples/governance/Cargo.lock