From 6d6a37a8f7dd136b067edfe0d4860a77e15e4186 Mon Sep 17 00:00:00 2001 From: Cheng Shao Date: Thu, 30 Mar 2023 04:55:39 +0000 Subject: 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. --- .gitlab/generate_job_metadata | 2 +- .gitlab/generate_jobs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to '.gitlab') 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 -- cgit v1.2.1