Follow-up: fix detection of production mac build #294
Merged
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
marcdumais-work
commented
Aug 11, 2023
| @@ -42,7 +42,7 @@ const signFile = file => { | |||
| exports.default = async function (context) { | |||
| const running_ci = process.env.BLUEPRINT_JENKINS_CI === 'true'; | |||
| const releaseDryRun = process.env.BLUEPRINT_JENKINS_RELEASE_DRYRUN === 'true'; | |||
| const branch = process.env.CHANGE_BRANCH; | |||
| const branch = process.env.BRANCH_NAME; | |||
There was a problem hiding this comment.
This environment variable (BRANCH_NAME) exists both for PRs and when merging to master. CHANGE_BRANCH is only for PR builds it sems. We compare the value of 'branch' to 'master', lower down, as one of the few criteria to proceed with macos signing/notarising.
There was a problem hiding this comment.
PR build:
Merging PR to master (production build):
To save build time, we only proceed with macos signing/notarizing when it's detected that the current build is producing official blueprint packages. Unfortunately a little bug prevents this from working. This is the fix. Signed-off-by: Marc Dumais <marc.dumais@ericsson.com>
marcdumais-work
force-pushed
the
follow-up-mac-signing
branch
from
0d94145
to
14bc0a8
Compare
jfaltermeier
approved these changes
Aug 14, 2023
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.
What it does
I noticed an issue after merging PR #272, looking at the Jenkins build log.
To save build time, we only proceed with macos signing/notarising when it's detected that the current build is producing official blueprint packages. Unfortunately a little bug was introduced in #272 , that prevents this mechanism from working, resulting in an unsigned/un-notarised macos package [1].
This is the fix.
[1]: note: I killed the Jenkins build before if got far enough to potentially release a bad macos package.
How to test
Unfortunately I think we need to merge to be certain. But I think the fix is simple enough to be validated by looking at the Jenkins linked log above.
Review checklist
Reminder for reviewers