[Git][ghc/ghc][wip/ghcup-ci] update

[Matthew Pickering (@mpickering)]

Matthew Pickering pushed to branch wip/ghcup-ci at Glasgow Haskell Compiler / GHC


Commits:
b5d7ff9a by Matthew Pickering at 2023-01-12T08:44:25+00:00
update

- - - - -


1 changed file:

- .gitlab-ci.yml


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -959,7 +959,7 @@ project-version:
     - x86_64-linux
   variables:
     BUILD_FLAVOUR: default
-  before_script:
+  script:
     # Calculate the project version
     - .gitlab/ci.sh configure
     - cp hadrian/bindist/Makefile .
@@ -974,9 +974,29 @@ project-version:
     - if: '$NIGHTLY'
     - if: '$RELEASE_JOB == "yes"'
 
+        #  image: "nixos/nix:2.8.0"
+        #  extends: .lint
+        #  variables:
+        #    BUILD_FLAVOUR: default
+        #  before_script:
+        #    - mkdir -p ~/.cabal
+        #    - cp -Rf cabal-cache/* ~/.cabal || true
+        #  script:
+        #    - nix shell --extra-experimental-features nix-command --extra-experimental-features flakes nixpkgs#cabal-install nixpkgs#ghc -c cabal update
+        #    - .gitlab/generate_jobs
+        #        # 1 if .gitlab/generate_jobs changed the output of the generated config
+        #    - nix shell --extra-experimental-features nix-command --extra-experimental-features flakes nixpkgs#git -c git diff --exit-code
+        #  after_script:
+        #    - rm -Rf cabal-cache
+        #    - cp -Rf ~/.cabal cabal-cache
+        #  dependencies: []
+        #  cache:
+        #    key: lint-ci-$CACHE_REV
+        #    paths:
+
 .ghcup-metadata:
   stage: deploy
-  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10:$DOCKER_REV"
+  image: "nixos/nix:2.8.0"
   dependencies: null
   tags:
     - x86_64-linux
@@ -984,10 +1004,6 @@ project-version:
     BUILD_FLAVOUR: default
   before_script:
     # Calculate the project version
-    - .gitlab/ci.sh configure
-    - cp hadrian/bindist/Makefile .
-    - touch config.mk
-    - make show VALUE=ProjectVersion > version.sh
     - source version.sh
 
     # Download existing ghcup metadata
@@ -1026,6 +1042,8 @@ ghcup-metadata-nightly:
     #      artifacts: false
     #    - job: source-tarball
     #      artifacts: false
+  needs:
+    - job: project-version
   script:
     - .gitlab/mk_ghcup_metadata.py --metadata ghcup-0.0.7.yaml --pipeline-id="$CI_PIPELINE_ID" --version="$ProjectVersion" > "metadata_test.yaml"
   rules:



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b5d7ff9ad62f99983c6b2d5be2f37a5ff56fb558

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b5d7ff9ad62f99983c6b2d5be2f37a5ff56fb558
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20230112/c9e00d12/attachment-0001.html>