Skip to content

Conversation

@martinflorian-da
Copy link
Contributor

Fixes https://github.com/DACH-NY/cn-test-failures/issues/4495

This will produce a new commit on the release line branch that will not be on main, and so get-snapshot-version will correctly report 0.4.1 as the version to deploy.

Future release-line branches will be fine, this is just broken due to the repo migration.

Pull Request Checklist

Cluster Testing

  • If a cluster test is required, comment /cluster_test on this PR to request it, and ping someone with access to the DA-internal system to approve it.
  • If a hard-migration test is required (from the latest release), comment /hdm_test on this PR to request it, and ping someone with access to the DA-internal system to approve it.

PR Guidelines

  • Include any change that might be observable by our partners or affect their deployment in the release notes.
  • Specify fixed issues with Fixes #n, and mention issues worked on using #n
  • Include a screenshot for frontend-related PRs - see README or use your favorite screenshot tool

Merge Guidelines

  • Make the git commit message look sensible when squash-merging on GitHub (most likely: just copy your PR description).

Fixes DACH-NY/cn-test-failures#4495

This will produce a new commit on the release line branch that will not be on main, and so `get-snapshot-version` will correctly report `0.4.1` as the version to deploy.

[force]

Signed-off-by: Martin Florian <martin.florian@digitalasset.com>
# (when checking out Splice as a submodule, we might be losing the branch information).
#
sha=$(git rev-parse HEAD)
if ! (git branch -r --contains "$sha" | grep -q "\borigin/main\b"); then
Copy link
Contributor Author

Choose a reason for hiding this comment

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

So what is failing right now is that we check out commit edb2291be31694b9e55eba1ebb607c4eca1a1dbb which is also a commit on main, which then yields a fantasy version to deploy... all in all an artifact of switching repos and cutting 0.4.1 still on the old repo.

@martinflorian-da martinflorian-da merged commit d16dc77 into release-line-0.4.1 Jun 10, 2025
9 of 43 checks passed
@martinflorian-da martinflorian-da deleted the martinflorian-da/cntf-4495-fix-0.4.1-upgrade-tests-simple branch June 10, 2025 11:33
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.

3 participants