diff options
| author | Cheng Shao <terrorjack@type.dance> | 2023-03-30 04:55:39 +0000 |
|---|---|---|
| committer | Cheng Shao <terrorjack@type.dance> | 2023-03-30 18:42:56 +0000 |
| commit | 6d6a37a8f7dd136b067edfe0d4860a77e15e4186 (patch) | |
| tree | f08581952ded5518fc882829f335d77869eefafb | |
| parent | 6f885e6575eb741556d6e198d1a9dbdadf10307b (diff) | |
| download | haskell-6d6a37a8f7dd136b067edfe0d4860a77e15e4186.tar.gz | |
ci: make lint-ci-config job fast again
We don't pin our nixpkgs revision and tracks the default
nixpkgs-unstable channel anyway. Instead of using
haskell.packages.ghc924, we should be using haskell.packages.ghc92 to
maximize the binary cache hit rate and make lint-ci-config job fast
again. Also bumps the nix docker image to the latest revision.
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rwxr-xr-x | .gitlab/generate_job_metadata | 2 | ||||
| -rwxr-xr-x | .gitlab/generate_jobs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 75ac14db52..b6aea0edd2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -264,7 +264,7 @@ lint-author: - *drafts-can-fail-lint lint-ci-config: - image: nixos/nix:2.12.0 + image: nixos/nix:2.14.1 extends: .lint # We don't need history/submodules in this job variables: @@ -979,7 +979,7 @@ project-version: .ghcup-metadata: stage: deploy - image: "nixos/nix:2.12.0" + image: nixos/nix:2.14.1 dependencies: null tags: - x86_64-linux diff --git a/.gitlab/generate_job_metadata b/.gitlab/generate_job_metadata index 017f578f51..212d74652b 100755 --- a/.gitlab/generate_job_metadata +++ b/.gitlab/generate_job_metadata @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#!nix-shell -i bash -p cabal-install "haskell.packages.ghc924.ghcWithPackages (pkgs: with pkgs; [aeson])" git jq +#!nix-shell -i bash -p cabal-install "haskell.packages.ghc92.ghcWithPackages (pkgs: with pkgs; [aeson])" git jq cd "$(dirname "${BASH_SOURCE[0]}")" cabal run gen_ci -- metadata jobs-metadata.json diff --git a/.gitlab/generate_jobs b/.gitlab/generate_jobs index 0df674cceb..87ddea25cf 100755 --- a/.gitlab/generate_jobs +++ b/.gitlab/generate_jobs @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p cabal-install "haskell.packages.ghc924.ghcWithPackages (pkgs: with pkgs; [aeson])" git jq +#!nix-shell -i bash -p cabal-install "haskell.packages.ghc92.ghcWithPackages (pkgs: with pkgs; [aeson])" git jq # shellcheck shell=bash |