...@@ -3,9 +3,6 @@ stages: ...@@ -3,9 +3,6 @@ stages:
- build - build
- test - test
variables:
CONTAINER_REGISTRY: 192.168.122.1:5000
# These stanzas do some common management tasks before and after the # These stanzas do some common management tasks before and after the
# job-specific before_script and after_script stanzas are run. # job-specific before_script and after_script stanzas are run.
# before_script_start configures any default global state. The # before_script_start configures any default global state. The
...@@ -54,7 +51,7 @@ bookworm: ...@@ -54,7 +51,7 @@ bookworm:
- linux - linux
stage: build stage: build
interruptible: true interruptible: true
image: 192.168.122.1:5000/sequoia-pgp/build-docker-image/bookworm-prebuild:latest image: $CONTAINER_REGISTRY/sequoia-pgp/build-docker-image/bookworm-prebuild:latest
needs: needs:
- codespell - codespell
script: script:
...@@ -70,7 +67,7 @@ makefile: ...@@ -70,7 +67,7 @@ makefile:
- linux - linux
stage: build stage: build
interruptible: true interruptible: true
image: 192.168.122.1:5000/sequoia-pgp/build-docker-image/bookworm-prebuild:latest image: $CONTAINER_REGISTRY/sequoia-pgp/build-docker-image/bookworm-prebuild:latest
needs: needs:
- codespell - codespell
script: script:
...@@ -89,7 +86,7 @@ all_commits: ...@@ -89,7 +86,7 @@ all_commits:
# Test each commit up to main, to facilitate bisecting. # Test each commit up to main, to facilitate bisecting.
stage: test stage: test
interruptible: true interruptible: true
image: 192.168.122.1:5000/sequoia-pgp/build-docker-image/rust-stable-prebuild:latest image: $CONTAINER_REGISTRY/sequoia-pgp/build-docker-image/rust-stable-prebuild:latest
needs: ["rust-stable"] needs: ["rust-stable"]
script: script:
- apt update && apt install -y libbotan-2-dev - apt update && apt install -y libbotan-2-dev
...@@ -104,7 +101,7 @@ codespell: ...@@ -104,7 +101,7 @@ codespell:
- linux - linux
stage: pre-check stage: pre-check
interruptible: true interruptible: true
image: 192.168.122.1:5000/sequoia-pgp/build-docker-image/bookworm:latest image: $CONTAINER_REGISTRY/sequoia-pgp/build-docker-image/bookworm:latest
before_script: before_script:
- *before_script_start - *before_script_start
...@@ -119,7 +116,7 @@ rust-stable: ...@@ -119,7 +116,7 @@ rust-stable:
- linux - linux
stage: build stage: build
interruptible: true interruptible: true
image: 192.168.122.1:5000/sequoia-pgp/build-docker-image/rust-stable-prebuild:latest image: $CONTAINER_REGISTRY/sequoia-pgp/build-docker-image/rust-stable-prebuild:latest
before_script: before_script:
- *before_script_start - *before_script_start
- rustup override set stable - rustup override set stable
...@@ -136,7 +133,7 @@ rust-stable-armv7: ...@@ -136,7 +133,7 @@ rust-stable-armv7:
- linux - linux
stage: build stage: build
interruptible: true interruptible: true
image: 192.168.122.1:5000/sequoia-pgp/build-docker-image/bullseye-cross-arm-prebuild:latest image: $CONTAINER_REGISTRY/sequoia-pgp/build-docker-image/bullseye-cross-arm-prebuild:latest
before_script: before_script:
- *before_script_start - *before_script_start
- cat .ci/snippet_for_cross_compilation_config.toml >> .cargo/config.toml - cat .ci/snippet_for_cross_compilation_config.toml >> .cargo/config.toml
...@@ -157,7 +154,7 @@ windows-gnu-cng: ...@@ -157,7 +154,7 @@ windows-gnu-cng:
- win2019 - win2019
stage: build stage: build
interruptible: true interruptible: true
image: 192.168.122.1:5000/sequoia-pgp/build-docker-image/windows-gnu image: $CONTAINER_REGISTRY/sequoia-pgp/build-docker-image/windows-gnu
before_script: before_script:
# the default before_scipt scriptlet doesn't work on Powershell # the default before_scipt scriptlet doesn't work on Powershell
- rustup default "1.63.0" - rustup default "1.63.0"
...@@ -179,7 +176,7 @@ windows-msvc-cng: ...@@ -179,7 +176,7 @@ windows-msvc-cng:
- win2019 - win2019
stage: build stage: build
interruptible: true interruptible: true
image: 192.168.122.1:5000/sequoia-pgp/build-docker-image/windows-msvc image: $CONTAINER_REGISTRY/sequoia-pgp/build-docker-image/windows-msvc
before_script: before_script:
# We don't call *before_script_start or *before_script_end as we # We don't call *before_script_start or *before_script_end as we
# don't have bash, clang, etc. # don't have bash, clang, etc.
...@@ -199,7 +196,7 @@ windows-msvc-nmakefile: ...@@ -199,7 +196,7 @@ windows-msvc-nmakefile:
- win2019 - win2019
stage: build stage: build
interruptible: true interruptible: true
image: 192.168.122.1:5000/sequoia-pgp/build-docker-image/windows-msvc image: $CONTAINER_REGISTRY/sequoia-pgp/build-docker-image/windows-msvc
before_script: before_script:
# We don't call *before_script_start or *before_script_end as we # We don't call *before_script_start or *before_script_end as we
# don't have bash, clang, etc. # don't have bash, clang, etc.
...@@ -219,7 +216,7 @@ windows-msvc-msbuild: ...@@ -219,7 +216,7 @@ windows-msvc-msbuild:
- win2019 - win2019
stage: build stage: build
interruptible: true interruptible: true
image: 192.168.122.1:5000/sequoia-pgp/build-docker-image/windows-msvc image: $CONTAINER_REGISTRY/sequoia-pgp/build-docker-image/windows-msvc
before_script: before_script:
# We don't call *before_script_start or *before_script_end as we # We don't call *before_script_start or *before_script_end as we
# don't have bash, clang, etc. # don't have bash, clang, etc.
...@@ -243,7 +240,7 @@ windows-msvc32-cng: ...@@ -243,7 +240,7 @@ windows-msvc32-cng:
stage: build stage: build
interruptible: true interruptible: true
image: image:
name: 192.168.122.1:5000/sequoia-pgp/build-docker-image/windows-msvc name: $CONTAINER_REGISTRY/sequoia-pgp/build-docker-image/windows-msvc
# Set up a cross compilation environment for building x86 binaries on amd64, line copied from Dockerfile.windows.msvc # Set up a cross compilation environment for building x86 binaries on amd64, line copied from Dockerfile.windows.msvc
# see https://renenyffenegger.ch/notes/Windows/dirs/Program-Files-x86/Microsoft-Visual-Studio/version/edition/Common7/Tools/VsDevCmd_bat # see https://renenyffenegger.ch/notes/Windows/dirs/Program-Files-x86/Microsoft-Visual-Studio/version/edition/Common7/Tools/VsDevCmd_bat
# #
...@@ -266,6 +263,7 @@ windows-msvc32-cng: ...@@ -266,6 +263,7 @@ windows-msvc32-cng:
CFLAGS: "" # Silence some C warnings when compiling with MSVC CFLAGS: "" # Silence some C warnings when compiling with MSVC
variables: variables:
CONTAINER_REGISTRY: "192.168.122.1:5000"
DEBIAN_FRONTEND: noninteractive DEBIAN_FRONTEND: noninteractive
CARGO_HOME: $CI_PROJECT_DIR/../cargo CARGO_HOME: $CI_PROJECT_DIR/../cargo
CARGO_FLAGS: --color always CARGO_FLAGS: --color always
......