diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2023-05-17 18:15:12 +0100 |
|---|---|---|
| committer | Matthew Pickering <matthewtpickering@gmail.com> | 2023-05-17 18:15:12 +0100 |
| commit | 1cfc12a6d091fb977174e41c66f6ba2329322192 (patch) | |
| tree | c83190e698fdbf2c07bf37ad34e9eb4c8ae15c52 | |
| parent | 99bccf6595a0085758e54f869fdf2137cc8cb532 (diff) | |
| download | haskell-1cfc12a6d091fb977174e41c66f6ba2329322192.tar.gz | |
testing
| -rw-r--r-- | .gitlab-ci.yml | 66 | ||||
| -rwxr-xr-x | .gitlab/rel_eng/mk-ghcup-metadata/mk_ghcup_metadata.py | 3 |
2 files changed, 35 insertions, 34 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d5b1097e2e..558c6990eb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1012,38 +1012,38 @@ project-version: ghcup-metadata-nightly: extends: .ghcup-metadata # Explicit needs for validate pipeline because we only need certain bindists - needs: - - job: nightly-x86_64-linux-fedora33-release - artifacts: false - - job: nightly-x86_64-linux-centos7-validate - artifacts: false - - job: nightly-x86_64-linux-ubuntu20_04-validate - artifacts: false - - job: nightly-x86_64-linux-ubuntu18_04-validate - artifacts: false - - job: nightly-x86_64-linux-rocky8-validate - artifacts: false - - job: nightly-x86_64-darwin-validate - artifacts: false - - job: nightly-aarch64-darwin-validate - artifacts: false - - job: nightly-x86_64-windows-validate - artifacts: false - - job: nightly-x86_64-linux-alpine3_12-int_native-validate+fully_static - artifacts: false - - job: nightly-x86_64-linux-deb9-validate - artifacts: false - - job: nightly-i386-linux-deb9-validate - artifacts: false - - job: nightly-x86_64-linux-deb10-validate - artifacts: false - - job: nightly-aarch64-linux-deb10-validate - artifacts: false - - job: nightly-x86_64-linux-deb11-validate - artifacts: false - - job: source-tarball - artifacts: false - - job: project-version + needs: [] + # - job: nightly-x86_64-linux-fedora33-release + # artifacts: false + # - job: nightly-x86_64-linux-centos7-validate + # artifacts: false + # - job: nightly-x86_64-linux-ubuntu20_04-validate + # artifacts: false + # - job: nightly-x86_64-linux-ubuntu18_04-validate + # artifacts: false + # - job: nightly-x86_64-linux-rocky8-validate + # artifacts: false + # - job: nightly-x86_64-darwin-validate + # artifacts: false + # - job: nightly-aarch64-darwin-validate + # artifacts: false + # - job: nightly-x86_64-windows-validate + # artifacts: false + # - job: nightly-x86_64-linux-alpine3_12-int_native-validate+fully_static + # artifacts: false + # - job: nightly-x86_64-linux-deb9-validate + # artifacts: false + # - job: nightly-i386-linux-deb9-validate + # artifacts: false + # - job: nightly-x86_64-linux-deb10-validate + # artifacts: false + # - job: nightly-aarch64-linux-deb10-validate + # artifacts: false + # - job: nightly-x86_64-linux-deb11-validate + # artifacts: false + # - job: source-tarball + # artifacts: false + # - job: project-version script: - nix shell --extra-experimental-features nix-command -f .gitlab/rel_eng -c ghcup-metadata --metadata ghcup-0.0.7.yaml --date="$(date -d $CI_PIPELINE_CREATED_AT +%Y-%M-%d)" --pipeline-id="$CI_PIPELINE_ID" --version="$ProjectVersion" > "metadata_test.yaml" rules: @@ -1075,7 +1075,7 @@ ghcup-metadata-nightly-push: - git push gitlab_origin HEAD:updates rules: # Only run the update on scheduled nightly pipelines, ie once a day - - if: $NIGHTLY && $CI_PIPELINE_SOURCE == "schedule" && $CI_COMMIT_BRANCH == "master" + - if: $NIGHTLY # && $CI_PIPELINE_SOURCE == "schedule" && $CI_COMMIT_BRANCH == "master" ghcup-metadata-release: 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 ddfab76dcf..241e9e1681 100755 --- a/.gitlab/rel_eng/mk-ghcup-metadata/mk_ghcup_metadata.py +++ b/.gitlab/rel_eng/mk-ghcup-metadata/mk_ghcup_metadata.py @@ -144,7 +144,8 @@ def mk_one_metadata(release_mode, version, job_map, artifact): eprint(f"Download URL: {final_url}") # Download and hash from the release pipeline, this must not change anyway during upload. - h = download_and_hash(url) +# h = download_and_hash(url) + h = "" res = { "dlUri": final_url, "dlSubdir": artifact.subdir.format(version=version), "dlHash" : h } eprint(res) |