Skip to content
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.

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

rust 1.72.0 #140367

Merged
merged 2 commits into from
Aug 31, 2023
Merged

rust 1.72.0 #140367

merged 2 commits into from
Aug 31, 2023

Conversation

ZhongRuoyu
Copy link
Member

@ZhongRuoyu ZhongRuoyu commented Aug 24, 2023

Also, implement the following based on discussion in Slack:

  • Avoid double cargo build and installation by replacing the copy in the original source.
  • Use brewed llvm, libgit2, and libssh2.
  • Explicitly specify the extra tools to build. This allows us to drop bundled rust-analyzer and rustfmt and revive the respective formulae.
  • Various cleanups.

Failures: #140367 (comment)

@github-actions github-actions bot added the bump-formula-pr PR was created using `brew bump-formula-pr` label Aug 24, 2023
@ZhongRuoyu ZhongRuoyu added CI-long-timeout [DEPRECATED] Use longer GitHub Actions CI timeout. CI-no-fail-fast Continue CI tests despite failing GitHub Actions matrix builds. CI-build-dependents-from-source Pass --build-dependents-from-source to brew test-bot. labels Aug 24, 2023
@github-actions github-actions bot removed the CI-long-timeout [DEPRECATED] Use longer GitHub Actions CI timeout. label Aug 24, 2023
@github-actions github-actions bot added the long build Set a long timeout for formula testing label Aug 24, 2023
@ZhongRuoyu ZhongRuoyu added the CI-long-timeout [DEPRECATED] Use longer GitHub Actions CI timeout. label Aug 24, 2023
@ZhongRuoyu

This comment was marked as resolved.

@ZhongRuoyu ZhongRuoyu force-pushed the bump-rust-1.72.0 branch 2 times, most recently from 9c70ef5 to 1edffc8 Compare August 24, 2023 17:34
ZhongRuoyu added a commit to ZhongRuoyu/homebrew-core that referenced this pull request Aug 25, 2023
@Moisan Moisan removed the CI-long-timeout [DEPRECATED] Use longer GitHub Actions CI timeout. label Aug 26, 2023
@github-actions github-actions bot added the CI-long-timeout [DEPRECATED] Use longer GitHub Actions CI timeout. label Aug 26, 2023
@ZhongRuoyu
Copy link
Member Author

Cancelled CI as it took unusually long. Turned out that all runners were stuck at brew install --build-from-source sh4d0wup. 🤔

@github-actions github-actions bot removed the CI-long-timeout [DEPRECATED] Use longer GitHub Actions CI timeout. label Aug 27, 2023
@chenrui333
Copy link
Member

update cargo to 0.73.1

@chenrui333
Copy link
Member

gonna check out sh4d0wup to see if it builds out fine before next rerun.

@ZhongRuoyu
Copy link
Member Author

The failures above are non-blocking as they don't affect the existing bottles. I've pushed a final update to finish this off (cleanups + unbundling rust-analyzer and rustfmt), and we'll be good to 🚢 this.

@github-actions github-actions bot removed the CI-long-timeout [DEPRECATED] Use longer GitHub Actions CI timeout. label Aug 31, 2023
@ZhongRuoyu ZhongRuoyu added the ready to merge PR can be merged once CI is green label Aug 31, 2023
@github-actions
Copy link
Contributor

@github-actions github-actions bot added the CI-published-bottle-commits The commits for the built bottles have been pushed to the PR branch. label Aug 31, 2023
@BrewTestBot BrewTestBot enabled auto-merge August 31, 2023 12:57
@github-actions github-actions bot added CI-build-dependents-from-source Pass --build-dependents-from-source to brew test-bot. and removed bump-formula-pr PR was created using `brew bump-formula-pr` labels Aug 31, 2023
@BrewTestBot BrewTestBot added this pull request to the merge queue Aug 31, 2023
Merged via the queue into Homebrew:master with commit 26776d1 Aug 31, 2023
12 checks passed
@ZhongRuoyu ZhongRuoyu deleted the bump-rust-1.72.0 branch August 31, 2023 13:13
ZhongRuoyu added a commit to ZhongRuoyu/homebrew-core that referenced this pull request Aug 31, 2023
`rust` no longer ships `rust-analyzer` and `rustfmt` since Homebrew#140367.
ZhongRuoyu added a commit to ZhongRuoyu/homebrew-core that referenced this pull request Aug 31, 2023
`rust` no longer ships `rust-analyzer` and `rustfmt` since Homebrew#140367.
ZhongRuoyu added a commit to ZhongRuoyu/homebrew-core that referenced this pull request Aug 31, 2023
`rust` no longer ships `rust-analyzer` and `rustfmt` since Homebrew#140367.
Comment on lines 28 to 36
bottle do
sha256 cellar: :any, arm64_ventura: "ebb7606e866133436ba0f6914746dd08ba07551a83887ac475540d705cc45d00"
sha256 cellar: :any, arm64_monterey: "14c396c71bfc85ec4dceb235cc4142b4484c31736b99bf5ee5cc2be9f3d548cd"
sha256 cellar: :any, arm64_big_sur: "c2cf1974f723423d73588c4bd2d3ffe1d27e88c3e78506aa63da4ceb06b15cdf"
sha256 cellar: :any, ventura: "cf17622b469fd267981d97613d204196ec3725e54d25561a4e13df3ec9543426"
sha256 cellar: :any, monterey: "639a24c8f7460ba1c18488505605b05f172879e2b972045cdb38b8dfd809edbe"
sha256 cellar: :any, big_sur: "e204be3861c7f7df3f9ae0d56ffb1e41f0c865157784eb25933d2510ad0fa5d1"
sha256 cellar: :any_skip_relocation, x86_64_linux: "6ab9ba5c6d96bf35e29d7d95756f02c0e29a661e3907b4d08a0e85a6996b4686"
sha256 arm64_ventura: "28e026c3d24f6dce2c1fb5087cf35cc5ffd88aa9055de215b81ae33d17e1f33b"
sha256 arm64_monterey: "9a1ee1b72f0e6c6a0c1aa4d44de57ad18616710233c18e1e24960b9219d448aa"
sha256 arm64_big_sur: "7a65f06827c04b4d5ec27ff88efd143bc970081225eede6db71d2ce888ddf6ef"
sha256 ventura: "dbc20ef5f433182b31d7b2bf0f2bb29c96abcf2ecf2cccfc00c9774b46c27038"
sha256 monterey: "2a0ec660efed84e2ccfaaed4c30d2fc0577cbb9a41df32b374d8706202793837"
sha256 big_sur: "daaa3f24643f928e4098dae014c9e2055057a05f4c12710b837991808c59b193"
sha256 cellar: :any_skip_relocation, x86_64_linux: "1701167773a55ba430ef5c318cb951f38041387949aed7f37a43b909e78a607c"
end
Copy link
Member Author

@ZhongRuoyu ZhongRuoyu Aug 31, 2023

Choose a reason for hiding this comment

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

As a side effect of using brewed llvm, we've lost relocatable bottles on macOS. 🥲

==> Detecting if rust--1.72.0.ventura.bottle.tar.gz is relocatable...
Warning: String '/usr/local/opt' still exists in these files:
/usr/local/Cellar/rust/1.72.0/lib/librustc_driver-d7af7c52e7c23764.dylib
 --> links to /usr/local/opt/llvm/lib/libLLVM.dylib

The path to llvm-config is hardcoded in https://github.com/rust-lang/rust/blob/1.72.0/compiler/rustc_codegen_llvm/src/context.rs#L169-L196.

@ZhongRuoyu ZhongRuoyu mentioned this pull request Aug 31, 2023
6 tasks
@hugocaillard hugocaillard mentioned this pull request Sep 13, 2023
@github-actions github-actions bot added the outdated PR was locked due to age label Nov 25, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 25, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
CI-build-dependents-from-source Pass --build-dependents-from-source to brew test-bot. CI-no-fail-fast Continue CI tests despite failing GitHub Actions matrix builds. CI-published-bottle-commits The commits for the built bottles have been pushed to the PR branch. CI-skip-recursive-dependents Pass --skip-recursive-dependents to brew test-bot. long build Set a long timeout for formula testing outdated PR was locked due to age ready to merge PR can be merged once CI is green
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants