[Git][ghc/ghc][wip/ghcup-ci] 3 commits: Updates

[Matthew Pickering (@mpickering)]

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


Commits:
94bdab78 by Matthew Pickering at 2023-01-12T17:56:42+00:00
Updates

- - - - -
a3ad6fa2 by Matthew Pickering at 2023-01-12T18:08:24+00:00
changelog

- - - - -
91967a96 by Matthew Pickering at 2023-01-12T18:10:07+00:00
ci: Don't use complicated image or clone in not-interruptible job

This job exists only for the meta-reason of not allowing nightly
pipelines to be cancelled. It was taking two minutes to run as in order
to run "true" we would also clone the whole GHC repo.

- - - - -


2 changed files:

- .gitlab-ci.yml
- .gitlab/rel_eng/mk-ghcup-metadata/mk_ghcup_metadata.py


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -166,7 +166,9 @@ not-interruptible:
   stage: not-interruptible
   script: "true"
   interruptible: false
-  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10:$DOCKER_REV"
+  image: "debian:10"
+  variables:
+    GIT_STRATEGY: none
   tags:
     - lint
   rules:
@@ -954,7 +956,6 @@ pages:
 project-version:
   stage: packaging
   image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10:$DOCKER_REV"
-  dependencies: null
   tags:
     - x86_64-linux
   variables:
@@ -962,9 +963,8 @@ project-version:
   script:
     # Calculate the project version
     - .gitlab/ci.sh configure
-    - cp hadrian/bindist/Makefile .
-    - touch config.mk
-    - make show VALUE=ProjectVersion > version.sh
+    - .gitlab/ci.sh run_hadrian VERSION
+    - echo "ProjectVersion=$(cat VERSION)" > version.sh
 
   dependencies: []
   artifacts:
@@ -984,7 +984,6 @@ project-version:
     BUILD_FLAVOUR: default
     GIT_SUBMODULE_STRATEGY: "none"
   before_script:
-    - ls
     - cat version.sh
     # Calculate the project version
     - . ./version.sh


=====================================
.gitlab/rel_eng/mk-ghcup-metadata/mk_ghcup_metadata.py
=====================================
@@ -193,7 +193,7 @@ def mk_new_yaml(release_mode, version, pipeline_type, job_map):
 
     a32 = { "Linux_Debian": { "<10": deb9_i386, "unknown_versioning": deb9_i386 }
           , "Linux_Ubuntu": { "unknown_versioning": deb9_i386 }
-          , "Linux_Mint" : { "unknown_versioing": deb9_i386 }
+          , "Linux_Mint" : { "unknown_versioning": deb9_i386 }
           , "Linux_UnknownLinux" : { "unknown_versioning": deb9_i386 }
           }
 
@@ -201,9 +201,20 @@ def mk_new_yaml(release_mode, version, pipeline_type, job_map):
             , "Darwin": { "unknown_versioning": darwin_arm64 }
             }
 
+    if release_mode:
+        version_parts = version.split('.')
+        eprint(version_parts)
+        if len(version_parts) == 3:
+            final_version = version
+        elif len(version_parts) == 4:
+            final_version = '.'.join(version_parts[:2] + [str(int(version_parts[2]) + 1)])
+        change_log = f"https://downloads.haskell.org/~ghc/{version}/docs/users_guide/{final_version}-notes.html"
+    else:
+        change_log =  "https://gitlab.haskell.org"
 
     return { "viTags": ["Latest", "TODO_base_version"]
-        , "viChangeLog": "https://downloads.haskell.org/~ghc/9.4.4/docs/users_guide/9.4.4-notes.html"
+        # Check that this link exists
+        , "viChangeLog": change_log
         , "viSourceDL": source
         , "viPostRemove": "*ghc-post-remove"
         , "viArch": { "A_64": a64



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/96f3957aec81995207390d44a773bf35eedb01b2...91967a9670546454100c456e16574dcc179589eb

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/96f3957aec81995207390d44a773bf35eedb01b2...91967a9670546454100c456e16574dcc179589eb
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/331dd579/attachment-0001.html>