diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2023-01-12 17:56:42 +0000 |
|---|---|---|
| committer | Matthew Pickering <matthewtpickering@gmail.com> | 2023-01-12 17:56:42 +0000 |
| commit | 94bdab7851d0a8c8933c8df05fee3ad99f2b7591 (patch) | |
| tree | b3b165d2e1ca108dbba5a29c000522bda9002bde | |
| parent | ebc80472b822da32b38c14a295d926be558b15b8 (diff) | |
| download | haskell-94bdab7851d0a8c8933c8df05fee3ad99f2b7591.tar.gz | |
Updates
| -rw-r--r-- | .gitlab-ci.yml | 7 | ||||
| -rwxr-xr-x | .gitlab/rel_eng/mk-ghcup-metadata/mk_ghcup_metadata.py | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7ad60a9a86..af504d56a4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -954,7 +954,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 +961,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 +982,6 @@ project-version: BUILD_FLAVOUR: default GIT_SUBMODULE_STRATEGY: "none" before_script: - - ls - cat version.sh # Calculate the project version - . ./version.sh diff --git a/.gitlab/rel_eng/mk-ghcup-metadata/mk_ghcup_metadata.py b/.gitlab/rel_eng/mk-ghcup-metadata/mk_ghcup_metadata.py index cc4f3fce26..de1cdb5ec7 100755 --- a/.gitlab/rel_eng/mk-ghcup-metadata/mk_ghcup_metadata.py +++ b/.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 } } @@ -203,7 +203,8 @@ def mk_new_yaml(release_mode, version, pipeline_type, job_map): 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": "https://downloads.haskell.org/~ghc/9.6.0.123123/docs/users_guide/9.6.1-notes.html" , "viSourceDL": source , "viPostRemove": "*ghc-post-remove" , "viArch": { "A_64": a64 |