From 997621782b18ed1a0749cb392e9cf9bfa3169321 Mon Sep 17 00:00:00 2001 From: vsoch Date: Sun, 6 Jun 2021 12:56:42 -0600 Subject: [PATCH] adding branch main to all GitHub workflows Signed-off-by: vsoch --- .github/workflows/install.yml | 2 ++ .github/workflows/macos.yml | 2 ++ .github/workflows/standalone.yml | 2 ++ .github/workflows/style.yml | 3 +++ .github/workflows/ubuntu.yml | 3 +++ .github/workflows/windows.yml | 3 +++ README.md | 1 - 7 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml index 606dddd..8e616f9 100644 --- a/.github/workflows/install.yml +++ b/.github/workflows/install.yml @@ -4,9 +4,11 @@ on: push: branches: - master + - main pull_request: branches: - master + - main env: CTEST_OUTPUT_ON_FAILURE: 1 diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index a2a098f..7f82fed 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -4,9 +4,11 @@ on: push: branches: - master + - main pull_request: branches: - master + - main env: CTEST_OUTPUT_ON_FAILURE: 1 diff --git a/.github/workflows/standalone.yml b/.github/workflows/standalone.yml index 5c3853e..079ca7e 100644 --- a/.github/workflows/standalone.yml +++ b/.github/workflows/standalone.yml @@ -4,9 +4,11 @@ on: push: branches: - master + - main pull_request: branches: - master + - main env: CPM_SOURCE_CACHE: ${{ github.workspace }}/cpm_modules diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml index ba20a70..64c8968 100644 --- a/.github/workflows/style.yml +++ b/.github/workflows/style.yml @@ -4,9 +4,12 @@ on: push: branches: - master + - main + pull_request: branches: - master + - main env: CPM_SOURCE_CACHE: ${{ github.workspace }}/cpm_modules diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index a36711d..08d93d3 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -4,9 +4,12 @@ on: push: branches: - master + - main + pull_request: branches: - master + - main env: CTEST_OUTPUT_ON_FAILURE: 1 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index a52b0ae..449db6f 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -4,9 +4,12 @@ on: push: branches: - master + - main + pull_request: branches: - master + - main env: CTEST_OUTPUT_ON_FAILURE: 1 diff --git a/README.md b/README.md index f50652a..b69777c 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,6 @@ This template is the result of learnings from many previous projects and should - Replace the source files with your own - For header-only libraries: see the comments in [CMakeLists.txt](CMakeLists.txt) - Add [your project's codecov token](https://docs.codecov.io/docs/quick-start) to your project's github secrets under `CODECOV_TOKEN` -- Update the branch triggers in the [.github/workflows](.github/workflows) to be your main branch (the default is "master" and if your main branch is "main" the workflows will not trigger) - Happy coding! Eventually, you can remove any unused files, such as the standalone directory or irrelevant github workflows for your project.