From 69f47936fae81ad25922cec87c88c040a0027554 Mon Sep 17 00:00:00 2001 From: SabineH Date: Fri, 7 May 2021 11:22:26 +0200 Subject: [PATCH 1/5] Add release branches to push events --- .github/workflows/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a951e63c..04eb7ee1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,12 +3,14 @@ name: CI # Controls when the action will run. # Triggers the workflow on push or pull request -# events; push events only for dev and master branch +# events; push events only for dev, master and release branches on: push: branches: - dev - master + - release + - 'release-*' pull_request: From 6568471c87a9a240d19cab5956cff98ef30f250b Mon Sep 17 00:00:00 2001 From: SabineH Date: Fri, 7 May 2021 11:22:38 +0200 Subject: [PATCH 2/5] Correct dev env setting --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 04eb7ee1..406bffea 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,7 +33,7 @@ jobs: uses: actions/checkout@v2 - name: Set env for dev branch - if: endsWith(github.ref, '/develop') + if: endsWith(github.ref, '/dev') run: | echo "EXECUTE_TESTS_ON=dev" >> $GITHUB_ENV From d86aa9adea3150cebb745348b9edf08458295dc0 Mon Sep 17 00:00:00 2001 From: SabineH Date: Fri, 7 May 2021 11:23:01 +0200 Subject: [PATCH 3/5] set env for release branches EXECUTE_TEST_ON = master --- .github/workflows/main.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 406bffea..a80ca859 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -42,6 +42,11 @@ jobs: run: | echo "EXECUTE_TESTS_ON=master" >> $GITHUB_ENV + - name: Set env for release branches + if: endsWith(github.ref, 'release-*') + run: | + echo "EXECUTE_TESTS_ON=master" >> $GITHUB_ENV + - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v2 with: From 4fd79438dd108f96a95030c2d500b6bb30613c7f Mon Sep 17 00:00:00 2001 From: SabineH Date: Fri, 7 May 2021 11:30:28 +0200 Subject: [PATCH 4/5] update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f3d163be..9b4e95a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -49,6 +49,8 @@ Here is a template for new release sections - fix PV costs parameters and PSI lifetime (#273) - fix number of houses to 20 (8 flats per storey makes 40 flats per house with 5 storeys, makes 800 in total (and 480 for 3 storeys)) (#273) - Test coverage is now automatically checked with github actions and [coveralls](https://coveralls.io/github/greco-project/pvcompare) (#283) +- In github actions workflow, add release branches to push events and correct name of `dev` branch (#305) +- In github actions workflow, set `EXECUTE_TEST_ON` to `"master"` for release branches (#305) # Hot fixes - Hot fix: install MVS with option `[report]` to install missing packages (#270) From d17a3d63ca1a3682de1729f57ddc36607ccbc270 Mon Sep 17 00:00:00 2001 From: Sabine Haas Date: Fri, 7 May 2021 11:46:32 +0200 Subject: [PATCH 5/5] fix indent --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a80ca859..ef552a83 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -43,8 +43,8 @@ jobs: echo "EXECUTE_TESTS_ON=master" >> $GITHUB_ENV - name: Set env for release branches - if: endsWith(github.ref, 'release-*') - run: | + if: startsWith(github.ref, 'release') + run: | echo "EXECUTE_TESTS_ON=master" >> $GITHUB_ENV - name: Set up Python ${{ matrix.python-version }}