Skip to content

Commit dadc170

Browse files
authored
release: 2.18 (#91)
2 parents f6f869e + 21a3255 commit dadc170

27 files changed

Lines changed: 3313 additions & 1016 deletions

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ jobs:
150150
151151
update-homebrew:
152152
needs: [release, build-binaries]
153-
if: needs.release.outputs.new_release_published == 'true'
153+
if: needs.release.outputs.new_release_published == 'true' && github.ref == 'refs/heads/release'
154154
runs-on: ubuntu-latest
155155

156156
steps:

.github/workflows/sync-release-to-main.yaml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,5 @@ jobs:
4040
--base main \
4141
--head release \
4242
--title "chore: sync release to main" \
43-
--body "Automated sync of release tags back to main."
44-
fi
45-
46-
- name: Enable auto-merge on sync PR
47-
if: steps.check.outputs.ahead != '0'
48-
env:
49-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
50-
run: |
51-
PR=$(gh pr list --repo ${{ github.repository }} --base main --head release --state open --json number --jq '.[0].number')
52-
if [ -n "$PR" ]; then
53-
gh pr merge "$PR" --repo ${{ github.repository }} --merge --auto
43+
--body "Automated sync of release tags back to main. Merge with **merge commit**."
5444
fi

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ dist/
33
*.log
44
.DS_Store
55
.env
6+
.env.test
67
.env.local
78
.env.development.local
89
.env.test.local

0 commit comments

Comments
 (0)