Merge #593: Liquid gitian builds: move more to liquid name

2a50ec1 Liquid gitian builds: move more to liquid name (Gregory Sanders) Pull request description: resolves #592 Tree-SHA512: b4cf6eff1c1d505186708d80a19d173400abceb153ca362552c72b231d034219c4e6d2ecb9f50d7f2f6c8234be3d4ab4d8559df72edc70831fb067cfeabb7de7
ElementsProject · Apr 22, 2019 · 2412d38 · 2412d38
2 parents b89a64c + 2a50ec1
commit 2412d38
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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