Merge 2.34 code freeze #1692
Merged
Merge 2.34 code freeze #1692
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The `BUILDKITE_` prefix is a workaround required only on iOS. We could adopt it for consistency here, too, but it's best to avoid it for two reasons: 1. Being a workaround, one would hope to eventually remove it 2. The less coupled we are with the particular CI implementation details (i.e. "Buildkite" in the name) the better
Notice how there now is an explicit `encrypt: true` for each file.
This was the reason for the failure in https://buildkite.com/automattic/simplenote-android/builds/354#0191db6f-e529-425f-b50e-c62154395e01
Zsh is the shell I use day to day and on which I tried the commands I put in the script.
Generated by 🚫 Danger |
See warning from https://buildkite.com/automattic/simplenote-android/builds/361#0191deaf-ee5a-4c77-8e48-2781416d93cd [2024-09-11T01:32:31Z] find: warning: you have specified the global option -maxdepth after the argument -name, but global options are not positional, i.e., -maxdepth affects tests specified before it as well as those specified after it. Please specify global options before other arguments.
See how https://buildkite.com/automattic/simplenote-android/builds/361 failed It's weird, though, that `release-build.sh` was not executable yet it worked. Maybe it has something to do with the fact that it's called without arguments? Might it be a Buildkite implementation detail?
This is a followup to 6fce8c8 Unfortunately, we need to use the same configure implementation across the whole CI automation due to existing compatibility bugs between the Ruby and Rust versions
|
📲 You can test the changes from this Pull Request in Simplenote Android by scanning the QR code below to install the corresponding build.
|
AliSoftware
approved these changes
Sep 11, 2024
| # It must use the `BUILDKITE_` prefix to be passed to the agent due to how `hostmgr` works, in case this runs on a Mac agents. | ||
| if [[ -z "${BUILDKITE_RELEASE_VERSION}" ]]; then | ||
| echo "BUILDKITE_RELEASE_VERSION is not set." | ||
| if [[ -z "${RELEASE_VERSION}" ]]; then |
There was a problem hiding this comment.
I double-checked and this checkout-release-branch.sh script seems to only be called by complete-code-freeze.yml, from a step that runs on tumblr-metal.
So indeed there's no risk of the env var being filtered out by hostmgr when the script to run is passed from Mac host to VM here, because this will run on tumblr-metal and not Mac agents, so hostmgr is not even involved in the first place. 👍
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Took a few additional commits on top of #1688 to get the release build to work, but got there in the end: