Skip to content

Commit f4c4ad3

Browse files
bigfootjonfacebook-github-bot
authored andcommitted
Upgrade buck2 toolchain (#1996)
Summary: This bumps the toolchain to the latest versions so I can unify the shim: #1993 Pull Request resolved: #1996 Test Plan: CI on the PR passes Reviewed By: huydhn Differential Revision: D53878006 Pulled By: bigfootjon fbshipit-source-id: 5a6c770df88a92bc664354abebddb5367fc67261
1 parent 0fa67f6 commit f4c4ad3

File tree

3 files changed

+10
-26
lines changed

3 files changed

+10
-26
lines changed

.ci/docker/ci_commit_pins/buck2.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2023-08-01
1+
2024-02-15

.ci/scripts/setup-macos.sh

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -27,34 +27,18 @@ install_buck() {
2727
brew install wget
2828
fi
2929

30-
BUCK2_NOT_AVAILABLE=false
31-
if ! command -v buck2 &> /dev/null; then
32-
BUCK2_NOT_AVAILABLE=true
33-
else
34-
BUCK2_BINARY=$(which buck2)
35-
BUCK2_ARCH=$(file -b "${BUCK2_BINARY}")
36-
37-
if [[ "${BUCK2_ARCH}" != "Mach-O 64-bit executable arm64" ]]; then
38-
echo "Reinstall buck2 because ${BUCK2_BINARY} is ${BUCK2_ARCH}, not 64-bit arm64"
39-
BUCK2_NOT_AVAILABLE=true
40-
fi
41-
fi
42-
43-
if [[ "${BUCK2_NOT_AVAILABLE}" == true ]]; then
44-
pushd .ci/docker
30+
pushd .ci/docker
4531

46-
BUCK2=buck2-aarch64-apple-darwin.zst
47-
BUCK2_VERSION=$(cat ci_commit_pins/buck2.txt)
32+
BUCK2=buck2-aarch64-apple-darwin.zst
4833

49-
wget -q "https://github.com/facebook/buck2/releases/download/${BUCK2_VERSION}/${BUCK2}"
50-
zstd -d "${BUCK2}" -o buck2
34+
wget -q "https://ossci-macos.s3.amazonaws.com/${BUCK2}"
35+
zstd -d "${BUCK2}" -o buck2
5136

52-
chmod +x buck2
53-
mv buck2 /opt/homebrew/bin
37+
chmod +x buck2
38+
mv buck2 /opt/homebrew/bin
5439

55-
rm "${BUCK2}"
56-
popd
57-
fi
40+
rm "${BUCK2}"
41+
popd
5842
}
5943

6044
function write_sccache_stub() {

third-party/prelude

Submodule prelude updated 639 files

0 commit comments

Comments
 (0)