From 33d07c493fd1ebb34a89b53f68d81eff58cee99a Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Wed, 17 May 2023 16:47:55 +0100 Subject: ghcup-metadata: Download metadata and update for correct year something about pipeline date --- .gitlab-ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9a5c90f34f..21c7c740f9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -998,9 +998,9 @@ project-version: # Calculate the project version - . ./version.sh - # Download existing ghcup metadata - - ProjectYear="$(date -d $CI_PIPELINE_CREATED_AT +%Y)" - - nix shell --extra-experimental-features nix-command --extra-experimental-features flakes nixpkgs#wget -c wget "https://ghc.gitlab.haskell.org/ghcup-metadata/ghcup-nightlies-$(ProjectYear)-0.0.7.yaml" + # Download existing ghcup metadata for the correct year + - PipelineYear="$(date -d $CI_PIPELINE_CREATED_AT +%Y)" + - nix shell nixpkgs#wget -c wget "https://ghc.gitlab.haskell.org/ghcup-metadata/ghcup-nightlies-$PipelineYear-0.0.7.yaml" - .gitlab/generate_job_metadata @@ -1064,7 +1064,8 @@ ghcup-metadata-nightly-push: artifacts: true script: - git clone https://gitlab.haskell.org/ghc/ghcup-metadata.git - - cp metadata_test.yaml ghcup-metadata/ghcup-0.0.7.yaml + - PipelineYear="$(date -d $CI_PIPELINE_CREATED_AT +%Y)" + - cp metadata_test.yaml "ghcup-metadata/ghcup-nightlies-$PipelineYear-0.0.7.yaml" - cd ghcup-metadata - git config user.email "ghc-ci@gitlab-haskell.org" - git config user.name "GHC GitLab CI" -- cgit v1.2.1