diff options
| author | Florian Bruhin <me@the-compiler.org> | 2023-08-16 23:22:37 +0200 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2023-08-17 12:42:21 +0200 |
| commit | 67ae39561a22bdd80ca7419fdd158a7f1b938b47 (patch) | |
| tree | b983eb3f6faaf7e76a95105ba24b09fe3a824332 | |
| parent | fa74860417f82a922183e2fbe522b0b98d324baf (diff) | |
| download | qutebrowser-67ae39561a22bdd80ca7419fdd158a7f1b938b47.tar.gz qutebrowser-67ae39561a22bdd80ca7419fdd158a7f1b938b47.zip | |
ci: Use -x for cherry picks
| -rw-r--r-- | .github/workflows/release.yml | 2 | ||||
| -rw-r--r-- | scripts/dev/update_version.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9b9dde525..54f79f945 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -95,7 +95,7 @@ jobs: if: ${{ github.event.inputs.release_type == 'patch' }} run: | git checkout main - git cherry-pick v${{ steps.bump.outputs.version }} + git cherry-pick -x v${{ steps.bump.outputs.version }} git push origin main git checkout v${{ steps.bump.outputs.version_x }} - name: Create release branch diff --git a/scripts/dev/update_version.py b/scripts/dev/update_version.py index 1029fb29d..424a77559 100644 --- a/scripts/dev/update_version.py +++ b/scripts/dev/update_version.py @@ -89,7 +89,7 @@ if __name__ == "__main__": print("Run the following commands to create a new release:") print("* git push origin; git push origin v{v}".format(v=version)) if args.bump == 'patch': - print("* git checkout main && git cherry-pick v{v} && " + print("* git checkout main && git cherry-pick -x v{v} && " "git push origin".format(v=version)) else: print("* git branch v{x} v{v} && git push --set-upstream origin v{x}" |