diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-07-20 00:05:37 (GMT) |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2019-07-20 16:27:45 (GMT) |
| commit | 907d57da94e6d1eb8502351d8e015eb3ddc9e3d9 (patch) | |
| tree | e2fee6757029695738f154161c0b49b37c57d6ec | |
| parent | 82abc479ab33183a5572ddc8cb3c4dbea8f06a0d (diff) | |
| download | ghc-wip/source-tarball.zip ghc-wip/source-tarball.tar.gz ghc-wip/source-tarball.tar.bz2 | |
gitlab-ci: Fix source tarball jobwip/source-tarball
* Use show! in source tarball job. Since we aren't actually building
anything in this job `show` won't
work.
* Fix Docker image name
* Make `version` file contain only version string
| -rw-r--r-- | .gitlab-ci.yml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9a081fd..b24b374 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -866,7 +866,7 @@ doc-tarball: stage: packaging tags: - x86_64-linux - image: ghcci/x86_64-linux-deb9:0.2 + image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb9:$DOCKER_REV" dependencies: - validate-x86_64-linux-deb9-debug - validate-x86_64-windows @@ -901,7 +901,7 @@ source-tarball: stage: packaging tags: - x86_64-linux - image: ghcci/x86_64-linux-deb9:0.2 + image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb9:$DOCKER_REV" dependencies: [] only: - tags @@ -915,7 +915,9 @@ source-tarball: - ./configure - make sdist - mv sdistprep/*.xz . - - make show VALUE=version > version + - make show! --quiet VALUE=ProjectVersion > version + - source version + - echo "$ProjectVersion" > version ############################################################ |