Skip to content
This repository was archived by the owner on Nov 1, 2023. It is now read-only.

Commit 424d34b

Browse files
authored
Get rid of sccache
1 parent a0ce0ff commit 424d34b

File tree

4 files changed

+1
-51
lines changed

4 files changed

+1
-51
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ concurrency:
1616

1717
env:
1818
CARGO_TERM_COLOR: always
19-
SCCACHE_DIR: ${{github.workspace}}/sccache/
20-
SCCACHE_CACHE_SIZE: 1G
2119
ACTIONS_CACHE_KEY_DATE: 2023-06-19
2220
CI: true
2321

@@ -89,13 +87,6 @@ jobs:
8987
if: steps.rust-build-cache.outputs.cache-hit != 'true' && steps.cache-agent-artifacts.outputs.cache-hit != 'true'
9088
shell: bash
9189
run: src/ci/rust-prereqs.sh
92-
- name: Rust Sccache
93-
if: steps.cache-agent-artifacts.outputs.cache-hit != 'true'
94-
uses: actions/cache@v3
95-
with:
96-
path: sccache
97-
key: agent-sccache|${{ join(matrix.os, ':') }}|${{steps.rust-version.outputs.RUST_VERSION}}|${{ env.ACTIONS_CACHE_KEY_DATE }}|${{ hashFiles('src/agent/Cargo.lock') }}
98-
restore-keys: agent-sccache|${{ join(matrix.os, ':') }}|${{steps.rust-version.outputs.RUST_VERSION}}|${{ env.ACTIONS_CACHE_KEY_DATE }}|
9990
- run: src/ci/agent.sh
10091
if: steps.cache-agent-artifacts.outputs.cache-hit != 'true'
10192
shell: bash
@@ -243,14 +234,6 @@ jobs:
243234
if: steps.rust-build-cache.outputs.cache-hit != 'true'
244235
shell: bash
245236
run: src/ci/rust-prereqs.sh
246-
- name: Rust Compile Cache
247-
uses: actions/cache@v3
248-
with:
249-
path: sccache
250-
key: proxy-sccache|${{ runner.os }}-${{ hashFiles('src/proxy-manager/Cargo.lock') }}-${{ env.ACTIONS_CACHE_KEY_DATE }}
251-
restore-keys: |
252-
proxy-sccache|${{ runner.os }}-${{ hashFiles('src/proxy-manager/Cargo.lock') }}-
253-
proxy-sccache|${{ runner.os }}-
254237
- run: src/ci/proxy.sh
255238
- uses: actions/upload-artifact@v3
256239
with:

src/ci/agent.sh

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,6 @@ exists() {
1111
[ -e "$1" ]
1212
}
1313

14-
SCCACHE=$(which sccache || echo '')
15-
if [ -n "$SCCACHE" ]; then
16-
# only set RUSTC_WRAPPER if sccache exists
17-
export RUSTC_WRAPPER=$SCCACHE
18-
# incremental interferes with (disables) sccache
19-
export CARGO_INCREMENTAL=0
20-
else
21-
# only set CARGO_INCREMENTAL on non-release builds
22-
#
23-
# This speeds up build time, but makes the resulting binaries slightly slower.
24-
# https://doc.rust-lang.org/cargo/reference/profiles.html?highlight=incremental#incremental
25-
if [ "${GITHUB_REF}" != "" ]; then
26-
TAG_VERSION=${GITHUB_REF#refs/tags/}
27-
if [ ${TAG_VERSION} == ${GITHUB_REF} ]; then
28-
export CARGO_INCREMENTAL=1
29-
fi
30-
fi
31-
fi
32-
3314
platform=$(uname --kernel-name --machine)
3415
platform=${platform// /-} # replace spaces with dashes
3516
rel_output_dir="artifacts/agent-$platform"
@@ -45,11 +26,6 @@ cargo clippy --version
4526
cargo fmt --version
4627
cargo license --version
4728

48-
# unless we're doing incremental builds, start clean during CI
49-
if [ X${CARGO_INCREMENTAL} == X ]; then
50-
cargo clean
51-
fi
52-
5329
cargo fmt -- --check
5430

5531
cargo deny -L error check
@@ -69,10 +45,6 @@ cargo llvm-cov nextest --all-targets --locked --workspace --lcov --output-path "
6945
# TODO: once Salvo is integrated, this can get deleted
7046
cargo build --release --locked --manifest-path ./onefuzz-telemetry/Cargo.toml --all-features
7147

72-
if [ -n "$SCCACHE" ]; then
73-
sccache --show-stats
74-
fi
75-
7648
echo "Checking dependencies of binaries"
7749

7850
"$script_dir/check-dependencies.sh"

src/ci/proxy.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55

66
set -ex
77

8-
#export RUSTC_WRAPPER=$(which sccache)
9-
108
mkdir -p artifacts/proxy
119

1210
cd src/proxy-manager

src/ci/rust-prereqs.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,4 @@
55

66
set -ex
77

8-
cargo install --locked sccache cargo-license@0.4.2 cargo-llvm-cov cargo-deny cargo-insta cargo-nextest
9-
10-
# sccache --start-server
11-
# export RUSTC_WRAPPER=$(which sccache)
8+
cargo install --locked cargo-license@0.4.2 cargo-llvm-cov cargo-deny cargo-insta cargo-nextest

0 commit comments

Comments
 (0)