From 0924d95ca71bf4981153fd8aed2ef83f50e82d46 Mon Sep 17 00:00:00 2001 From: Sascha Doemer Date: Sat, 13 Mar 2021 17:48:33 +0100 Subject: [PATCH 1/2] Update CI configurations to match the new branch names. --- .github/workflows/codeql-analysis.yml | 6 ++---- .github/workflows/continuous_integration.yml | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index bd21119e..046b678e 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -2,11 +2,9 @@ name: "CodeQL" on: push: - branches: [develop, master] + branches: [main, releases/**] pull_request: - branches: [develop] - schedule: - - cron: '0 15 * * 5' + branches: [main] jobs: analyze: diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index b092b9ab..17b50600 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -3,10 +3,10 @@ name: Continuous integration on: push: branches: - - develop + - main pull_request: branches: - - develop + - main jobs: build_jdk8: From b97a7909300a8f0f75085f24664a734da53b9df2 Mon Sep 17 00:00:00 2001 From: Sascha Doemer Date: Sat, 13 Mar 2021 17:51:14 +0100 Subject: [PATCH 2/2] Update CI configurations to match the new branch names. --- .github/workflows/codeql-analysis.yml | 8 ++++++-- .github/workflows/continuous_integration.yml | 6 ++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 046b678e..69ad51b4 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -2,9 +2,13 @@ name: "CodeQL" on: push: - branches: [main, releases/**] + branches: + - "main" + - "releases/**" pull_request: - branches: [main] + branches: + - "main" + - "releases/**" jobs: analyze: diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index 17b50600..8467173d 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -3,10 +3,12 @@ name: Continuous integration on: push: branches: - - main + - "main" + - "releases/**" pull_request: branches: - - main + - "main" + - "releases/**" jobs: build_jdk8: