Skip to content

Commit 2d74329

Browse files
committed
Update sccache version & adjust for github change & fix foundationdb pkg download url
1 parent 6adaf1c commit 2d74329

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ jobs:
337337
uses: actions/checkout@v4
338338

339339
- name: Run sccache-cache
340-
uses: mozilla-actions/sccache-action@v0.0.7
340+
uses: mozilla-actions/sccache-action@v0.0.9
341341
with:
342342
disable_annotations: true
343343

@@ -347,7 +347,7 @@ jobs:
347347
run: |
348348
rustup target add ${{matrix.target}}
349349
# Get latest FoundationDB installer
350-
curl --retry 5 -Lso foundationdb.pkg "$(gh api -X GET /repos/apple/foundationdb/releases --jq '.[] | select(.prerelease == false) | .assets[] | select(.name | test("${{startsWith(matrix.target, 'x86') && 'x86_64' || 'arm64'}}" + ".pkg")) | .browser_download_url' | head -n1)"
350+
curl --retry 5 -Lso foundationdb.pkg "$(gh api -X GET /repos/apple/foundationdb/releases --jq '.[] | select(.prerelease == false) | .assets[] | select(.name | test("${{startsWith(matrix.target, 'x86') && 'x86_64' || 'arm64'}}" + ".pkg$")) | .browser_download_url' | head -n1)"
351351
sudo installer -allowUntrusted -dumplog -pkg foundationdb.pkg -target /
352352
cargo build --release --target ${{matrix.target}} -p mail-server --no-default-features --features "foundationdb elastic s3 redis enterprise"
353353
mkdir -p artifacts

Dockerfile.build

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ RUN \
7070
fi
7171
# Cargo-chef Cache layer
7272
RUN \
73-
--mount=type=secret,id=ACTIONS_CACHE_URL,env=ACTIONS_CACHE_URL \
73+
--mount=type=secret,id=ACTIONS_RESULTS_URL,env=ACTIONS_RESULTS_URL \
7474
--mount=type=secret,id=ACTIONS_RUNTIME_TOKEN,env=ACTIONS_RUNTIME_TOKEN \
7575
--mount=type=cache,target=/usr/local/cargo/registry \
7676
--mount=type=cache,target=/usr/local/cargo/git \
@@ -79,7 +79,7 @@ RUN \
7979
RUSTFLAGS="-L /usr/lib" cargo chef cook --recipe-path recipe.json --zigbuild --release --target ${TARGET} -p mail-server --no-default-features --features "foundationdb elastic s3 redis enterprise"; \
8080
fi
8181
RUN \
82-
--mount=type=secret,id=ACTIONS_CACHE_URL,env=ACTIONS_CACHE_URL \
82+
--mount=type=secret,id=ACTIONS_RESULTS_URL,env=ACTIONS_RESULTS_URL \
8383
--mount=type=secret,id=ACTIONS_RUNTIME_TOKEN,env=ACTIONS_RUNTIME_TOKEN \
8484
--mount=type=cache,target=/usr/local/cargo/registry \
8585
--mount=type=cache,target=/usr/local/cargo/git \
@@ -92,7 +92,7 @@ ENV RUSTC_WRAPPER="sccache" \
9292
SCCACHE_GHA_ENABLED=true
9393
# Build FoundationDB version
9494
RUN \
95-
--mount=type=secret,id=ACTIONS_CACHE_URL,env=ACTIONS_CACHE_URL \
95+
--mount=type=secret,id=ACTIONS_RESULTS_URL,env=ACTIONS_RESULTS_URL \
9696
--mount=type=secret,id=ACTIONS_RUNTIME_TOKEN,env=ACTIONS_RUNTIME_TOKEN \
9797
--mount=type=cache,target=/usr/local/cargo/registry \
9898
--mount=type=cache,target=/usr/local/cargo/git \
@@ -103,7 +103,7 @@ RUN \
103103
fi
104104
# Build generic version
105105
RUN \
106-
--mount=type=secret,id=ACTIONS_CACHE_URL,env=ACTIONS_CACHE_URL \
106+
--mount=type=secret,id=ACTIONS_RESULTS_URL,env=ACTIONS_RESULTS_URL \
107107
--mount=type=secret,id=ACTIONS_RUNTIME_TOKEN,env=ACTIONS_RUNTIME_TOKEN \
108108
--mount=type=cache,target=/usr/local/cargo/registry \
109109
--mount=type=cache,target=/usr/local/cargo/git \

docker-bake.hcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ variable "DOCKER_PLATFORM" {
1616
target "docker-metadata-action" {}
1717
target "build" {
1818
secret = [
19-
"type=env,id=ACTIONS_CACHE_URL",
19+
"type=env,id=ACTIONS_RESULTS_URL",
2020
"type=env,id=ACTIONS_RUNTIME_TOKEN"
2121
]
2222
args = {

0 commit comments

Comments
 (0)