Skip to content

Commit f5f7d99

Browse files
Fix #11616 Include geonode-#.#.x branches to build and CI workflows (#11617)
* Add geonode branch to build and CI github workflows * Update CI conditions for build-publish job * Apply suggestion from @offtherailz * Apply suggestion from @offtherailz --------- Co-authored-by: Lorenzo Natali <[email protected]>
1 parent 178c439 commit f5f7d99

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

.github/workflows/CI.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,15 @@ on:
88
- master
99
# using filter pattern: https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#filter-pattern-cheat-sheet
1010
- '[cC][0-9][0-9][0-9]-+**' # c123 or c123-something for custom branch
11-
- '[0-9][0-9][0-9][0-9].[0-9][0-9].xx' # stable brances. E.g. 2021.01.xx
11+
- '[0-9][0-9][0-9][0-9].[0-9][0-9].xx' # stable branches. E.g. 2021.01.xx
12+
- '[geonode]-[0-9].[0-9].x' # stable branches for GeoNode. E.g. geonode-4.4.x
1213
pull_request:
1314
branches:
1415
- master
1516
# using filter pattern: https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#filter-pattern-cheat-sheet
1617
- '[cC][0-9][0-9][0-9]-+**' # c123 or c123-something for custom branch
17-
- '[0-9][0-9][0-9][0-9].[0-9][0-9].xx' # stable brances. E.g. 2021.01.xx
18+
- '[0-9][0-9][0-9][0-9].[0-9][0-9].xx' # stable branches. E.g. 2021.01.xx
19+
- '[geonode]-[0-9].[0-9].x' # stable branches for GeoNode. E.g. geonode-4.4.x
1820

1921
jobs:
2022
test-front-end:
@@ -151,7 +153,12 @@ jobs:
151153
run: mvn --batch-mode --update-snapshots verify
152154
build-publish:
153155
runs-on: ubuntu-latest
154-
if: ${{ github.event_name == 'push' && github.repository == 'geosolutions-it/MapStore2' }}
156+
if: |
157+
github.event_name == 'push' &&
158+
github.repository == 'geosolutions-it/MapStore2' &&
159+
(
160+
github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/20')
161+
)
155162
needs: [test-front-end, test-back-end, build]
156163
steps:
157164
- name: "checking out"

.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
# using filter pattern: https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#filter-pattern-cheat-sheet
77
- '[cC][0-9][0-9][0-9]-+**' # c123 or c123-something for custom branch
88
- '[0-9][0-9][0-9][0-9].[0-9][0-9].xx' # stable brances. E.g. 2021.01.xx
9+
- '[geonode]-[0-9].[0-9].x' # stable branches for GeoNode. E.g. geonode-4.4.x
910

1011
jobs:
1112
build-publish:

0 commit comments

Comments
 (0)