Commit 77ca39e3 authored by Ben Gamari's avatar Ben Gamari 🐢 Committed by Marge Bot
Browse files

gitlab-ci: Add missing TEST_ENV variables

This should fix #16985.
parent 31a29a7a
...@@ -213,6 +213,8 @@ validate-x86_64-linux-deb9-hadrian: ...@@ -213,6 +213,8 @@ validate-x86_64-linux-deb9-hadrian:
extends: .validate-hadrian extends: .validate-hadrian
stage: build stage: build
image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb9:$DOCKER_REV" image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb9:$DOCKER_REV"
variables:
TEST_ENV: "x86_64-linux-deb9-hadrian"
before_script: before_script:
# workaround for docker permissions # workaround for docker permissions
- sudo chown ghc:ghc -R . - sudo chown ghc:ghc -R .
...@@ -341,7 +343,7 @@ validate-x86_64-darwin: ...@@ -341,7 +343,7 @@ validate-x86_64-darwin:
ac_cv_func_clock_gettime: "no" ac_cv_func_clock_gettime: "no"
LANG: "en_US.UTF-8" LANG: "en_US.UTF-8"
CONFIGURE_ARGS: --with-intree-gmp CONFIGURE_ARGS: --with-intree-gmp
TEST_ENV: "x86_64-darwin" TEST_ENV: "x86_64-darwin-hadrian"
before_script: before_script:
- git clean -xdf && git submodule foreach git clean -xdf - git clean -xdf && git submodule foreach git clean -xdf
- git submodule sync --recursive - git submodule sync --recursive
...@@ -730,6 +732,7 @@ validate-x86_64-windows-hadrian: ...@@ -730,6 +732,7 @@ validate-x86_64-windows-hadrian:
extends: .build-windows-hadrian extends: .build-windows-hadrian
variables: variables:
MSYSTEM: MINGW64 MSYSTEM: MINGW64
TEST_ENV: "x86_64-windows-hadrian"
cache: cache:
key: "x86_64-windows-hadrian-$WINDOWS_TOOLCHAIN_VERSION" key: "x86_64-windows-hadrian-$WINDOWS_TOOLCHAIN_VERSION"
...@@ -737,6 +740,7 @@ nightly-i386-windows-hadrian: ...@@ -737,6 +740,7 @@ nightly-i386-windows-hadrian:
extends: .build-windows-hadrian extends: .build-windows-hadrian
variables: variables:
MSYSTEM: MINGW32 MSYSTEM: MINGW32
TEST_ENV: "x86_64-windows-hadrian"
only: only:
variables: variables:
- $NIGHTLY - $NIGHTLY
...@@ -778,6 +782,7 @@ validate-x86_64-windows: ...@@ -778,6 +782,7 @@ validate-x86_64-windows:
variables: variables:
MSYSTEM: MINGW64 MSYSTEM: MINGW64
CONFIGURE_ARGS: "--target=x86_64-unknown-mingw32" CONFIGURE_ARGS: "--target=x86_64-unknown-mingw32"
TEST_ENV: "x86_64-windows"
cache: cache:
key: "x86_64-windows-$WINDOWS_TOOLCHAIN_VERSION" key: "x86_64-windows-$WINDOWS_TOOLCHAIN_VERSION"
...@@ -801,6 +806,7 @@ release-x86_64-windows: ...@@ -801,6 +806,7 @@ release-x86_64-windows:
MSYSTEM: MINGW64 MSYSTEM: MINGW64
BUILD_FLAVOUR: "perf" BUILD_FLAVOUR: "perf"
CONFIGURE_ARGS: "--target=x86_64-unknown-mingw32" CONFIGURE_ARGS: "--target=x86_64-unknown-mingw32"
TEST_ENV: "x86_64-windows"
only: only:
- tags - tags
...@@ -814,6 +820,7 @@ release-i386-windows: ...@@ -814,6 +820,7 @@ release-i386-windows:
CONFIGURE_ARGS: "--target=i386-unknown-mingw32" CONFIGURE_ARGS: "--target=i386-unknown-mingw32"
# Due to #15934 # Due to #15934
BUILD_PROF_LIBS: "NO" BUILD_PROF_LIBS: "NO"
TEST_ENV: "i386-windows"
cache: cache:
key: "i386-windows-$WINDOWS_TOOLCHAIN_VERSION" key: "i386-windows-$WINDOWS_TOOLCHAIN_VERSION"
...@@ -827,6 +834,7 @@ nightly-i386-windows: ...@@ -827,6 +834,7 @@ nightly-i386-windows:
CONFIGURE_ARGS: "--target=i386-unknown-mingw32" CONFIGURE_ARGS: "--target=i386-unknown-mingw32"
# Due to #15934 # Due to #15934
BUILD_PROF_LIBS: "NO" BUILD_PROF_LIBS: "NO"
TEST_ENV: "i386-windows"
cache: cache:
key: "i386-windows-$WINDOWS_TOOLCHAIN_VERSION" key: "i386-windows-$WINDOWS_TOOLCHAIN_VERSION"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment