Skip to content

Commit

Permalink
Drop direct support for Ubuntu 18.04 and switch to static PPA release…
Browse files Browse the repository at this point in the history
…s for it.
  • Loading branch information
ekpyron committed Dec 7, 2020
1 parent 8623e7f commit a3a5d93
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 131 deletions.
18 changes: 0 additions & 18 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
# - ems: Emscripten
version: 2.1
parameters:
ubuntu-1804-docker-image:
type: string
# solbuildpackpusher/solidity-buildpack-deps:ubuntu1804-4
default: "solbuildpackpusher/solidity-buildpack-deps@sha256:79ccaf5a294a3c4f480b2cd69c6d845540c12435e64d732e8536f8f99ad35f03"
ubuntu-2004-docker-image:
type: string
# solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-4
Expand Down Expand Up @@ -478,19 +474,6 @@ jobs:
command: strip build/solc/solc
- store_artifacts: *artifacts_solc

b_ubu18: &build_ubuntu1804
docker:
- image: << pipeline.parameters.ubuntu-1804-docker-image >>
environment:
CMAKE_OPTIONS: -DCMAKE_CXX_FLAGS=-O2
CMAKE_BUILD_TYPE: RelWithDebugInfo
MAKEFLAGS: -j 3
steps:
- checkout
- run: *run_build
- store_artifacts: *artifacts_solc
- persist_to_workspace: *artifacts_executables

b_ubu_codecov:
<<: *build_ubuntu2004
environment:
Expand Down Expand Up @@ -1164,7 +1147,6 @@ workflows:

# Ubuntu build and tests
- b_ubu: *workflow_trigger_on_tags
- b_ubu18: *workflow_trigger_on_tags
- t_ubu_cli: *workflow_ubuntu2004
- t_ubu_soltest: *workflow_ubuntu2004
- t_ubu_soltest_enforce_yul: *workflow_ubuntu2004
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/buildpack-deps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ on:
paths:
- 'scripts/docker/buildpack-deps/Dockerfile.emscripten'
- 'scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz'
- 'scripts/docker/buildpack-deps/Dockerfile.ubuntu1804'
- 'scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang'
- 'scripts/docker/buildpack-deps/Dockerfile.ubuntu2004'

Expand All @@ -23,7 +22,7 @@ jobs:
strategy:
fail-fast: false
matrix:
image_variant: [emscripten, ubuntu1604.clang.ossfuzz, ubuntu1804, ubuntu2004.clang, ubuntu2004]
image_variant: [emscripten, ubuntu1604.clang.ossfuzz, ubuntu2004.clang, ubuntu2004]

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion ReleaseChecklist.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
### PPA
- [ ] Change ``scripts/release_ppa.sh`` to match your key's email and key id.
- [ ] Run ``scripts/release_ppa.sh v$VERSION`` to create the PPA release (you need the relevant openssl key).
- [ ] Wait for the ``~ethereum/ubuntu/ethereum-static`` PPA build to be finished and published for *all platforms*. SERIOUSLY: DO NOT PROCEED EARLIER!!! *After* the static builds are *published*, copy the static package to the ``~ethereum/ubuntu/ethereum`` PPA for the destination series ``Trusty`` and ``Xenial`` while selecting ``Copy existing binaries``.
- [ ] Wait for the ``~ethereum/ubuntu/ethereum-static`` PPA build to be finished and published for *all platforms*. SERIOUSLY: DO NOT PROCEED EARLIER!!! *After* the static builds are *published*, copy the static package to the ``~ethereum/ubuntu/ethereum`` PPA for the destination series ``Trusty``, ``Xenial`` and ``Bionic`` while selecting ``Copy existing binaries``.

### Documentation
- [ ] Build the new version on https://readthedocs.org/projects/solidity/ (select `latest` at the bottom of the page and click `BUILD`)
Expand Down
2 changes: 1 addition & 1 deletion scripts/deps-ppa/static_z3.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ [email protected]
packagename=libz3-static-dev
version=4.8.9

DISTRIBUTIONS="bionic focal groovy"
DISTRIBUTIONS="focal groovy"

for distribution in $DISTRIBUTIONS
do
Expand Down
108 changes: 0 additions & 108 deletions scripts/docker/buildpack-deps/Dockerfile.ubuntu1804

This file was deleted.

2 changes: 1 addition & 1 deletion scripts/release_ppa.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ packagename=solc

static_build_distribution=focal

DISTRIBUTIONS="bionic focal groovy"
DISTRIBUTIONS="focal groovy"

if is_release
then
Expand Down

0 comments on commit a3a5d93

Please sign in to comment.