Skip to content

Commit 67af24a

Browse files
committed
Merge remote-tracking branch 'origin/development' into housekeeping_2024-12-17
2 parents b58f272 + ba2ae87 commit 67af24a

File tree

3 files changed

+16
-40
lines changed

3 files changed

+16
-40
lines changed

.gitlab-ci.yml

Lines changed: 14 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ setuptools:
5959
stage: python
6060
tags:
6161
- matesting2-container-runner
62-
image: git.damask-multiphysics.org:5050/damask/damask:python310_2407
62+
image: git.damask-multiphysics.org:5050/damask/damask:python310_2412
6363
before_script: []
6464
script:
6565
- sed -i 's/-[[:digit:]]*-.*//' VERSION
@@ -70,7 +70,7 @@ pytest:
7070
stage: python
7171
tags:
7272
- matesting2-container-runner
73-
image: git.damask-multiphysics.org:5050/damask/damask:python310_2407
73+
image: git.damask-multiphysics.org:5050/damask/damask:python310_2412
7474
before_script: []
7575
script:
7676
- export DAMASK_ROOT=$(pwd)
@@ -95,7 +95,7 @@ mypy:
9595
stage: python
9696
tags:
9797
- matesting2-container-runner
98-
image: git.damask-multiphysics.org:5050/damask/damask:python310_2407
98+
image: git.damask-multiphysics.org:5050/damask/damask:python310_2412
9999
before_script: []
100100
script:
101101
- cd python
@@ -107,7 +107,7 @@ unittest_GNU_DEBUG:
107107
stage: compile
108108
tags:
109109
- matesting2-container-runner
110-
image: git.damask-multiphysics.org:5050/damask/damask:ubuntu2404_gnu13_petsc2106
110+
image: git.damask-multiphysics.org:5050/damask/damask:ubuntu2404_gnu13_petsc2106_ml
111111
before_script:
112112
- TEMPDIR=$(mktemp -d /tmp/tmp.XXXXXXXXXX)
113113
- cmake -B ${TEMPDIR} -DDAMASK_SOLVER=test -DCMAKE_INSTALL_PREFIX=${TEMPDIR} -DCMAKE_BUILD_TYPE=RELEASE -DBUILDCMD_POST=-coverage
@@ -121,7 +121,7 @@ unittest_GNU_RELEASE:
121121
stage: compile
122122
tags:
123123
- matesting2-container-runner
124-
image: git.damask-multiphysics.org:5050/damask/damask:ubuntu2404_gnu13_petsc2106
124+
image: git.damask-multiphysics.org:5050/damask/damask:ubuntu2404_gnu13_petsc2106_ml
125125
before_script:
126126
- TEMPDIR=$(mktemp -d /tmp/tmp.XXXXXXXXXX)
127127
- cmake -B ${TEMPDIR} -DDAMASK_SOLVER=test -DCMAKE_INSTALL_PREFIX=${TEMPDIR} -DCMAKE_BUILD_TYPE=RELEASE -DBUILDCMD_POST=-coverage
@@ -135,7 +135,7 @@ unittest_GNU_PERFORMANCE:
135135
stage: compile
136136
tags:
137137
- matesting2-container-runner
138-
image: git.damask-multiphysics.org:5050/damask/damask:ubuntu2404_gnu13_petsc2106
138+
image: git.damask-multiphysics.org:5050/damask/damask:ubuntu2404_gnu13_petsc2106_ml
139139
before_script:
140140
- TEMPDIR=$(mktemp -d /tmp/tmp.XXXXXXXXXX)
141141
- cmake -B ${TEMPDIR} -DDAMASK_SOLVER=test -DCMAKE_INSTALL_PREFIX=${TEMPDIR} -DCMAKE_BUILD_TYPE=PERFORMANCE -DBUILDCMD_POST=-coverage
@@ -149,7 +149,7 @@ grid_GNU:
149149
stage: compile
150150
tags:
151151
- matesting2-container-runner
152-
image: git.damask-multiphysics.org:5050/damask/damask:ubuntu2404_gnu13_petsc2106
152+
image: git.damask-multiphysics.org:5050/damask/damask:ubuntu2404_gnu13_petsc2106_ml
153153
before_script:
154154
- source env/DAMASK.sh
155155
script:
@@ -160,7 +160,7 @@ mesh_GNU:
160160
stage: compile
161161
tags:
162162
- matesting2-container-runner
163-
image: git.damask-multiphysics.org:5050/damask/damask:ubuntu2404_gnu13_petsc2106
163+
image: git.damask-multiphysics.org:5050/damask/damask:ubuntu2404_gnu13_petsc2106_ml
164164
before_script:
165165
- source env/DAMASK.sh
166166
script:
@@ -171,7 +171,7 @@ grid_GNU-64bit:
171171
stage: compile
172172
tags:
173173
- matesting2-container-runner
174-
image: git.damask-multiphysics.org:5050/damask/damask:ubuntu2404_gnu13_petsc2106_64bit
174+
image: git.damask-multiphysics.org:5050/damask/damask:ubuntu2404_gnu13_petsc2106_int64
175175
before_script:
176176
- source env/DAMASK.sh
177177
script:
@@ -182,32 +182,8 @@ mesh_GNU-64bit:
182182
stage: compile
183183
tags:
184184
- matesting2-container-runner
185-
image: git.damask-multiphysics.org:5050/damask/damask:ubuntu2404_gnu13_petsc2106_64bit
186-
before_script:
187-
- source env/DAMASK.sh
188-
script:
189-
- cd PRIVATE/testing
190-
- pytest -k 'compile and mesh'
191-
192-
grid_intel:
193-
stage: compile
194-
tags:
195-
- matesting2-container-runner
196-
image: git.damask-multiphysics.org:5050/damask/damask:ubuntu2404_intel20232_petsc2106
185+
image: git.damask-multiphysics.org:5050/damask/damask:ubuntu2404_gnu13_petsc2106_int64
197186
before_script:
198-
- source /opt/intel/oneapi/setvars.sh
199-
- source env/DAMASK.sh
200-
script:
201-
- cd PRIVATE/testing
202-
- pytest -k 'compile and grid'
203-
204-
mesh_intel:
205-
stage: compile
206-
tags:
207-
- matesting2-container-runner
208-
image: git.damask-multiphysics.org:5050/damask/damask:ubuntu2404_intel20232_petsc2106
209-
before_script:
210-
- source /opt/intel/oneapi/setvars.sh
211187
- source env/DAMASK.sh
212188
script:
213189
- cd PRIVATE/testing
@@ -217,7 +193,7 @@ grid_IntelLLVM:
217193
stage: compile
218194
tags:
219195
- matesting2-container-runner
220-
image: git.damask-multiphysics.org:5050/damask/damask:ubuntu2404_intel_llvm20242_petsc2106
196+
image: git.damask-multiphysics.org:5050/damask/damask:ubuntu2404_intelllvm20250_petsc2106_ml
221197
before_script:
222198
- source /opt/intel/oneapi/setvars.sh
223199
- source env/DAMASK.sh
@@ -229,7 +205,7 @@ mesh_IntelLLVM:
229205
stage: compile
230206
tags:
231207
- matesting2-container-runner
232-
image: git.damask-multiphysics.org:5050/damask/damask:ubuntu2404_intel_llvm20242_petsc2106
208+
image: git.damask-multiphysics.org:5050/damask/damask:ubuntu2404_intelllvm20250_petsc2106_ml
233209
before_script:
234210
- source /opt/intel/oneapi/setvars.sh
235211
- source env/DAMASK.sh
@@ -260,7 +236,7 @@ open-source_grid_GNU:
260236
stage: fortran
261237
tags:
262238
- matesting2-container-runner
263-
image: git.damask-multiphysics.org:5050/damask/damask:ubuntu2204_gnu11_petsc2106_ml
239+
image: git.damask-multiphysics.org:5050/damask/damask:ubuntu2404_gnu13_petsc2106_ml
264240
before_script:
265241
- cmake -DDAMASK_SOLVER=GRID && make -j2 all install
266242
- source env/DAMASK.sh
@@ -288,7 +264,7 @@ open-source_grid_GNU_signal_restart:
288264
open-source_mesh_GNU:
289265
tags:
290266
- matesting2-container-runner
291-
image: git.damask-multiphysics.org:5050/damask/damask:ubuntu2204_gnu13_petsc2106_ml
267+
image: git.damask-multiphysics.org:5050/damask/damask:ubuntu2404_gnu13_petsc2106_ml
292268
stage: fortran
293269
before_script:
294270
- make mesh

PRIVATE

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.0-276-g71ecf4cce
1+
3.0.0-279-ga5d81db20

0 commit comments

Comments
 (0)