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

Fix release script #271

Merged
merged 2 commits into from
Feb 6, 2024
Merged

Fix release script #271

merged 2 commits into from
Feb 6, 2024

Conversation

kasparsd
Copy link
Contributor

@kasparsd kasparsd commented Feb 6, 2024

Fixes #

Tasks

  • Deploy script will now actually checkout the upstream branch instead of creating a new local branch.

Describe the Approach

  • The checkout -B flag was working differently then expected.

git checkout -B "$UPSTREAM_BRANCH"

# Checkout the release branch or create it if it doesn't exist.
git checkout "$UPSTREAM_BRANCH" || git checkout -B "$UPSTREAM_BRANCH"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@delawski This fixes the issue with the deploys saying that the upstream has diverted. Previously it was essentially creating a new branch with the name of the upstream branch and it was obviously out of sync with the upstream.

@kasparsd kasparsd merged commit f4f3b47 into master Feb 6, 2024
2 checks passed
@kasparsd kasparsd deleted the fix-release branch February 6, 2024 07:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant