Merge pull request #5634 from ethereum/staticPPA

Replace trusty PPA build by static PPA build.
This commit is contained in:
chriseth 2018-12-12 18:43:08 +01:00 committed by GitHub
commit e85c3428b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 15 deletions

View File

@ -17,6 +17,9 @@ Compiler Features:
Bugfixes:
Build System:
* Replace the trusty PPA build by a static build on cosmic that is used for the trusty package instead.
### 0.5.1 (2018-12-03)
Language Features:

View File

@ -10,6 +10,7 @@ Checklist for making a release:
- [ ] Thank voluntary contributors in the Github release page (use ``git shortlog -s -n -e origin/release..origin/develop``).
- [ ] Wait for the CI runs on the tag itself (they should push artifacts onto the Github release page).
- [ ] Run ``scripts/release_ppa.sh release`` to create the PPA release (you need the relevant openssl key).
- [ ] Once the ``~ethereum/ubuntu/ethereum-static`` PPA build is finished, copy the static package to the ``~ethereum/ubuntu/ethereum`` PPA for the destination series ``Trusty`` while selecting ``Copy existing binaries``.
- [ ] Check that the Docker release was pushed to Docker Hub (this still seems to have problems, run ``./scripts/docker_deploy_manual.sh release``).
- [ ] Update the homebrew realease in https://github.com/ethereum/homebrew-ethereum/blob/master/solidity.rb (version and hash)
- [ ] Update the default version on readthedocs.

View File

@ -28,6 +28,12 @@
## method = ftp
## incoming = ~ethereum/ethereum
## login = anonymous
##
## [ethereum-static]
## fqdn = ppa.launchpad.net
## method = ftp
## incoming = ~ethereum/ethereum-static
## login = anonymous
##
##############################################################################
@ -41,34 +47,36 @@ else
branch=$1
fi
if [ "$branch" = develop ]
then
pparepo=ethereum-dev
ppafilesurl=https://launchpad.net/~ethereum/+archive/ubuntu/ethereum-dev/+files
else
pparepo=ethereum
ppafilesurl=https://launchpad.net/~ethereum/+archive/ubuntu/ethereum/+files
fi
keyid=70D110489D66E2F6
email=builds@ethereum.org
packagename=solc
for distribution in trusty xenial bionic cosmic
static_build_distribution=cosmic
for distribution in xenial bionic cosmic STATIC
do
cd /tmp/
rm -rf $distribution
mkdir $distribution
cd $distribution
# Dependency
if [ $distribution = trusty -o $distribution = vivid ]
if [ $distribution = STATIC ]
then
pparepo=ethereum-static
Z3DEPENDENCY=""
CMAKE_OPTIONS="-DSOLC_LINK_STATIC=On"
else
if [ "$branch" = develop ]
then
pparepo=ethereum-dev
else
pparepo=ethereum
fi
Z3DEPENDENCY="libz3-dev,
"
CMAKE_OPTIONS=""
fi
ppafilesurl=https://launchpad.net/~ethereum/+archive/ubuntu/${pparepo}/+files
# Fetch source
git clone --depth 2 --recursive https://github.com/ethereum/solidity.git -b "$branch"
@ -114,7 +122,7 @@ Priority: extra
Maintainer: Christian (Buildserver key) <builds@ethereum.org>
Build-Depends: ${Z3DEPENDENCY}debhelper (>= 9.0.0),
cmake,
g++-8,
g++,
git,
libgmp-dev,
libboost-all-dev,
@ -168,7 +176,7 @@ override_dh_shlibdeps:
dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
override_dh_auto_configure:
dh_auto_configure -- -DINSTALL_LLLC=Off -DCMAKE_C_COMPILER=gcc-8 -DCMAKE_CXX_COMPILER=g++-8
dh_auto_configure -- -DINSTALL_LLLC=Off -DTESTS=OFF ${CMAKE_OPTIONS}
EOF
cat <<EOF > debian/copyright
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
@ -224,7 +232,12 @@ EMAIL="$email" dch -v 1:${debversion}-${versionsuffix} "git build of ${commithas
debuild -S -d -sa -us -uc
# prepare .changes file for Launchpad
if [ $distribution = STATIC ]
then
sed -i -e s/UNRELEASED/${static_build_distribution}/ -e s/urgency=medium/urgency=low/ ../*.changes
else
sed -i -e s/UNRELEASED/${distribution}/ -e s/urgency=medium/urgency=low/ ../*.changes
fi
# check if ubuntu already has the source tarball
(