Skip to content

Commit 05589cd

Browse files
committed
Rearranged gitlab jobs with DAC
1 parent c34db8a commit 05589cd

File tree

2 files changed

+17
-8
lines changed

2 files changed

+17
-8
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
site
12
lib
23

34
# Temporary dirs

.gitlab-ci.yml

+16-8
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
# SPDX-License-Identifier: CC0-1.0
66
# SPDX-FileContributor Carsten Lemmen <[email protected]
77

8-
# First stage checks for metadata (licenses)
8+
# Stages are here defined as categorical only, as the CI/CD makes
9+
# use of directed acyclic graph technique with the needs job keyword
910
stages:
1011
- lint
11-
- build-schism
12-
- build-schism-esmf
12+
- doc
13+
- build
1314
- docker
1415
- test
1516

@@ -29,6 +30,7 @@ variables:
2930
license-compliance:
3031
image: python:3.11
3132
stage: lint
33+
needs: []
3234
before_script:
3335
- pip install --upgrade pip
3436
- pip install poetry
@@ -39,7 +41,8 @@ license-compliance:
3941

4042
mike-documentation:
4143
image: python:3.11
42-
stage: lint
44+
stage: doc
45+
needs: []
4346
before_script:
4447
- pip install --upgrade pip
4548
- pip install mkdocs-material mike
@@ -57,7 +60,8 @@ mike-documentation:
5760

5861
build-schism:
5962
image: ${CONTAINER_REGISTRY_BASEIMAGE}
60-
stage: build-schism
63+
stage: build
64+
needs: []
6165

6266
parallel:
6367
matrix:
@@ -76,13 +80,15 @@ build-schism:
7680
- ./devel/schism/build/include/
7781
- ./devel/schism/build/lib/
7882
- ./devel/schism/build/bin/pschis*
83+
expire_in: 20 minutes
84+
7985
allow_failure: false
8086
interruptible: true
8187

8288
build-schism-esmf:
8389
image: ${CONTAINER_REGISTRY_BASEIMAGE}
84-
stage: build-schism-esmf
85-
dependencies:
90+
stage: build
91+
needs:
8692
- build-schism
8793
parallel:
8894
matrix:
@@ -107,6 +113,7 @@ build-docker:
107113
allow_failure: true
108114
interruptible: true
109115
stage: docker
116+
needs: []
110117
before_script:
111118
- docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY
112119

@@ -124,9 +131,10 @@ test-docker:
124131
allow_failure: true
125132
interruptible: true
126133
stage: test
134+
needs:
135+
- build-docker
127136
before_script:
128137
- docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY
129-
130138
script:
131139
- docker pull ${CONTAINER_REGISTRY_IMAGE}
132140
- docker run ${CONTAINER_REGISTRY_IMAGE} /usr/local/bin/ESMF_PrintInfo

0 commit comments

Comments
 (0)