From 287a977592c28d33eab4ddf48b8dd0b0f3de98a6 Mon Sep 17 00:00:00 2001 From: Jizu Sun Date: Sun, 28 Feb 2021 00:18:06 +0800 Subject: [PATCH 1/3] add main --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d2fee95..c058207 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,6 +4,7 @@ on: push: branches: - master + - main pull_request: branches: - '*' From 4bb000b58ae16fac1d42b7238653689d1abb2f3a Mon Sep 17 00:00:00 2001 From: Jizu Sun Date: Sun, 28 Feb 2021 09:52:07 +0800 Subject: [PATCH 2/3] add branch main for codeql --- .github/workflows/codeql-analysis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 7db87df..89c69d1 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -2,10 +2,10 @@ name: "CodeQL" on: push: - branches: [ master ] + branches: [ master, main ] pull_request: # The branches below must be a subset of the branches above - branches: [ master ] + branches: [ master, main ] schedule: - cron: '11 0 * * 5' From 4f74470e934329cfac18da5641f5dbe5ac3c1b32 Mon Sep 17 00:00:00 2001 From: Jizu Sun Date: Sun, 28 Feb 2021 09:53:09 +0800 Subject: [PATCH 3/3] prioritize --- .github/workflows/build.yml | 2 +- .github/workflows/codeql-analysis.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c058207..6b741bf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,8 +3,8 @@ name: build on: push: branches: - - master - main + - master pull_request: branches: - '*' diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 89c69d1..ecf9694 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -2,10 +2,10 @@ name: "CodeQL" on: push: - branches: [ master, main ] + branches: [ main, master ] pull_request: # The branches below must be a subset of the branches above - branches: [ master, main ] + branches: [ main, master ] schedule: - cron: '11 0 * * 5'