Merge pull request #3546
f4e72bf
Make gitian builds consistent across platforms (Micha)
This commit is contained in:
commit
417aad4a38
4 changed files with 9 additions and 8 deletions
|
@ -39,7 +39,7 @@ Once you've got the right hardware and software:
|
||||||
git pull
|
git pull
|
||||||
cd ../gitian-builder
|
cd ../gitian-builder
|
||||||
git pull
|
git pull
|
||||||
./bin/gbuild --commit bitcoin=HEAD ../bitcoin/contrib/gitian-descriptors/gitian.yml
|
./bin/gbuild --commit bitcoin=HEAD ../bitcoin/contrib/gitian-descriptors/gitian-linux.yml
|
||||||
|
|
||||||
# Build Win32 dependencies: (only needs to be done once, or when dependency versions change)
|
# Build Win32 dependencies: (only needs to be done once, or when dependency versions change)
|
||||||
./bin/gbuild --commit bitcoin=HEAD ../bitcoin/contrib/gitian-descriptors/boost-win32.yml
|
./bin/gbuild --commit bitcoin=HEAD ../bitcoin/contrib/gitian-descriptors/boost-win32.yml
|
||||||
|
|
|
@ -7,6 +7,7 @@ architectures:
|
||||||
- "amd64"
|
- "amd64"
|
||||||
packages:
|
packages:
|
||||||
- "unzip"
|
- "unzip"
|
||||||
|
- "zip"
|
||||||
- "pkg-config"
|
- "pkg-config"
|
||||||
- "libtool"
|
- "libtool"
|
||||||
- "faketime"
|
- "faketime"
|
||||||
|
@ -59,4 +60,4 @@ script: |
|
||||||
cd ../..
|
cd ../..
|
||||||
#
|
#
|
||||||
cd $STAGING
|
cd $STAGING
|
||||||
tar -czf $OUTDIR/bitcoin-deps-linux${GBUILD_BITS}-gitian-r1.tar.gz include lib bin host
|
zip -r $OUTDIR/bitcoin-deps-linux${GBUILD_BITS}-gitian-r1.zip include lib bin host
|
||||||
|
|
|
@ -27,8 +27,8 @@ remotes:
|
||||||
- "url": "https://github.com/bitcoin/bitcoin.git"
|
- "url": "https://github.com/bitcoin/bitcoin.git"
|
||||||
"dir": "bitcoin"
|
"dir": "bitcoin"
|
||||||
files:
|
files:
|
||||||
- "bitcoin-deps-linux32-gitian-r1.tar.gz"
|
- "bitcoin-deps-linux32-gitian-r1.zip"
|
||||||
- "bitcoin-deps-linux64-gitian-r1.tar.gz"
|
- "bitcoin-deps-linux64-gitian-r1.zip"
|
||||||
script: |
|
script: |
|
||||||
STAGING="$HOME/install"
|
STAGING="$HOME/install"
|
||||||
OPTFLAGS='-O2'
|
OPTFLAGS='-O2'
|
||||||
|
@ -38,7 +38,7 @@ script: |
|
||||||
#
|
#
|
||||||
mkdir -p $STAGING
|
mkdir -p $STAGING
|
||||||
cd $STAGING
|
cd $STAGING
|
||||||
tar xzfm ../build/bitcoin-deps-linux${GBUILD_BITS}-gitian-r1.tar.gz
|
unzip ../build/bitcoin-deps-linux${GBUILD_BITS}-gitian-r1.zip
|
||||||
cd ../build
|
cd ../build
|
||||||
#
|
#
|
||||||
cd bitcoin
|
cd bitcoin
|
|
@ -52,7 +52,7 @@ Release Process
|
||||||
wget 'https://protobuf.googlecode.com/files/protobuf-2.5.0.tar.bz2'
|
wget 'https://protobuf.googlecode.com/files/protobuf-2.5.0.tar.bz2'
|
||||||
cd ..
|
cd ..
|
||||||
./bin/gbuild ../bitcoin/contrib/gitian-descriptors/deps-linux.yml
|
./bin/gbuild ../bitcoin/contrib/gitian-descriptors/deps-linux.yml
|
||||||
mv build/out/*.tar.gz inputs/
|
mv build/out/bitcoin-deps-*.zip inputs/
|
||||||
./bin/gbuild ../bitcoin/contrib/gitian-descriptors/boost-win32.yml
|
./bin/gbuild ../bitcoin/contrib/gitian-descriptors/boost-win32.yml
|
||||||
mv build/out/boost-win32-*.zip inputs/
|
mv build/out/boost-win32-*.zip inputs/
|
||||||
./bin/gbuild ../bitcoin/contrib/gitian-descriptors/deps-win32.yml
|
./bin/gbuild ../bitcoin/contrib/gitian-descriptors/deps-win32.yml
|
||||||
|
@ -64,8 +64,8 @@ Release Process
|
||||||
|
|
||||||
Build bitcoind and bitcoin-qt on Linux32, Linux64, and Win32:
|
Build bitcoind and bitcoin-qt on Linux32, Linux64, and Win32:
|
||||||
|
|
||||||
./bin/gbuild --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian.yml
|
./bin/gbuild --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian-linux.yml
|
||||||
./bin/gsign --signer $SIGNER --release ${VERSION} --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian.yml
|
./bin/gsign --signer $SIGNER --release ${VERSION} --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-linux.yml
|
||||||
pushd build/out
|
pushd build/out
|
||||||
zip -r bitcoin-${VERSION}-linux-gitian.zip *
|
zip -r bitcoin-${VERSION}-linux-gitian.zip *
|
||||||
mv bitcoin-${VERSION}-linux-gitian.zip ../../../
|
mv bitcoin-${VERSION}-linux-gitian.zip ../../../
|
||||||
|
|
Loading…
Reference in a new issue