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

[23.0] Assert that local branches are up to date in release point script #16195

Merged

Conversation

mvdbeek
Copy link
Member

@mvdbeek mvdbeek commented Jun 6, 2023

The strategy is that we make sure the local branch is not before or behind the tracked remote branch (don't really know if that's the upstream given by --upstream), and then we make sure the tip commit isn't different

How to test the changes?

(Select all options that apply)

  • I've included appropriate automated tests.
  • This is a refactoring of components with existing test coverage.
  • Instructions for manual testing are as follows:

License

  • I agree to license these and all my past contributions to the core galaxy codebase under the MIT license.

@github-actions github-actions bot added this to the 23.0 milestone Jun 6, 2023
@mvdbeek
Copy link
Member Author

mvdbeek commented Jun 6, 2023

hmm, test failures are unrelated, but we shouldn't have to install node via nodeenv at all. I wonder if the extra v is a problem in https://github.com/mvdbeek/galaxy/blob/70569426824e9854ba51400475a689c6c7d29a37/scripts/common_startup.sh#L202 ?

@mvdbeek mvdbeek merged commit 5c24606 into galaxyproject:release_23.0 Jun 6, 2023
27 of 35 checks passed
)
subprocess.run(["git", "checkout", base_branch], cwd=galaxy_root).check_returncode()


def push_references(references: List[str], upstream: str = "https://github.com/galaxyproject/galaxy.git"):
Copy link
Member

Choose a reason for hiding this comment

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

This is very clever - I missed this. In my Makefile scripts I've always had to pick a branch name - using the full path is a great idea! Thanks for this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants