Skip to content

Commit

Permalink
Merge pull request #105 from kraken-build/nr/sccache-remote
Browse files Browse the repository at this point in the history
try to use redis in our Arc cluster for caching
  • Loading branch information
NiklasRosenstein authored Aug 23, 2024
2 parents 175140b + 15e1c8a commit 6f3a50c
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 17 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
run: source .venv/bin/activate && env >> $GITHUB_ENV

- name: Install kraken-wrapper
run: pip install --upgrade kraken-wrapper
run: pip install uv==0.3.0 && uv tool install kraken-wrapper==0.39.0

# See https://github.com/orgs/community/discussions/42856#discussioncomment-7678867
- name: Adding required env vars for caching Docker build
Expand Down Expand Up @@ -131,7 +131,7 @@ jobs:
python-version: "3.10"

- name: Install kraken-wrapper
run: pip install kraken-wrapper
run: pip install uv==0.3.0 && uv tool install kraken-wrapper==0.39.0

- name: Install manifest-tool
run: |
Expand Down
26 changes: 11 additions & 15 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@ RUN --mount=type=bind,src=formulae,target=/tmp/formulae \
&& apt-get update \
&& apt-get install -y docker.io nodejs graphviz unzip lcov git-lfs \
#
# Rust
# Rustup (no default toolchain, we pick one below)
#
&& apt-get install -y xxd cmake \
&& ( curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y ) \
&& ( curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain none ) \
#
# helm
#
Expand All @@ -87,21 +87,17 @@ ARG ACTIONS_CACHE_URL
RUN --mount=type=secret,id=ACTIONS_RUNTIME_TOKEN : \
&& rustup toolchain install 1.80.0 \
&& rustup default 1.80.0 \
#&& ( \
# SCCACHE_GHA_ENABLED=true \
# ACTIONS_CACHE_URL=$ACTIONS_CACHE_URL \
# ACTIONS_RUNTIME_TOKEN=$(cat /run/secrets/ACTIONS_RUNTIME_TOKEN) \
# sccache --start-server \
#) \
&& export SCCACHE_REDIS_ENDPOINT=redis://redis-headless.sccache:6379 \
&& sccache --start-server \
&& export RUSTC_WRAPPER=sccache CARGO_INCREMENTAL=0 \
&& cargo install cargo-deny --version 0.14.24 \
&& cargo install cargo-semver-checks --version 0.33.0 \
&& cargo install sqlx-cli --version 0.8.0 \
&& cargo install cargo-llvm-cov --version 0.6.11 \
&& cargo install cargo-hack --version 0.6.30 \
&& cargo install buffrs --version 0.9.0 \
&& sccache --stop-server
&& time cargo install cargo-deny --version 0.14.24 \
&& time cargo install cargo-semver-checks --version 0.33.0 \
&& time cargo install sqlx-cli --version 0.8.0 \
&& time cargo install cargo-llvm-cov --version 0.6.11 \
&& time cargo install cargo-hack --version 0.6.30 \
&& time cargo install buffrs --version 0.9.0 \
&& sccache --stop-server \
&& du -hd1 /root

#
# Python tools
Expand Down
1 change: 1 addition & 0 deletions formulae/argocd.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ class ArgocdFormula(DownloadFileFormula):
download_url = "https://github.com/argoproj/argo-cd/releases/download/${version}/argocd-linux-${archv2}"
chmod = 0o775
output_directory = "${install_to}"
output_file = "${output_directory}/argocd"
install_to = "/usr/local/bin"

0 comments on commit 6f3a50c

Please sign in to comment.