Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/check-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ on:
push:
branches:
- next
permissions:
contents: read
env:
HUSKY: 0
jobs:
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/merge-to-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,17 @@ name: Attempt to merge next to main
on:
workflow_dispatch:

permissions:
contents: read

jobs:
# Check if next can merge into main
perform_merge:
name: Perform merge if "next" can merge into "main"
runs-on: ubuntu-latest
permissions:
contents: write #because we push - git push origin "main"
pull-requests: write # PR updates
steps:
- name: Checkout
uses: actions/checkout@v2
Expand Down Expand Up @@ -40,4 +46,4 @@ jobs:

steps:
- name: Post error message (To-Do)
run: echo "Next cannot be merged into main cleanly"
run: echo "Next cannot be merged into main cleanly"
9 changes: 7 additions & 2 deletions .github/workflows/merge-to-next-major.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,17 @@ on:
workflow_dispatch:
push:
branches:
- "next"
- 'next'
permissions:
contents: read

jobs:
# Check if next can merge into next-major
perform_merge:
name: Perform merge if "next" can merge into "next-major"
permissions:
contents: write #because we push - git push origin "next-major"
pull-requests: write # PR updates
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand Down Expand Up @@ -69,4 +74,4 @@ jobs:

steps:
- name: Post error message (To-Do)
run: echo "Next cannot be merged into next-major cleanly"
run: echo "Next cannot be merged into next-major cleanly"
2 changes: 2 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ on:
branches:
- 'main'
- 'next'
permissions:
contents: read
env:
HUSKY: 0
jobs:
Expand Down