Skip to content

Commit 1c6ce32

Browse files
pcarruscagpcarruscag
authored
Merge pull request #2540 from su2code/fix_cgns_build
Update docker images
2 parents 20e6e6a + c5a75f0 commit 1c6ce32

File tree

3 files changed

+27
-27
lines changed

3 files changed

+27
-27
lines changed

‎.github/workflows/regression.yml‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ jobs:
5454
key: ${{ matrix.config_set }}-${{ github.sha }}
5555
restore-keys: ${{ matrix.config_set }}
5656
- name: Pre Cleanup
57-
uses: docker://ghcr.io/su2code/su2/build-su2:240320-1536
57+
uses: docker://ghcr.io/su2code/su2/build-su2:250717-1402
5858
with:
5959
entrypoint: /bin/rm
6060
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
6161
- name: Build
62-
uses: docker://ghcr.io/su2code/su2/build-su2:240320-1536
62+
uses: docker://ghcr.io/su2code/su2/build-su2:250717-1402
6363
with:
6464
args: -b ${{github.ref}} -f "${{matrix.flags}}"
6565
- name: Compress binaries
@@ -70,7 +70,7 @@ jobs:
7070
name: ${{ matrix.config_set }}
7171
path: install_bin.tgz
7272
- name: Post Cleanup
73-
uses: docker://ghcr.io/su2code/su2/build-su2:240320-1536
73+
uses: docker://ghcr.io/su2code/su2/build-su2:250717-1402
7474
with:
7575
entrypoint: /bin/rm
7676
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -97,12 +97,12 @@ jobs:
9797
key: ${{ matrix.config_set }}-${{ github.sha }}
9898
restore-keys: ${{ matrix.config_set }}
9999
- name: Pre Cleanup
100-
uses: docker://ghcr.io/su2code/su2/build-su2-tsan:240320-1536
100+
uses: docker://ghcr.io/su2code/su2/build-su2-tsan:250717-1402
101101
with:
102102
entrypoint: /bin/rm
103103
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
104104
- name: Build
105-
uses: docker://ghcr.io/su2code/su2/build-su2-tsan:240320-1536
105+
uses: docker://ghcr.io/su2code/su2/build-su2-tsan:250717-1402
106106
with:
107107
args: -b ${{github.ref}} -f "${{matrix.flags}}"
108108
- name: Compress binaries
@@ -113,7 +113,7 @@ jobs:
113113
name: ${{ matrix.config_set }}
114114
path: install_bin.tgz
115115
- name: Post Cleanup
116-
uses: docker://ghcr.io/su2code/su2/build-su2-tsan:240320-1536
116+
uses: docker://ghcr.io/su2code/su2/build-su2-tsan:250717-1402
117117
with:
118118
entrypoint: /bin/rm
119119
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -137,12 +137,12 @@ jobs:
137137
key: ${{ matrix.config_set }}-${{ github.sha }}
138138
restore-keys: ${{ matrix.config_set }}
139139
- name: Pre Cleanup
140-
uses: docker://ghcr.io/su2code/su2/build-su2-asan:240320-1536
140+
uses: docker://ghcr.io/su2code/su2/build-su2-asan:250717-1402
141141
with:
142142
entrypoint: /bin/rm
143143
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
144144
- name: Build
145-
run: docker run --rm --cap-add SYS_PTRACE -v $(pwd):${{ github.workspace }} -w ${{ github.workspace }} ghcr.io/su2code/su2/build-su2-asan:240320-1536 -b ${{github.ref}} -f "${{matrix.flags}}"
145+
run: docker run --rm --cap-add SYS_PTRACE -v $(pwd):${{ github.workspace }} -w ${{ github.workspace }} ghcr.io/su2code/su2/build-su2-asan:250717-1402 -b ${{github.ref}} -f "${{matrix.flags}}"
146146
- name: Compress binaries
147147
run: tar -zcvf install_bin.tgz install/*
148148
- name: Upload Binaries
@@ -151,7 +151,7 @@ jobs:
151151
name: ${{ matrix.config_set }}
152152
path: install_bin.tgz
153153
- name: Post Cleanup
154-
uses: docker://ghcr.io/su2code/su2/build-su2-asan:240320-1536
154+
uses: docker://ghcr.io/su2code/su2/build-su2-asan:250717-1402
155155
with:
156156
entrypoint: /bin/rm
157157
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -182,7 +182,7 @@ jobs:
182182
tag: OMP
183183
steps:
184184
- name: Pre Cleanup
185-
uses: docker://ghcr.io/su2code/su2/test-su2:240320-1536
185+
uses: docker://ghcr.io/su2code/su2/test-su2:250717-1402
186186
with:
187187
entrypoint: /bin/rm
188188
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -208,12 +208,12 @@ jobs:
208208
chmod a+x $BIN_FOLDER/*
209209
ls -lahR $BIN_FOLDER
210210
- name: Run Tests in Container
211-
uses: docker://ghcr.io/su2code/su2/test-su2:240320-1536
211+
uses: docker://ghcr.io/su2code/su2/test-su2:250717-1402
212212
with:
213213
# -t <Tutorials-branch> -c <Testcases-branch>
214214
args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}}
215215
- name: Cleanup
216-
uses: docker://ghcr.io/su2code/su2/test-su2:240320-1536
216+
uses: docker://ghcr.io/su2code/su2/test-su2:250717-1402
217217
with:
218218
entrypoint: /bin/rm
219219
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -231,7 +231,7 @@ jobs:
231231
tag: TagNoMPI
232232
steps:
233233
- name: Pre Cleanup
234-
uses: docker://ghcr.io/su2code/su2/test-su2:240320-1536
234+
uses: docker://ghcr.io/su2code/su2/test-su2:250717-1402
235235
with:
236236
entrypoint: /bin/rm
237237
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -257,12 +257,12 @@ jobs:
257257
chmod a+x $BIN_FOLDER/*
258258
ls -lahR $BIN_FOLDER
259259
- name: Run Tests in Container
260-
uses: docker://ghcr.io/su2code/su2/test-su2:240320-1536
260+
uses: docker://ghcr.io/su2code/su2/test-su2:250717-1402
261261
with:
262262
# -t <Tutorials-branch> -c <Testcases-branch>
263263
args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}} -a "--tapetests"
264264
- name: Cleanup
265-
uses: docker://ghcr.io/su2code/su2/test-su2:240320-1536
265+
uses: docker://ghcr.io/su2code/su2/test-su2:250717-1402
266266
with:
267267
entrypoint: /bin/rm
268268
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -277,7 +277,7 @@ jobs:
277277
testscript: ['hybrid_regression.py', 'hybrid_regression_AD.py']
278278
steps:
279279
- name: Pre Cleanup
280-
uses: docker://ghcr.io/su2code/su2/test-su2-tsan:240320-1536
280+
uses: docker://ghcr.io/su2code/su2/test-su2-tsan:250717-1402
281281
with:
282282
entrypoint: /bin/rm
283283
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -303,12 +303,12 @@ jobs:
303303
chmod a+x $BIN_FOLDER/*
304304
ls -lahR $BIN_FOLDER
305305
- name: Run Tests in Container
306-
uses: docker://ghcr.io/su2code/su2/test-su2-tsan:240320-1536
306+
uses: docker://ghcr.io/su2code/su2/test-su2-tsan:250717-1402
307307
with:
308308
# -t <Tutorials-branch> -c <Testcases-branch>
309309
args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}} -a "--tsan"
310310
- name: Cleanup
311-
uses: docker://ghcr.io/su2code/su2/test-su2-tsan:240320-1536
311+
uses: docker://ghcr.io/su2code/su2/test-su2-tsan:250717-1402
312312
with:
313313
entrypoint: /bin/rm
314314
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -322,7 +322,7 @@ jobs:
322322
testscript: ['serial_regression.py', 'serial_regression_AD.py']
323323
steps:
324324
- name: Pre Cleanup
325-
uses: docker://ghcr.io/su2code/su2/test-su2-asan:240320-1536
325+
uses: docker://ghcr.io/su2code/su2/test-su2-asan:250717-1402
326326
with:
327327
entrypoint: /bin/rm
328328
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -348,12 +348,12 @@ jobs:
348348
chmod a+x $BIN_FOLDER/*
349349
ls -lahR $BIN_FOLDER
350350
- name: Run Tests in Container
351-
uses: docker://ghcr.io/su2code/su2/test-su2-asan:240320-1536
351+
uses: docker://ghcr.io/su2code/su2/test-su2-asan:250717-1402
352352
with:
353353
# -t <Tutorials-branch> -c <Testcases-branch>
354354
args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}} -a "--asan"
355355
- name: Cleanup
356-
uses: docker://ghcr.io/su2code/su2/test-su2-asan:240320-1536
356+
uses: docker://ghcr.io/su2code/su2/test-su2-asan:250717-1402
357357
with:
358358
entrypoint: /bin/rm
359359
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -374,7 +374,7 @@ jobs:
374374
tag: MPI
375375
steps:
376376
- name: Pre Cleanup
377-
uses: docker://ghcr.io/su2code/su2/test-su2:240320-1536
377+
uses: docker://ghcr.io/su2code/su2/test-su2:250717-1402
378378
with:
379379
entrypoint: /bin/rm
380380
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -435,11 +435,11 @@ jobs:
435435
echo $PWD
436436
ls -lahR
437437
- name: Run Unit Tests
438-
uses: docker://ghcr.io/su2code/su2/test-su2:240320-1536
438+
uses: docker://ghcr.io/su2code/su2/test-su2:250717-1402
439439
with:
440440
entrypoint: install/bin/${{matrix.testdriver}}
441441
- name: Post Cleanup
442-
uses: docker://ghcr.io/su2code/su2/test-su2:240320-1536
442+
uses: docker://ghcr.io/su2code/su2/test-su2:250717-1402
443443
with:
444444
entrypoint: /bin/rm
445445
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}

‎.github/workflows/release-management.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
key: ${{ matrix.os_bin }}-${{ github.sha }}
3636
restore-keys: ${{ matrix.os_bin }}
3737
- name: Build
38-
uses: docker://ghcr.io/su2code/su2/build-su2-cross:230813-0103
38+
uses: docker://ghcr.io/su2code/su2/build-su2-cross:250717-1402
3939
with:
4040
args: -b ${{ github.sha }} -f "${{matrix.flags}}"
4141
- name: Create Archive

‎docker/build/compileSU2.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ else
6060
fi
6161

6262
if [ ! -d "docker_build" ]; then
63-
./meson.py docker_build --prefix=$workdir/install $flags
63+
./meson.py setup docker_build --prefix=$workdir/install $flags
6464
else
6565
echo "Build Directory found. Ignoring build flags. To set new flags, remove docker_build directory."
66-
./meson.py docker_build --reconfigure $flags
66+
./meson.py setup docker_build --reconfigure $flags
6767
fi
6868

6969
./ninja -C docker_build install

0 commit comments

Comments
 (0)