cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Restore static ubuntu 20.04 release builds

Browse Source
This commit is contained in:
Rodrigo Q. Saramago 2023-02-14 14:31:11 +01:00
parent 7cd589eee4
commit 930c8c0753
No known key found for this signature in database
GPG Key ID: 9B36B2525704A359
2 changed files with 169 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
.circleci/config.yml
View File

@ -7,6 +7,10 @@
# - ems: Emscripten # - ems: Emscripten
version: 2.1 version: 2.1
parameters: parameters:
ubuntu-2004-docker-image:
type: string
# solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-16
default: "solbuildpackpusher/solidity-buildpack-deps@sha256:ee1def5806f40c35d583234e172ec5769bb9a08b6f5bbc713c1a2658846dbced"
ubuntu-2204-docker-image: ubuntu-2204-docker-image:
type: string type: string
# solbuildpackpusher/solidity-buildpack-deps:ubuntu2204-1 # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204-1
@ -97,11 +101,13 @@ commands:
parameters: parameters:
label: label:
type: string type: string
binary_path:
type: string
steps: steps:
- run: mkdir test-cases/ - run: mkdir test-cases/
- run: cd test-cases && ../scripts/isolate_tests.py ../test/ - run: cd test-cases && python3 ../scripts/isolate_tests.py ../test/
- run: cd test-cases && ../scripts/bytecodecompare/prepare_report.py ../build/solc/solc --interface standard-json --report-file "../bytecode-report-<< parameters.label >>-json.txt" - run: cd test-cases && python3 ../scripts/bytecodecompare/prepare_report.py << parameters.binary_path >> --interface standard-json --report-file "../bytecode-report-<< parameters.label >>-json.txt"
- run: cd test-cases && ../scripts/bytecodecompare/prepare_report.py ../build/solc/solc --interface cli --report-file "../bytecode-report-<< parameters.label >>-cli.txt" - run: cd test-cases && python3 ../scripts/bytecodecompare/prepare_report.py << parameters.binary_path >> --interface cli --report-file "../bytecode-report-<< parameters.label >>-cli.txt"
- store_artifacts: - store_artifacts:
path: bytecode-report-<< parameters.label >>-json.txt path: bytecode-report-<< parameters.label >>-json.txt
- store_artifacts: - store_artifacts:
@ -313,6 +319,27 @@ defaults:
CXX: clang++ CXX: clang++
MAKEFLAGS: -j 5 MAKEFLAGS: -j 5
- base_ubuntu2004: &base_ubuntu2004
docker:
- image: << pipeline.parameters.ubuntu-2004-docker-image >>
environment:
TERM: xterm
MAKEFLAGS: -j 3
- base_ubuntu2004_small: &base_ubuntu2004_small
<<: *base_ubuntu2004
resource_class: small
environment:
TERM: xterm
MAKEFLAGS: -j 2
- base_ubuntu2004_xlarge: &base_ubuntu2004_xlarge
<<: *base_ubuntu2004
resource_class: xlarge
environment:
TERM: xterm
MAKEFLAGS: -j 10
- base_ubuntu2204: &base_ubuntu2204 - base_ubuntu2204: &base_ubuntu2204
docker: docker:
- image: << pipeline.parameters.ubuntu-2204-docker-image >> - image: << pipeline.parameters.ubuntu-2204-docker-image >>
@ -454,7 +481,7 @@ defaults:
requires: requires:
- b_ubu_force_release - b_ubu_force_release
- workflow_ubuntu2204_static: &workflow_ubuntu2204_static - workflow_ubuntu2004_static: &workflow_ubuntu2004_static
<<: *workflow_trigger_on_tags <<: *workflow_trigger_on_tags
requires: requires:
- b_ubu_static - b_ubu_static
@ -518,91 +545,91 @@ defaults:
python2: true python2: true
- job_native_test_ext_gnosis: &job_native_test_ext_gnosis - job_native_test_ext_gnosis: &job_native_test_ext_gnosis
<<: *workflow_ubuntu2204_static <<: *workflow_ubuntu2004_static
name: t_native_test_ext_gnosis name: t_native_test_ext_gnosis
project: gnosis project: gnosis
binary_type: native binary_type: native
nodejs_version: '16.18' nodejs_version: '16.18'
- job_native_test_ext_zeppelin: &job_native_test_ext_zeppelin - job_native_test_ext_zeppelin: &job_native_test_ext_zeppelin
<<: *workflow_ubuntu2204_static <<: *workflow_ubuntu2004_static
name: t_native_test_ext_zeppelin name: t_native_test_ext_zeppelin
project: zeppelin project: zeppelin
binary_type: native binary_type: native
resource_class: large resource_class: large
- job_native_test_ext_ens: &job_native_test_ext_ens - job_native_test_ext_ens: &job_native_test_ext_ens
<<: *workflow_ubuntu2204_static <<: *workflow_ubuntu2004_static
name: t_native_test_ext_ens name: t_native_test_ext_ens
project: ens project: ens
binary_type: native binary_type: native
nodejs_version: '18.11' nodejs_version: '18.11'
- job_native_test_ext_trident: &job_native_test_ext_trident - job_native_test_ext_trident: &job_native_test_ext_trident
<<: *workflow_ubuntu2204_static <<: *workflow_ubuntu2004_static
name: t_native_test_ext_trident name: t_native_test_ext_trident
project: trident project: trident
binary_type: native binary_type: native
nodejs_version: '16.18' nodejs_version: '16.18'
- job_native_test_ext_euler: &job_native_test_ext_euler - job_native_test_ext_euler: &job_native_test_ext_euler
<<: *workflow_ubuntu2204_static <<: *workflow_ubuntu2004_static
name: t_native_test_ext_euler name: t_native_test_ext_euler
project: euler project: euler
binary_type: native binary_type: native
resource_class: medium resource_class: medium
- job_native_test_ext_yield_liquidator: &job_native_test_ext_yield_liquidator - job_native_test_ext_yield_liquidator: &job_native_test_ext_yield_liquidator
<<: *workflow_ubuntu2204_static <<: *workflow_ubuntu2004_static
name: t_native_test_ext_yield_liquidator name: t_native_test_ext_yield_liquidator
project: yield-liquidator project: yield-liquidator
binary_type: native binary_type: native
- job_native_test_ext_bleeps: &job_native_test_ext_bleeps - job_native_test_ext_bleeps: &job_native_test_ext_bleeps
<<: *workflow_ubuntu2204_static <<: *workflow_ubuntu2004_static
name: t_native_test_ext_bleeps name: t_native_test_ext_bleeps
project: bleeps project: bleeps
binary_type: native binary_type: native
resource_class: medium resource_class: medium
- job_native_test_ext_pool_together: &job_native_test_ext_pool_together - job_native_test_ext_pool_together: &job_native_test_ext_pool_together
<<: *workflow_ubuntu2204_static <<: *workflow_ubuntu2004_static
name: t_native_test_ext_pool_together name: t_native_test_ext_pool_together
project: pool-together project: pool-together
binary_type: native binary_type: native
nodejs_version: '16.18' nodejs_version: '16.18'
- job_native_test_ext_perpetual_pools: &job_native_test_ext_perpetual_pools - job_native_test_ext_perpetual_pools: &job_native_test_ext_perpetual_pools
<<: *workflow_ubuntu2204_static <<: *workflow_ubuntu2004_static
name: t_native_test_ext_perpetual_pools name: t_native_test_ext_perpetual_pools
project: perpetual-pools project: perpetual-pools
binary_type: native binary_type: native
nodejs_version: '18.11' nodejs_version: '18.11'
- job_native_test_ext_uniswap: &job_native_test_ext_uniswap - job_native_test_ext_uniswap: &job_native_test_ext_uniswap
<<: *workflow_ubuntu2204_static <<: *workflow_ubuntu2004_static
name: t_native_test_ext_uniswap name: t_native_test_ext_uniswap
project: uniswap project: uniswap
binary_type: native binary_type: native
nodejs_version: '16.18' nodejs_version: '16.18'
- job_native_test_ext_prb_math: &job_native_test_ext_prb_math - job_native_test_ext_prb_math: &job_native_test_ext_prb_math
<<: *workflow_ubuntu2204_static <<: *workflow_ubuntu2004_static
name: t_native_test_ext_prb_math name: t_native_test_ext_prb_math
project: prb-math project: prb-math
binary_type: native binary_type: native
nodejs_version: '18.11' nodejs_version: '18.11'
- job_native_test_ext_elementfi: &job_native_test_ext_elementfi - job_native_test_ext_elementfi: &job_native_test_ext_elementfi
<<: *workflow_ubuntu2204_static <<: *workflow_ubuntu2004_static
name: t_native_test_ext_elementfi name: t_native_test_ext_elementfi
project: elementfi project: elementfi
binary_type: native binary_type: native
resource_class: medium resource_class: medium
- job_native_test_ext_brink: &job_native_test_ext_brink - job_native_test_ext_brink: &job_native_test_ext_brink
<<: *workflow_ubuntu2204_static <<: *workflow_ubuntu2004_static
name: t_native_test_ext_brink name: t_native_test_ext_brink
project: brink project: brink
binary_type: native binary_type: native
nodejs_version: '18.11' nodejs_version: '18.11'
- job_native_test_ext_chainlink: &job_native_test_ext_chainlink - job_native_test_ext_chainlink: &job_native_test_ext_chainlink
<<: *workflow_ubuntu2204_static <<: *workflow_ubuntu2004_static
name: t_native_test_ext_chainlink name: t_native_test_ext_chainlink
project: chainlink project: chainlink
binary_type: native binary_type: native
nodejs_version: '16.18' nodejs_version: '16.18'
resource_class: large # Tests run out of memory on a smaller machine resource_class: large # Tests run out of memory on a smaller machine
- job_native_test_ext_gp2: &job_native_test_ext_gp2 - job_native_test_ext_gp2: &job_native_test_ext_gp2
<<: *workflow_ubuntu2204_static <<: *workflow_ubuntu2004_static
name: t_native_test_ext_gp2 name: t_native_test_ext_gp2
project: gp2 project: gp2
binary_type: native binary_type: native
@ -826,8 +853,11 @@ jobs:
MAKEFLAGS: -j 10 MAKEFLAGS: -j 10
b_ubu_static: b_ubu_static:
# We temporarily keep building static release binaries on ubuntu 20.04
# to avoid glibc incompatibilities.
# See: https://github.com/ethereum/solidity/issues/13954
# On large runs 2x faster than on medium. 3x on xlarge. # On large runs 2x faster than on medium. 3x on xlarge.
<<: *base_ubuntu2204_xlarge <<: *base_ubuntu2004_xlarge
environment: environment:
TERM: xterm TERM: xterm
MAKEFLAGS: -j 10 MAKEFLAGS: -j 10
@ -838,8 +868,14 @@ jobs:
- run: - run:
name: strip binary name: strip binary
command: strip build/solc/solc command: strip build/solc/solc
- store_artifacts: *artifacts_solc - store_artifacts:
- persist_to_workspace: *artifacts_executables path: build/solc/solc
destination: solc-static-linux
- run: mv build/solc/solc build/solc/solc-static-linux
- persist_to_workspace:
root: build
paths:
- solc/solc-static-linux
- gitter_notify_failure_unless_pr - gitter_notify_failure_unless_pr
b_ubu_codecov: b_ubu_codecov:
@ -1248,7 +1284,7 @@ jobs:
- run: - run:
name: External <<parameters.project>> tests (native) name: External <<parameters.project>> tests (native)
command: | command: |
test/externalTests/<<parameters.project>>.sh native /tmp/workspace/solc/solc test/externalTests/<<parameters.project>>.sh native /tmp/workspace/solc/solc-static-linux
- store_artifacts: - store_artifacts:
path: reports/externalTests/ path: reports/externalTests/
# persist_to_workspace fails if the directory does not exist and the test script will create # persist_to_workspace fails if the directory does not exist and the test script will create
@ -1389,6 +1425,23 @@ jobs:
- store_artifacts: *artifacts_test_results - store_artifacts: *artifacts_test_results
- gitter_notify_failure_unless_pr - gitter_notify_failure_unless_pr
# Note: b_bytecode_ubu_static is required because b_ubu_static and b_ubu
# are currently built on different Ubuntu base images.
# It can be safely removed once we move both to the same Ubuntu version.
b_bytecode_ubu_static:
<<: *base_ubuntu2004_small
environment:
TERM: xterm
MAKEFLAGS: -j 2
LC_ALL: C
steps:
- checkout
- attach_workspace:
at: build
- prepare_bytecode_report:
label: "ubuntu2004-static"
binary_path: "../build/solc/solc-static-linux"
b_bytecode_ubu: b_bytecode_ubu:
<<: *base_ubuntu2204_small <<: *base_ubuntu2204_small
environment: environment:
@ -1401,6 +1454,7 @@ jobs:
at: build at: build
- prepare_bytecode_report: - prepare_bytecode_report:
label: "ubuntu" label: "ubuntu"
binary_path: "../build/solc/solc"
b_bytecode_osx: b_bytecode_osx:
<<: *base_osx <<: *base_osx
@ -1414,6 +1468,7 @@ jobs:
at: . at: .
- prepare_bytecode_report: - prepare_bytecode_report:
label: "osx" label: "osx"
binary_path: "../build/solc/solc"
b_bytecode_win: b_bytecode_win:
<<: *base_win_bash <<: *base_win_bash
@ -1424,22 +1479,13 @@ jobs:
# platforms so line ending conversions must absolutely be disabled. # platforms so line ending conversions must absolutely be disabled.
- run: git config --global core.autocrlf false - run: git config --global core.autocrlf false
- checkout - checkout
# Ensure windows has python3 alias required by prepare_bytecode_report
- run: ln -s /c/tools/miniconda3/python /c/tools/miniconda3/python3
- attach_workspace: - attach_workspace:
at: build at: build
- run: mkdir test-cases/ - prepare_bytecode_report:
- run: cd test-cases/ && python ../scripts/isolate_tests.py ../test/ label: "windows"
- run: cd test-cases/ && python ../scripts/bytecodecompare/prepare_report.py ../build/solc/Release/solc.exe --interface standard-json --report-file ../bytecode-report-windows-json.txt binary_path: "../build/solc/Release/solc.exe"
- run: cd test-cases/ && python ../scripts/bytecodecompare/prepare_report.py ../build/solc/Release/solc.exe --interface cli --report-file ../bytecode-report-windows-cli.txt
- store_artifacts:
path: bytecode-report-windows-json.txt
- store_artifacts:
path: bytecode-report-windows-cli.txt
- persist_to_workspace:
root: .
paths:
- bytecode-report-windows-json.txt
- bytecode-report-windows-cli.txt
- gitter_notify_failure_unless_pr
b_bytecode_ems: b_bytecode_ems:
<<: *base_node_small <<: *base_node_small
@ -1464,6 +1510,8 @@ jobs:
environment: environment:
REPORT_FILES: | REPORT_FILES: |
bytecode-report-emscripten.txt bytecode-report-emscripten.txt
bytecode-report-ubuntu2004-static-json.txt
bytecode-report-ubuntu2004-static-cli.txt
bytecode-report-ubuntu-json.txt bytecode-report-ubuntu-json.txt
bytecode-report-ubuntu-cli.txt bytecode-report-ubuntu-cli.txt
bytecode-report-osx-json.txt bytecode-report-osx-json.txt
@ -1506,10 +1554,10 @@ jobs:
name: Gather and rename binaries from dependent jobs name: Gather and rename binaries from dependent jobs
command: | command: |
mkdir github/ mkdir github/
cp workspace/solc/solc github/solc-static-linux cp workspace/solc/solc-static-linux github/solc-static-linux
cp workspace/build/solc/solc github/solc-macos cp workspace/build/solc/solc github/solc-macos
cp workspace/solc/Release/solc.exe github/solc-windows.exe cp workspace/solc/Release/solc.exe github/solc-windows.exe
cp workspace/soljson.js github/soljson.js cp workspace/soljson.js github/soljson.js
cd github/ cd github/
tar --create --file ../github-binaries.tar * tar --create --file ../github-binaries.tar *
@ -1635,6 +1683,10 @@ workflows:
- t_win_soltest: *workflow_win - t_win_soltest: *workflow_win
# Bytecode comparison: # Bytecode comparison:
- b_bytecode_ubu_static:
<<: *workflow_trigger_on_tags
requires:
- b_ubu_static
- b_bytecode_ubu: - b_bytecode_ubu:
<<: *workflow_trigger_on_tags <<: *workflow_trigger_on_tags
requires: requires:
@ -1654,6 +1706,7 @@ workflows:
- t_bytecode_compare: - t_bytecode_compare:
<<: *workflow_trigger_on_tags <<: *workflow_trigger_on_tags
requires: requires:
- b_bytecode_ubu_static
- b_bytecode_ubu - b_bytecode_ubu
- b_bytecode_win - b_bytecode_win
- b_bytecode_osx - b_bytecode_osx

75
scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 Normal file
View File

@ -0,0 +1,75 @@
# vim:syntax=dockerfile
#------------------------------------------------------------------------------
# Dockerfile for building and testing Solidity Compiler on CI
# Target: Ubuntu 19.04 (Disco Dingo)
# URL: https://hub.docker.com/r/ethereum/solidity-buildpack-deps
#
# This file is part of solidity.
#
# solidity is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# solidity is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with solidity. If not, see <http://www.gnu.org/licenses/>
#
# (c) 2016-2019 solidity contributors.
#------------------------------------------------------------------------------
FROM buildpack-deps:focal AS base
LABEL version="16"
ARG DEBIAN_FRONTEND=noninteractive
RUN set -ex; \
dist=$(grep DISTRIB_CODENAME /etc/lsb-release | cut -d= -f2); \
echo "deb http://ppa.launchpad.net/ethereum/cpp-build-deps/ubuntu $dist main" >> /etc/apt/sources.list ; \
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1c52189c923f6ca9 ; \
apt-get update; \
apt-get install -qqy --no-install-recommends \
build-essential \
software-properties-common \
cmake ninja-build \
libboost-filesystem-dev libboost-test-dev libboost-system-dev \
libboost-program-options-dev \
libcvc4-dev libz3-static-dev z3-static jq \
; \
apt-get install -qy python3-pip python3-sphinx; \
pip3 install codecov; \
rm -rf /var/lib/apt/lists/*
FROM base AS libraries
# EVMONE
RUN set -ex; \
cd /usr/src; \
git clone --branch="v0.9.1" --recurse-submodules https://github.com/ethereum/evmone.git; \
cd evmone; \
mkdir build; \
cd build; \
cmake -G Ninja -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX="/usr" ..; \
ninja; \
ninja install/strip; \
rm -rf /usr/src/evmone
# HERA
RUN set -ex; \
cd /usr/src; \
git clone --branch="v0.6.0" --depth 1 --recurse-submodules https://github.com/ewasm/hera.git; \
cd hera; \
mkdir build; \
cd build; \
cmake -G Ninja -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX="/usr" ..; \
ninja; \
ninja install/strip; \
rm -rf /usr/src/hera
FROM base
COPY --from=libraries /usr/lib /usr/lib
COPY --from=libraries /usr/bin /usr/bin
COPY --from=libraries /usr/include /usr/include