From 60e98a889ffa55eea98d16ed1736971eae691889 Mon Sep 17 00:00:00 2001 From: Leon Schoorl Date: Tue, 22 Aug 2023 15:18:21 +0200 Subject: [PATCH 1/2] Update docker/CI to use the latest GHC minor versions --- .ci/docker/build-and-publish-docker-image.sh | 2 +- .ci/gitlab/benchmark.yml | 2 +- .ci/gitlab/common.yml | 4 ++-- .github/workflows/ci.yml | 4 ++-- .gitlab-ci.yml | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.ci/docker/build-and-publish-docker-image.sh b/.ci/docker/build-and-publish-docker-image.sh index c591abe8d8..87c2618d1b 100755 --- a/.ci/docker/build-and-publish-docker-image.sh +++ b/.ci/docker/build-and-publish-docker-image.sh @@ -14,7 +14,7 @@ elif [[ "$1" != "" ]]; then exit 1 fi -GHC_VERSIONS=( "9.6.1" "9.4.3" "9.2.5" "9.0.2" "8.10.7" "8.8.4" "8.6.5") +GHC_VERSIONS=( "9.6.2" "9.4.6" "9.2.8" "9.0.2" "8.10.7" "8.8.4" "8.6.5") CABAL_VERSIONS=("3.10.1.0" "3.8.1.0" "3.6.2.0" "3.4.0.0" "3.2.0.0" "3.2.0.0" "3.0.0.0") # We want to use docker buildkit so that our layers are built in parallel. This diff --git a/.ci/gitlab/benchmark.yml b/.ci/gitlab/benchmark.yml index f04f7510c0..84b20f3c76 100644 --- a/.ci/gitlab/benchmark.yml +++ b/.ci/gitlab/benchmark.yml @@ -1,5 +1,5 @@ .benchmark: - image: ghcr.io/clash-lang/clash-ci-$GHC_VERSION:2023-05-16 + image: ghcr.io/clash-lang/clash-ci-$GHC_VERSION:2023-08-22 stage: test timeout: 2 hours variables: diff --git a/.ci/gitlab/common.yml b/.ci/gitlab/common.yml index 88a56353f4..4b310fae7c 100644 --- a/.ci/gitlab/common.yml +++ b/.ci/gitlab/common.yml @@ -1,11 +1,11 @@ .common: - image: ghcr.io/clash-lang/clash-ci-$GHC_VERSION:2023-05-16 + image: ghcr.io/clash-lang/clash-ci-$GHC_VERSION:2023-08-22 timeout: 10 minutes stage: build variables: # Note that we copy+paste the image name into CACHE_FALLBACK_KEY. If we don't, # $GHC_VERSION gets inserted at verbatim, instead of resolving to some ghc version. - CACHE_FALLBACK_KEY: $CI_JOB_NAME-master-ghcr.io/clash-lang/clash-ci-$GHC_VERSION:2023-05-16-1-3-non_protected + CACHE_FALLBACK_KEY: $CI_JOB_NAME-master-ghcr.io/clash-lang/clash-ci-$GHC_VERSION:2023-08-22-1-3-non_protected GIT_SUBMODULE_STRATEGY: recursive TERM: xterm-color retry: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bbc34b0970..fffc4cc246 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -117,7 +117,7 @@ jobs: strategy: fail-fast: false matrix: - ghc: [ "8.6.5", "9.0.2", "9.6.1" ] + ghc: [ "8.6.5", "9.0.2", "9.6.2" ] include: - multiple_hidden: yes @@ -130,7 +130,7 @@ jobs: # Run steps inside the clash CI docker image container: - image: ghcr.io/clash-lang/clash-ci-${{ matrix.ghc }}:2023-05-16 + image: ghcr.io/clash-lang/clash-ci-${{ matrix.ghc }}:2023-08-22 env: THREADS: 2 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5ceaaf8b5e..8d1c7fd451 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,10 +34,10 @@ tests: CI_PARENT_PIPELINE_SOURCE: $CI_PIPELINE_SOURCE parallel: matrix: - - GHC_VERSION: 9.6.1 + - GHC_VERSION: 9.6.2 RUN_TESTS: "always" - - GHC_VERSION: [9.4.3, 9.2.5, 8.10.7] + - GHC_VERSION: [9.4.6, 9.2.8, 8.10.7] RUN_TESTS: "nightly" - GHC_VERSION: 9.0.2 From 52d85d78879b400e4bf209316cd81b066dc76443 Mon Sep 17 00:00:00 2001 From: Leon Schoorl Date: Tue, 22 Aug 2023 14:33:23 +0200 Subject: [PATCH 2/2] Enable workaround_ghc_mmap_crash for all jobs with GHC < 9.2.8 We're getting the mmap crash now very regularly on the gitlab runners --- .github/workflows/ci.yml | 1 + .gitlab-ci.yml | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fffc4cc246..91da5e0846 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -123,6 +123,7 @@ jobs: - ghc: 8.6.5 multiple_hidden: no + workaround_ghc_mmap_crash: yes - ghc: 9.0.2 workaround_ghc_mmap_crash: yes diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8d1c7fd451..2cf001433f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,17 +37,19 @@ tests: - GHC_VERSION: 9.6.2 RUN_TESTS: "always" - - GHC_VERSION: [9.4.6, 9.2.8, 8.10.7] + - GHC_VERSION: [9.4.6, 9.2.8] RUN_TESTS: "nightly" - GHC_VERSION: 9.0.2 WORKAROUND_GHC_MMAP_CRASH: "yes" RUN_TESTS: "always" - - GHC_VERSION: 8.8.4 + - GHC_VERSION: [8.10.7, 8.8.4] + WORKAROUND_GHC_MMAP_CRASH: "yes" RUN_TESTS: "nightly" - GHC_VERSION: 8.6.5 + WORKAROUND_GHC_MMAP_CRASH: "yes" MULTIPLE_HIDDEN: "no" RUN_TESTS: "always"