From 0daee04da3da85000cba374b6235bed8dfcee8f9 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Thu, 15 Feb 2024 22:55:28 +0900 Subject: [PATCH] Revert "use master branch instead of main" This reverts commit 259641efc9268b50b9ea9edd31f33c20a206b096. --- .github/workflows/build.yml | 4 ++-- .github/workflows/docker.yml | 2 +- .github/workflows/docs.yml | 4 ++-- .github/workflows/style.yml | 4 ++-- .github/workflows/tests.yml | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c8a57a1e8..3ebb499ae 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,12 +2,12 @@ name: Build on: push: - branches: [ master ] + branches: [ main ] paths-ignore: - 'src/pretalx/locale/**' - 'doc/**' pull_request: - branches: [ master ] + branches: [ main ] paths-ignore: - 'src/pretalx/locale/**' - 'doc/**' diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 93eb88580..7c0d3a7a9 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: # allows to be run manually push: branches: - - 'master' + - 'main' - 'development' jobs: docker: diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 458873626..87f418e78 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -2,11 +2,11 @@ name: Documentation on: push: - branches: [ master ] + branches: [ main ] paths: - 'doc/**' pull_request: - branches: [ master ] + branches: [ main ] paths-ignore: - 'doc/**' diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml index 52e81bcca..65277331e 100644 --- a/.github/workflows/style.yml +++ b/.github/workflows/style.yml @@ -2,13 +2,13 @@ name: Code Style on: push: - branches: [ master ] + branches: [ main ] paths-ignore: - 'src/pretalx/locale/**' - 'src/pretalx/static/**' - 'doc/**' pull_request: - branches: [ master ] + branches: [ main ] paths-ignore: - 'src/pretalx/locale/**' - 'src/pretalx/static/**' diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4e19180c4..cf4adfa2b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -2,12 +2,12 @@ name: Tests on: push: - branches: [ master ] + branches: [ main ] paths-ignore: - 'doc/**' - 'src/pretalx/locale/**' pull_request: - branches: [ master ] + branches: [ main ] paths-ignore: - 'doc/**' - 'src/pretalx/locale/**' @@ -126,4 +126,4 @@ jobs: label: coverage message: ${{ env.TOTAL_COV }}% color: "#3aa57c" - if: env.TOTAL_COV && github.ref == 'refs/heads/master' + if: env.TOTAL_COV && github.ref == 'refs/heads/main'