Skip to content

Commit

Permalink
Merge pull request #934 from technologiestiftung/staging
Browse files Browse the repository at this point in the history
chore: set default branch to main for actions
  • Loading branch information
Jaszkowic committed Jun 12, 2024
2 parents 1898157 + ed40823 commit e342600
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ permissions:
packages: write
on:
push:
branches: [master]
branches: [main]
pull_request:
branches: [master]
branches: [main]
workflow_dispatch:
inputs:
debug_enabled:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linting-and-unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ permissions:
packages: write
on:
push:
branches: [master, staging]
branches: [main, staging]
pull_request:
branches: [master, staging]
branches: [main, staging]
jobs:
test:
runs-on: ubuntu-latest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/warnForPRIntoMain.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "Prevent merge from non-staging to master"
name: "Prevent merge from non-staging to main"
on:
pull_request:
types: [opened, synchronize, reopened]
Expand All @@ -12,4 +12,4 @@ jobs:
uses: "technologiestiftung/warn-for-main-merge-action@v1.13"
with:
stagingName: "staging"
mainName: "master"
mainName: "main"

0 comments on commit e342600

Please sign in to comment.