Skip to content

Commit

Permalink
Merge pull request #305 from greco-project/fix/github_actions_for_rel…
Browse files Browse the repository at this point in the history
…ease_branches

Fix GitHub actions for release branches
  • Loading branch information
SabineHaas authored May 11, 2021
2 parents ec17dfa + 3841088 commit 5f87f97
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
11 changes: 9 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand All @@ -31,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
Expand All @@ -40,6 +42,11 @@ jobs:
run: |
echo "EXECUTE_TESTS_ON=master" >> $GITHUB_ENV
- name: Set env for release branches
if: startsWith(github.ref, 'release')
run: |
echo "EXECUTE_TESTS_ON=master" >> $GITHUB_ENV
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,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)
Expand Down

0 comments on commit 5f87f97

Please sign in to comment.