fix(linux): pushing of updated changelog branch #12818
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This fixes the `upload-to-debian.sh` script if the `chore/linux/changelog` branch was created a while back while the base branch moved in the meantime. In this case we have to use `--force` instead of `--force-with-lease` otherwise `git` gets confused. This is save to do since the intention is that we replace the previous commit and we know that there is (should be) only one commit on the `chore/linux/changelog` branch.
User Test ResultsTest specification and instructions User tests are not required Test Artifacts |
darcywong00
approved these changes
Dec 11, 2024
According to a comment on the latest upload to mentors.debian.org we don't have to add the line "Re-release to Debian", so this change removes this.
This change removes lines that sneaked in through a previous merge that caused conflicts. The `changelog` on `master` should be idential to the one in the stable branch.
|
Changes in this pull request will be available for download in Keyman version 18.0.158-alpha |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes the
upload-to-debian.shscript if thechore/linux/changelogbranch was created a while back while the base branch moved in the meantime. In this case we have to use--forceinstead of--force-with-leaseotherwisegitgets confused. This is safe to do since the intention is that we replace the previous commit and we know that there is (should be) only one commit on thechore/linux/changelogbranch.@keymanapp-test-bot skip