[Build] Update gitian descriptors

This commit is contained in:
Akshay
2019-06-08 17:56:08 +03:00
parent eca8a7d78f
commit d8192b664c
12 changed files with 31 additions and 31 deletions
+1 -1
View File
@@ -29,7 +29,7 @@ def setup():
if not os.path.isdir('gitian-builder'):
subprocess.check_call(['git', 'clone', 'https://github.com/devrandom/gitian-builder.git'])
if not os.path.isdir('bitcoin'):
subprocess.check_call(['git', 'clone', 'https://github.com/bitcoin/bitcoin.git'])
subprocess.check_call(['git', 'clone', 'https://github.com/nyc3coin/nyc3'])
os.chdir('gitian-builder')
make_image_prog = ['bin/make-base-vm', '--suite', 'bionic', '--arch', 'amd64']
if args.docker:
+6 -6
View File
@@ -1,5 +1,5 @@
---
name: "bitcoin-linux-0.18"
name: "nyc3-linux-0.18"
enable_cache: true
suites:
- "bionic"
@@ -32,8 +32,8 @@ packages:
- "ca-certificates"
- "python"
remotes:
- "url": "https://github.com/bitcoin/bitcoin.git"
"dir": "bitcoin"
- "url": "https://github.com/nyc3coin/nyc3"
"dir": "nyc3"
files: []
script: |
set -e -o pipefail
@@ -122,7 +122,7 @@ script: |
chmod +x ${WRAP_DIR}/${prog}
done
cd bitcoin
cd nyc3
BASEPREFIX=`pwd`/depends
# Build dependencies for each host
for i in $HOSTS; do
@@ -144,13 +144,13 @@ script: |
./autogen.sh
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
make dist
SOURCEDIST=`echo bitcoin-*.tar.gz`
SOURCEDIST=`echo nyc3-*.tar.gz`
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
# Correct tar file order
mkdir -p temp
pushd temp
tar xf ../$SOURCEDIST
find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
find nyc3-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
popd
# Workaround for tarball not building with the bare tag version (prep)
@@ -1,5 +1,5 @@
---
name: "bitcoin-dmg-signer"
name: "nyc3-dmg-signer"
suites:
- "bionic"
architectures:
+6 -6
View File
@@ -1,5 +1,5 @@
---
name: "bitcoin-osx-0.18"
name: "nyc3-osx-0.18"
enable_cache: true
suites:
- "bionic"
@@ -28,8 +28,8 @@ packages:
- "python-setuptools"
- "fonts-tuffy"
remotes:
- "url": "https://github.com/bitcoin/bitcoin.git"
"dir": "bitcoin"
- "url": "https://github.com/nyc3coin/nyc3"
"dir": "nyc3"
files:
- "MacOSX10.11.sdk.tar.gz"
script: |
@@ -86,7 +86,7 @@ script: |
create_per-host_faketime_wrappers "2000-01-01 12:00:00"
export PATH=${WRAP_DIR}:${PATH}
cd bitcoin
cd nyc3
BASEPREFIX=`pwd`/depends
mkdir -p ${BASEPREFIX}/SDKs
@@ -107,14 +107,14 @@ script: |
./autogen.sh
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
make dist
SOURCEDIST=`echo bitcoin-*.tar.gz`
SOURCEDIST=`echo nyc3-*.tar.gz`
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
# Correct tar file order
mkdir -p temp
pushd temp
tar xf ../$SOURCEDIST
find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
find nyc3-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
popd
# Workaround for tarball not building with the bare tag version (prep)
@@ -1,5 +1,5 @@
---
name: "bitcoin-win-signer"
name: "nyc3-win-signer"
suites:
- "bionic"
architectures:
+9 -9
View File
@@ -1,5 +1,5 @@
---
name: "bitcoin-win-0.18"
name: "nyc3-win-0.18"
enable_cache: true
suites:
- "bionic"
@@ -23,8 +23,8 @@ packages:
- "python"
- "rename"
remotes:
- "url": "https://github.com/bitcoin/bitcoin.git"
"dir": "bitcoin"
- "url": "https://github.com/nyc3coin/nyc3"
"dir": "nyc3"
files: []
script: |
set -e -o pipefail
@@ -76,7 +76,7 @@ script: |
function create_per-host_linker_wrapper {
# This is only needed for trusty, as the mingw linker leaks a few bytes of
# heap, causing non-determinism. See discussion in https://github.com/bitcoin/bitcoin/pull/6900
# heap, causing non-determinism. See discussion in https://github.com/nyc3/nyc3/pull/6900
for i in $HOSTS; do
mkdir -p ${WRAP_DIR}/${i}
for prog in collect2; do
@@ -105,7 +105,7 @@ script: |
create_per-host_linker_wrapper "2000-01-01 12:00:00"
export PATH=${WRAP_DIR}:${PATH}
cd bitcoin
cd nyc3
BASEPREFIX=`pwd`/depends
# Build dependencies for each host
for i in $HOSTS; do
@@ -123,14 +123,14 @@ script: |
./autogen.sh
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
make dist
SOURCEDIST=`echo bitcoin-*.tar.gz`
SOURCEDIST=`echo nyc3-*.tar.gz`
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
# Correct tar file order
mkdir -p temp
pushd temp
tar xf ../$SOURCEDIST
find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
find nyc3-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
mkdir -p $OUTDIR/src
cp ../$SOURCEDIST $OUTDIR/src
popd
@@ -159,7 +159,7 @@ script: |
make deploy
make install DESTDIR=${INSTALLPATH}
rename 's/-setup\.exe$/-setup-unsigned.exe/' *-setup.exe
cp -f bitcoin-*setup*.exe $OUTDIR/
cp -f nyc3-*setup*.exe $OUTDIR/
cd installed
mv ${DISTNAME}/bin/*.dll ${DISTNAME}/lib/
find . -name "lib*.la" -delete
@@ -175,7 +175,7 @@ script: |
cp -rf contrib/windeploy $BUILD_DIR
cd $BUILD_DIR/windeploy
mkdir unsigned
cp $OUTDIR/bitcoin-*setup-unsigned.exe unsigned/
cp $OUTDIR/nyc3-*setup-unsigned.exe unsigned/
find . | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-win-unsigned.tar.gz
mv ${OUTDIR}/${DISTNAME}-x86_64-*-debug.zip ${OUTDIR}/${DISTNAME}-win64-debug.zip
mv ${OUTDIR}/${DISTNAME}-i686-*-debug.zip ${OUTDIR}/${DISTNAME}-win32-debug.zip