fix merge-base compilation when running directly on main#11117
Merged
erik-krogh merged 2 commits intogithub:mainfrom Nov 4, 2022
Merged
fix merge-base compilation when running directly on main#11117erik-krogh merged 2 commits intogithub:mainfrom
erik-krogh merged 2 commits intogithub:mainfrom
Conversation
erik-krogh
force-pushed
the
stableCI-followup
branch
from
551adba to
ca20c95
Compare
erik-krogh
force-pushed
the
stableCI-followup
branch
from
ca20c95 to
47289a4
Compare
Contributor
Author
|
@aibaars you reviewed the previous PR, so I thought it would be natural if you took this one. The workflow crashes when running on |
aibaars
previously approved these changes
Nov 4, 2022
Contributor
aibaars
left a comment
aibaars
left a comment
There was a problem hiding this comment.
Looks good to me. One minor comment.
| echo "merge-base=$MERGE_BASE" >> $GITHUB_ENV | ||
| - name: Calculate merge-base - main | ||
| if: ${{ github.event_name != 'pull_request' }} | ||
| # using github.sha instead, since we're on main |
Contributor
There was a problem hiding this comment.
We may also be on an rc branch. It shouldn't matter too much, but perhaps update the name and comment.
erik-krogh
commented
Nov 4, 2022
aibaars
approved these changes
Nov 4, 2022
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
No description provided.