Skip to content

chore: bump sccache #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
kristof-mattei wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

chore: bump sccache #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ pipeline {

// Dockerhub image
docker.withRegistry(
'https://index.docker.io/v1/',
'',
'dockerhub-username-password') {
buildImage(
repo_base: "docker.io/logdna",
Expand Down Expand Up @@ -364,7 +364,7 @@ pipeline {
steps {
script {
// Dockerhub image
docker.withRegistry('https://index.docker.io/v1/', 'dockerhub-username-password') {
docker.withRegistry('', 'dockerhub-username-password') {
def docker_manifest_name = createMultiArchImageManifest(
repo_base: "docker.io/logdna",
, name: "build-images"
Expand Down Expand Up @@ -463,17 +463,17 @@ def buildImage(Map config = [:]) {
, "plain"
]

if (env.SCCACHE_BUCKET != null && env.SCCACHE_REGION != null) {
buildArgs.push("--build-arg")
buildArgs.push(["SCCACHE_BUCKET", env.SCCACHE_BUCKET].join("="))
buildArgs.push("--build-arg")
buildArgs.push(["SCCACHE_REGION", env.SCCACHE_REGION].join("="))
} else {
buildArgs.push("--build-arg")
buildArgs.push("RUSTC_WRAPPER=")
buildArgs.push("--build-arg")
buildArgs.push("CC_WRAPPER=")
}
// if (env.SCCACHE_BUCKET != null && env.SCCACHE_REGION != null) {
// buildArgs.push("--build-arg")
// buildArgs.push(["SCCACHE_BUCKET", env.SCCACHE_BUCKET].join("="))
// buildArgs.push("--build-arg")
// buildArgs.push(["SCCACHE_REGION", env.SCCACHE_REGION].join("="))
// } else {
buildArgs.push("--build-arg")
buildArgs.push("RUSTC_WRAPPER=")
buildArgs.push("--build-arg")
buildArgs.push("CC_WRAPPER=")
// }

if (config.pull) {
buildArgs.push("--pull")
Expand Down
2 changes: 1 addition & 1 deletion rust/debian/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ RUN --mount=type=secret,id=aws,target=/root/.aws/credentials \
# Install sccache for this image \
curl --retry 10 -LsSf "${CARGO_BINSTALL_URL_BASE}/cargo-binstall-${!BUILDARCH}-unknown-linux-musl.tgz" \
| tar -xzC /usr/local/bin/ && \
cargo install -q sccache --root "/usr/local/" --version 0.3.3 --features=azure,s3,openssl/vendored --no-default-features && \
cargo install -q sccache --root "/usr/local/" --version 0.14.0 --features=azure,s3,openssl/vendored --no-default-features && \
echo "installed build build image sccache" && \
if [ -n "$SCCACHE_BUCKET" ]; then export RUSTC_WRAPPER=/usr/local/bin/sccache; fi && \
if [ -z "$SCCACHE_ENDPOINT" ]; then unset SCCACHE_ENDPOINT; fi && \
Expand Down