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

AAE-16060 Fix Helm Release and Publish for RC workflows on some repositories #324

Merged
merged 3 commits into from
Sep 18, 2023

Conversation

igdianov
Copy link
Contributor

@igdianov igdianov commented Sep 15, 2023

Checklist

Description

Add git pull --rebase to the helm-release-and-publish action before trying to push to reduce the window that causes conflict with remote, i.e.

Run git push origin
To https://github.com/Alfresco/charts
 ! [rejected]        master -> master (fetch first)
error: failed to push some refs to 'https://github.com/Alfresco/charts'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
Error: Process completed with exit code 1.

Also use git push --dry-run to verify the clean state

@erdemedeiros erdemedeiros enabled auto-merge (squash) September 18, 2023 08:15
@erdemedeiros erdemedeiros merged commit 32090ac into master Sep 18, 2023
@erdemedeiros erdemedeiros deleted the dev-igdianov-AAE-16060 branch September 18, 2023 08:15
shell: bash
run: |
git pull --rebase
git push --dry-run origin
Copy link
Contributor

Choose a reason for hiding this comment

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

Not sure why this was needed: looks like a temporary command (?)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants