From 2a50ec1d5ad6d451e56cae00a602705bbd4162a2 Mon Sep 17 00:00:00 2001 From: Gregory Sanders Date: Mon, 22 Apr 2019 15:46:26 -0400 Subject: [PATCH] Liquid gitian builds: move more to liquid name --- contrib/gitian-descriptors/gitian-liquid-linux.yml | 6 +++++- contrib/gitian-descriptors/gitian-liquid-osx.yml | 6 +++++- contrib/gitian-descriptors/gitian-liquid-win.yml | 5 ++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/contrib/gitian-descriptors/gitian-liquid-linux.yml b/contrib/gitian-descriptors/gitian-liquid-linux.yml index 35769d8b2d..e57f8ca606 100644 --- a/contrib/gitian-descriptors/gitian-liquid-linux.yml +++ b/contrib/gitian-descriptors/gitian-liquid-linux.yml @@ -1,5 +1,5 @@ --- -name: "elements-linux-0.18" +name: "liquid-linux-0.18" enable_cache: true suites: - "bionic" @@ -151,7 +151,10 @@ script: | CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/ make dist SOURCEDIST=`echo elements-*.tar.gz` + LIQUIDSOURCEDIST=`echo elements-*.tar.gz` + LIQUIDSOURCEDIST=`echo ${LIQUIDSOURCEDIST} | sed 's/elements/liquid/'` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` + DISTNAME=`echo ${DISTNAME} | sed 's/elements/liquid/'` # Correct tar file order mkdir -p temp pushd temp @@ -202,3 +205,4 @@ script: | done mkdir -p $OUTDIR/src mv $SOURCEDIST $OUTDIR/src + mv $OUTDIR/src/$SOURCEDIST $OUTDIR/src/$LIQUIDSOURCEDIST diff --git a/contrib/gitian-descriptors/gitian-liquid-osx.yml b/contrib/gitian-descriptors/gitian-liquid-osx.yml index dac99a0ba7..78c1b853c5 100644 --- a/contrib/gitian-descriptors/gitian-liquid-osx.yml +++ b/contrib/gitian-descriptors/gitian-liquid-osx.yml @@ -1,5 +1,5 @@ --- -name: "elements-osx-0.18" +name: "liquid-osx-0.18" enable_cache: true suites: - "bionic" @@ -111,7 +111,10 @@ script: | CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/ make dist SOURCEDIST=`echo elements-*.tar.gz` + LIQUIDSOURCEDIST=`echo elements-*.tar.gz` + LIQUIDSOURCEDIST=`echo ${LIQUIDSOURCEDIST} | sed 's/elements/liquid/'` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` + DISTNAME=`echo ${DISTNAME} | sed 's/elements/liquid/'` # Correct tar file order mkdir -p temp @@ -172,4 +175,5 @@ script: | done mkdir -p $OUTDIR/src mv $SOURCEDIST $OUTDIR/src + mv $OUTDIR/src/$SOURCEDIST $OUTDIR/src/$LIQUIDSOURCEDIST mv ${OUTDIR}/${DISTNAME}-x86_64-*.tar.gz ${OUTDIR}/${DISTNAME}-osx64.tar.gz diff --git a/contrib/gitian-descriptors/gitian-liquid-win.yml b/contrib/gitian-descriptors/gitian-liquid-win.yml index 82bfee8015..09fc0d934e 100644 --- a/contrib/gitian-descriptors/gitian-liquid-win.yml +++ b/contrib/gitian-descriptors/gitian-liquid-win.yml @@ -1,5 +1,5 @@ --- -name: "elements-win-0.18" +name: "liquid-win-0.18" enable_cache: true suites: - "bionic" @@ -129,7 +129,10 @@ script: | CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/ make dist SOURCEDIST=`echo elements-*.tar.gz` + LIQUIDSOURCEDIST=`echo elements-*.tar.gz` + LIQUIDSOURCEDIST=`echo ${LIQUIDSOURCEDIST} | sed 's/elements/liquid/'` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` + DISTNAME=`echo ${DISTNAME} | sed 's/elements/liquid/'` # Correct tar file order mkdir -p temp