Skip to content

Commit 08daa54

Browse files
vicenteboleavicentebolea
committed
fixup! fixup! fixup
1 parent 813311d commit 08daa54

File tree

5 files changed

+19
-19
lines changed

5 files changed

+19
-19
lines changed

‎.github/workflows/everything.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ jobs:
114114

115115
runs-on: ubuntu-20.04
116116
container:
117-
image: ghcr.io/ornladios/adios2:ci-tmp-spack-${{ matrix.os }}-${{ matrix.compiler }}
117+
image: ghcr.io/ornladios/adios2:ci-spack-${{ matrix.os }}-${{ matrix.compiler }}
118118
options: --shm-size=1g
119119
env:
120120
GH_YML_JOBNAME: ${{ matrix.os }}-${{ matrix.compiler }}${{ matrix.shared == 'static' && '-static' || ''}}-${{ matrix.parallel }}
@@ -535,7 +535,7 @@ jobs:
535535
name: CodeQL
536536
runs-on: ubuntu-latest
537537
container:
538-
image: 'ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-gcc8'
538+
image: 'ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc8'
539539
env:
540540
GH_YML_JOBNAME: ubuntu20.04-gcc8-serial-codeql
541541
GH_YML_BASE_OS: Linux

‎scripts/ci/images/Dockerfile.ci-spack-ubuntu20.04-clang‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-base
1+
FROM ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-base
22
ARG CLANG_VERSION=10
33

44
RUN apt-get update && apt-get install -y \

‎scripts/ci/images/Dockerfile.ci-spack-ubuntu20.04-gcc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-base
1+
FROM ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-base
22
ARG GCC_VERSION=8
33

44
RUN apt-get update && apt-get install -y \

‎scripts/ci/images/Dockerfile.ci-spack-ubuntu20.04-intel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-base
1+
FROM ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-base
22

33
RUN wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | tee /usr/share/keyrings/oneapi-archive-keyring.gpg && \
44
echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | tee /etc/apt/sources.list.d/oneAPI.list && \

‎scripts/ci/images/build-ubuntu.sh‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ docker build --progress=plain \
77
--build-arg EXTRA_VARIANTS="+blosc+ssc ^mgard@2023-01-10" \
88
--build-arg PATCH_VARIANT_XROOTD=ON \
99
--rm -f ./Dockerfile.ci-spack-ubuntu20.04-base \
10-
-t ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-base \
10+
-t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-base \
1111
.
1212

1313
# Build the gcc8, gcc9, and gcc10 images
14-
docker build --rm --build-arg GCC_VERSION=8 -f ./Dockerfile.ci-spack-ubuntu20.04-gcc -t ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-gcc8 .
15-
docker build --rm --build-arg GCC_VERSION=10 -f ./Dockerfile.ci-spack-ubuntu20.04-gcc -t ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-gcc10 .
16-
docker build --rm --build-arg GCC_VERSION=9 -f ./Dockerfile.ci-spack-ubuntu20.04-gcc -t ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-gcc9 .
14+
docker build --rm --build-arg GCC_VERSION=8 -f ./Dockerfile.ci-spack-ubuntu20.04-gcc -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc8 .
15+
docker build --rm --build-arg GCC_VERSION=10 -f ./Dockerfile.ci-spack-ubuntu20.04-gcc -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc10 .
16+
docker build --rm --build-arg GCC_VERSION=9 -f ./Dockerfile.ci-spack-ubuntu20.04-gcc -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc9 .
1717

1818
# Build the clang6 and clang10 images
19-
docker build --rm --build-arg CLANG_VERSION=6.0 -f ./Dockerfile.ci-spack-ubuntu20.04-clang -t ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-clang6 .
20-
docker build --rm --build-arg CLANG_VERSION=10 -f ./Dockerfile.ci-spack-ubuntu20.04-clang -t ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-clang10 .
19+
docker build --rm --build-arg CLANG_VERSION=6.0 -f ./Dockerfile.ci-spack-ubuntu20.04-clang -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-clang6 .
20+
docker build --rm --build-arg CLANG_VERSION=10 -f ./Dockerfile.ci-spack-ubuntu20.04-clang -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-clang10 .
2121

2222
# Build the ubuntu 22.04 img
2323
docker build \
@@ -27,14 +27,14 @@ docker build \
2727
--build-arg E4S_VERSION="24.05" \
2828
--build-arg EXTRA_VARIANTS="+blosc2" \
2929
-f ./Dockerfile.ci-spack-ubuntu20.04-base \
30-
-t ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu22.04-gcc11 \
30+
-t ghcr.io/ornladios/adios2:ci-spack-ubuntu22.04-gcc11 \
3131
.
3232

3333
# Push images to github container registry
34-
docker push ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-base
35-
docker push ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-gcc8
36-
docker push ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-gcc9
37-
docker push ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-gcc10
38-
docker push ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-clang6
39-
docker push ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-clang10
40-
docker push ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu22.04-gcc11
34+
docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-base
35+
docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc8
36+
docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc9
37+
docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc10
38+
docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-clang6
39+
docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-clang10
40+
docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu22.04-gcc11

0 commit comments

Comments
 (0)