Skip to content

Use the pinned buck2 version on MacOS #3726

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

Closed
wants to merge 4 commits into from
Closed

Use the pinned buck2 version on MacOS #3726

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bb21e13
Set buck2 version on MacOS
huydhn May 23, 2024
7d3b86d
Don't hardcode the version
huydhn May 23, 2024
9b1cc94
Use the correct path
huydhn May 23, 2024
a06cc40
Restore the TODO comment
huydhn May 23, 2024
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
7 changes: 5 additions & 2 deletions .ci/scripts/setup-macos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,18 @@ install_buck() {
fi

pushd .ci/docker

# TODO(huydo): This is a one-off copy of buck2 2024-05-15 to unblock Jon and
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please keep a comment here explaining why this copy exists instead of getting in the way we get it for non-macos systems. I'd still consider it a TODO to remove this manually-managed copy.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's also important to let people know who to talk to when we need to upgrade the buck2 version and add a new copy to the S3 bucket

# re-enable ShipIt. It’s not ideal that upgrading buck2 will require a manual
# update the cached binary on S3 bucket too. Let me figure out if there is a
# way to correctly implement the previous setup of installing a new version of
# buck2 only when it’s needed. AFAIK, the complicated part was that buck2
# --version doesn't say anything w.r.t its release version, i.e. 2024-05-15.
# See D53878006 for more details.
BUCK2=buck2-aarch64-apple-darwin.zst
#
# If you need to upgrade buck2 version on S3, please reach out to Dev Infra
# team for help.
BUCK2_VERSION=$(cat ci_commit_pins/buck2.txt)
BUCK2=buck2-aarch64-apple-darwin-${BUCK2_VERSION}.zst
curl -s "https://ossci-macos.s3.amazonaws.com/${BUCK2}" -o "${BUCK2}"

zstd -d "${BUCK2}" -o buck2
Expand Down
Loading