Skip to content

Commit

Permalink
fix: add merge queue to avoid pushing to master entirely
Browse files Browse the repository at this point in the history
  • Loading branch information
fuziontech committed Aug 8, 2024
1 parent 8edd8b8 commit 8d8947e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
8 changes: 3 additions & 5 deletions .github/workflows/bump-version.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
name: Bump Version

on:
push:
branches:
- master
- merge_group

jobs:
bump-version:
Expand All @@ -24,7 +22,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.POSTHOG_BOT_GITHUB_TOKEN }}
run: |
pr_number=$(gh pr list --base master --state merged --limit 1 --json number --jq '.[0].number')
pr_number=$(jq --raw-output .number "$GITHUB_EVENT_PATH")
if [[ $(gh pr view $pr_number --json labels -q '.labels[].name' | grep -q "minor") ]]; then
echo "type=minor" >> $GITHUB_OUTPUT
else
Expand Down Expand Up @@ -64,7 +62,7 @@ jobs:
git config --local user.name "GitHub Action"
git add version.go CHANGELOG.md
git commit -m "Bump version to ${{ steps.bump-version.outputs.new_version }}"
git push https://$PAT@github.com/${{ github.repository }}.git HEAD:master
git push
- name: Create tag
run: |
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
name: Unit Tests

on:
- pull_request
on:
pull_request:
merge_group:

jobs:
build:
Expand Down

0 comments on commit 8d8947e

Please sign in to comment.