From d0f8ed206479b8ad699d4eae95c063df9376fac4 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Fri, 19 Jul 2019 20:05:37 -0400
Subject: [PATCH] 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 e02aba031d64..eb2ffcf3dbd6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -864,7 +864,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
@@ -899,7 +899,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
@@ -913,7 +913,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
############################################################
--
GitLab