Skip to content

Commit eaee3e7

Browse files
authored
Merge pull request #2816 from kinnison/fix-2814
Correct mistake in musl sccache fetcher
2 parents 6d24d2f + dc371d2 commit eaee3e7

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

.dockerignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
.git
2+
target

ci/docker/scripts/sccache.bash

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@ SHA="26fd04c1273952cc2a0f359a71c8a1857137f0ee3634058b3f4a63b69fc8eb7f"
88
DL_URL="https://github.com/mozilla/sccache/releases/download"
99
BIN_DIR=/usr/local/bin
1010
TEMP_DIR=$(mktemp -d)
11+
TAR_NAME="sccache-${VERSION}-${TARGET}.tar.gz"
1112

1213
cd "${TEMP_DIR}"
1314
mkdir -p "${BIN_DIR}"
1415

15-
curl -sSL -O "${DL_URL}/${VERSION}/sccache-${VERSION}-${TARGET}.tar.gz"
16-
echo "${SHA} sccache-${VERSION}-${TARGET}.tar.gz" | sha256sum --check -
17-
tar -xzf - --strip-components 1
16+
curl -sSL -O "${DL_URL}/${VERSION}/${TAR_NAME}"
17+
echo "${SHA} ${TAR_NAME}" | sha256sum --check -
18+
tar -xzf "${TAR_NAME}" --strip-components 1
1819
cp sccache "${BIN_DIR}/sccache"
1920
chmod +x "${BIN_DIR}/sccache"

0 commit comments

Comments
 (0)