mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Ensuring we use at least boost 1.65, build static on Xenial, and adapt CircleCI accordingly.
This commit is contained in:
parent
051df31924
commit
b7eaa4f8d3
@ -104,7 +104,7 @@ jobs:
|
||||
test/externalTests.sh /tmp/workspace/soljson.js || test/externalTests.sh /tmp/workspace/soljson.js
|
||||
build_x86_linux:
|
||||
docker:
|
||||
- image: buildpack-deps:artful
|
||||
- image: buildpack-deps:bionic
|
||||
environment:
|
||||
TERM: xterm
|
||||
COVERAGE: "ON"
|
||||
@ -212,7 +212,7 @@ jobs:
|
||||
|
||||
test_check_style:
|
||||
docker:
|
||||
- image: buildpack-deps:artful
|
||||
- image: buildpack-deps:bionic
|
||||
steps:
|
||||
- checkout
|
||||
- run:
|
||||
@ -238,7 +238,7 @@ jobs:
|
||||
|
||||
test_x86_linux:
|
||||
docker:
|
||||
- image: buildpack-deps:artful
|
||||
- image: buildpack-deps:bionic
|
||||
environment:
|
||||
TERM: xterm
|
||||
steps:
|
||||
@ -315,7 +315,9 @@ jobs:
|
||||
|
||||
docs:
|
||||
docker:
|
||||
- image: buildpack-deps:artful
|
||||
- image: buildpack-deps:bionic
|
||||
environment:
|
||||
DEBIAN_FRONTEND: noninteractive
|
||||
steps:
|
||||
- checkout
|
||||
- run:
|
||||
|
@ -12,7 +12,7 @@ Checklist for making a release:
|
||||
- [ ] Run ``scripts/create_source_tarball.sh`` while being on the tag to create the source tarball.
|
||||
- [ ] Upload the source tarball (in the upload directory) to the 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 and published for all platforms (make sure not to do this earlier), copy the static package to the ``~ethereum/ubuntu/ethereum`` PPA for the destination series ``Trusty`` while selecting ``Copy existing binaries``.
|
||||
- [ ] Once the ``~ethereum/ubuntu/ethereum-static`` PPA build is finished and published for all platforms (make sure not to do this earlier), copy the static package to the ``~ethereum/ubuntu/ethereum`` PPA for the destination series ``Trusty`` and ``Xenial`` 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.
|
||||
|
@ -5,6 +5,9 @@ function(eth_show_dependency DEP NAME)
|
||||
get_property(DISPLAYED GLOBAL PROPERTY ETH_${DEP}_DISPLAYED)
|
||||
if (NOT DISPLAYED)
|
||||
set_property(GLOBAL PROPERTY ETH_${DEP}_DISPLAYED TRUE)
|
||||
if (NOT("${${DEP}_VERSION}" STREQUAL ""))
|
||||
message(STATUS "${NAME} version: ${${DEP}_VERSION}")
|
||||
endif()
|
||||
message(STATUS "${NAME} headers: ${${DEP}_INCLUDE_DIRS}")
|
||||
message(STATUS "${NAME} lib : ${${DEP}_LIBRARIES}")
|
||||
if (NOT("${${DEP}_DLLS}" STREQUAL ""))
|
||||
@ -38,6 +41,6 @@ set(ETH_SCRIPTS_DIR ${ETH_CMAKE_DIR}/scripts)
|
||||
set(Boost_USE_MULTITHREADED ON)
|
||||
option(Boost_USE_STATIC_LIBS "Link Boost statically" ON)
|
||||
|
||||
find_package(Boost 1.54.0 QUIET REQUIRED COMPONENTS regex filesystem unit_test_framework program_options system)
|
||||
find_package(Boost 1.65.0 QUIET REQUIRED COMPONENTS regex filesystem unit_test_framework program_options system)
|
||||
|
||||
eth_show_dependency(Boost boost)
|
||||
|
@ -90,10 +90,10 @@ function(prepare_package_source NAME VERSION URL)
|
||||
endfunction()
|
||||
|
||||
set(INSTALL_DIR "${ROOT_DIR}/install")
|
||||
set(SERVER "https://github.com/ethereum/cpp-dependencies/releases/download/vc140/")
|
||||
set(SERVER "https://github.com/ethereum/cpp-dependencies/releases/download/vs2017/")
|
||||
|
||||
function(download_and_install PACKAGE_NAME)
|
||||
download_and_unpack("${SERVER}${PACKAGE_NAME}.tar.gz" ${INSTALL_DIR})
|
||||
endfunction(download_and_install)
|
||||
|
||||
download_and_install("boost-1.61")
|
||||
download_and_install("boost-1.67.0")
|
||||
|
@ -53,7 +53,7 @@ packagename=solc
|
||||
|
||||
static_build_distribution=cosmic
|
||||
|
||||
for distribution in xenial bionic cosmic STATIC
|
||||
for distribution in bionic cosmic STATIC
|
||||
do
|
||||
cd /tmp/
|
||||
rm -rf $distribution
|
||||
|
Loading…
Reference in New Issue
Block a user