From 907d57da94e6d1eb8502351d8e015eb3ddc9e3d9 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Fri, 19 Jul 2019 20:05:37 -0400 Subject: gitlab-ci: Fix source tarball job * 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 --- .gitlab-ci.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9a081fd159..b24b37450a 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 ############################################################ -- cgit v1.2.1