Skip to content

Commit

Permalink
TCN-875 Resolve sync v1 branch bug (#92)
Browse files Browse the repository at this point in the history
The last release [failed to sync the v1
branch](https://github.com/bufbuild/buf-setup-action/actions/runs/3758482157/jobs/6386878631)
with main and required manual intervention. I have fixed this bug on a
branch and tested
[here](https://github.com/elliotmjackson/buf-setup-action/actions/runs/3758581064/jobs/6387090474)
  • Loading branch information
elliotmjackson authored Dec 22, 2022
1 parent 8d2909c commit 4b89ef3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ jobs:
run: |
git fetch origin
git switch v1
git merge main
git merge origin/main
git push origin v1
- name: Release
id: ghr
Expand Down

0 comments on commit 4b89ef3

Please sign in to comment.