Skip to content

Commit 55127d1

Browse files
FuzzbawlsFuzzbawls
committed
[Gitian] Bump gitian build versions
Bumps the gitian build versions to 3.3, which should have been done right after 3.2 was branched off. At the same time, update to python3 explicitly and allow for some better error reporting.
1 parent 68c81c4 commit 55127d1

File tree

5 files changed

+25
-10
lines changed

5 files changed

+25
-10
lines changed

‎contrib/gitian-descriptors/gitian-linux.yml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
2-
name: "pivx-linux-3.2"
2+
name: "pivx-linux-3.3"
33
enable_cache: true
4+
distro: "ubuntu"
45
suites:
56
- "bionic"
67
architectures:
@@ -30,12 +31,13 @@ packages:
3031
- "faketime"
3132
- "bsdmainutils"
3233
- "ca-certificates"
33-
- "python"
34+
- "python3"
3435
remotes:
3536
- "url": "https://github.com/pivx-project/pivx.git"
3637
"dir": "pivx"
3738
files: []
3839
script: |
40+
set -e -o pipefail
3941
4042
WRAP_DIR=$HOME/wrapped
4143
HOSTS="i686-pc-linux-gnu x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv64-linux-gnu"
@@ -179,8 +181,9 @@ script: |
179181
find . -name "lib*.la" -delete
180182
find . -name "lib*.a" -delete
181183
rm -rf ${DISTNAME}/lib/pkgconfig
182-
find ${DISTNAME}/bin -type f -executable -exec ../contrib/devtools/split-debug.sh {} {} {}.dbg \;
183-
# find ${DISTNAME}/lib -type f -exec ../contrib/devtools/split-debug.sh {} {} {}.dbg \;
184+
find ${DISTNAME}/bin -type f -executable -print0 | xargs -0 -n1 -I{} ../contrib/devtools/split-debug.sh {} {} {}.dbg
185+
#find ${DISTNAME}/lib -type f -print0 | xargs -0 -n1 -I{} ../contrib/devtools/split-debug.sh {} {} {}.dbg
186+
cp ../doc/README.md ${DISTNAME}/
184187
find ${DISTNAME} -not -name "*.dbg" | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}.tar.gz
185188
find ${DISTNAME} -name "*.dbg" | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}-debug.tar.gz
186189
cd ../../

‎contrib/gitian-descriptors/gitian-osx-signer.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
name: "pivx-dmg-signer"
3+
distro: "ubuntu"
34
suites:
45
- "bionic"
56
architectures:
@@ -12,6 +13,8 @@ remotes:
1213
files:
1314
- "pivx-osx-unsigned.tar.gz"
1415
script: |
16+
set -e -o pipefail
17+
1518
WRAP_DIR=$HOME/wrapped
1619
mkdir -p ${WRAP_DIR}
1720
export PATH=`pwd`:$PATH

‎contrib/gitian-descriptors/gitian-osx.yml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
2-
name: "pivx-osx-3.2"
2+
name: "pivx-osx-3.3"
33
enable_cache: true
4+
distro: "ubuntu"
45
suites:
56
- "bionic"
67
architectures:
@@ -23,16 +24,18 @@ packages:
2324
- "libcap-dev"
2425
- "libz-dev"
2526
- "libbz2-dev"
26-
- "python"
27-
- "python-dev"
28-
- "python-setuptools"
27+
- "python3"
28+
- "python3-dev"
29+
- "python3-setuptools"
2930
- "fonts-tuffy"
3031
remotes:
3132
- "url": "https://github.com/pivx-project/pivx.git"
3233
"dir": "pivx"
3334
files:
3435
- "MacOSX10.11.sdk.tar.gz"
3536
script: |
37+
set -e -o pipefail
38+
3639
WRAP_DIR=$HOME/wrapped
3740
HOSTS="x86_64-apple-darwin14"
3841
CONFIGFLAGS="--enable-reduce-exports --disable-bench --disable-gui-tests GENISOIMAGE=$WRAP_DIR/genisoimage"

‎contrib/gitian-descriptors/gitian-win-signer.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
name: "pivx-win-signer"
3+
distro: "ubuntu"
34
suites:
45
- "bionic"
56
architectures:
@@ -16,6 +17,8 @@ files:
1617
- "osslsigncode-Backports-to-1.7.1.patch"
1718
- "pivx-win-unsigned.tar.gz"
1819
script: |
20+
set -e -o pipefail
21+
1922
BUILD_DIR=`pwd`
2023
SIGDIR=${BUILD_DIR}/signature/win
2124
UNSIGNED_DIR=${BUILD_DIR}/unsigned

‎contrib/gitian-descriptors/gitian-win.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
2-
name: "pivx-win-3.2"
2+
name: "pivx-win-3.3"
33
enable_cache: true
4+
distro: "ubuntu"
45
suites:
56
- "bionic"
67
architectures:
@@ -20,13 +21,15 @@ packages:
2021
- "nsis"
2122
- "zip"
2223
- "ca-certificates"
23-
- "python"
24+
- "python3"
2425
- "rename"
2526
remotes:
2627
- "url": "https://github.com/pivx-project/pivx.git"
2728
"dir": "pivx"
2829
files: []
2930
script: |
31+
set -e -o pipefail
32+
3033
WRAP_DIR=$HOME/wrapped
3134
HOSTS="i686-w64-mingw32 x86_64-w64-mingw32"
3235
CONFIGFLAGS="--enable-reduce-exports --disable-bench --disable-gui-tests"

0 commit comments

Comments
 (0)