Skip to content

fix: update-release-branch workflow having Gradle URL code changes #1530

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

Merged
merged 3 commits into from
Feb 14, 2025
Merged

fix: update-release-branch workflow having Gradle URL code changes #1530

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a9afcd
fix: update release branch workflow having Gradle URL code changes
0marperez Feb 14, 2025
14abef5
fix: stash in the proper location & add comment
0marperez Feb 14, 2025
6df024b
misc: PR feedback
0marperez Feb 14, 2025
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
4 changes: 4 additions & 0 deletions .github/workflows/update-release-branch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,10 @@ jobs:
shell: bash
run: |
echo "merging main @ $main_sha into release @ $release_sha";

# Getting rid of the changes caused by "Configure Gradle"
Copy link
Member

@lauzadis lauzadis Feb 14, 2025

Choose a reason for hiding this comment

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

This comment could be more specific. What changes are being undone, why?

git stash

Copy link
Contributor

@ianbotsf ianbotsf Feb 14, 2025

Choose a reason for hiding this comment

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

Nit: As noted in offline conversation, git stash -- gradle/wrapper/gradle-wrapper.properties would be a safer command here.

git switch release;
input_message=${{ inputs.commit_message }}
message=${input_message:-"Merging main into release"}
Expand Down
Loading