Skip to content

Remove Z3 from ppa scripts and add ubuntu plucky. #15932

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 15, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions ReleaseChecklist.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,7 @@ At least a day before the release:

### PPA
- [ ] Create `.release_ppa_auth` at the root of your local Solidity checkout and set `LAUNCHPAD_EMAIL` and `LAUNCHPAD_KEYID` to your key's email and key id.
- [ ] Double-check that the `DISTRIBUTIONS` list in `scripts/release_ppa.sh` and `scripts/deps-ppa/static_z3.sh` contains the most recent versions of Ubuntu.
- [ ] Make sure the [`~ethereum/cpp-build-deps` PPA repository](https://launchpad.net/~ethereum/+archive/ubuntu/cpp-build-deps) contains `libz3-static-dev` builds for all current versions of Ubuntu.
Note that it may be included in the `z3-static` multipackage (follow the `View package details` link to check).
If not present, run `scripts/deps-ppa/static_z3.sh` and wait for the builds to succeed before continuing.
- [ ] Double-check that the `DISTRIBUTIONS` list in `scripts/release_ppa.sh` contains the most recent versions of Ubuntu.
- [ ] Run `scripts/release_ppa.sh v$VERSION` to create the PPA release.
This will create a single package containing static binary for older Ubuntu versions in the [`~ethereum/ethereum-static` PPA](https://launchpad.net/~ethereum/+archive/ubuntu/ethereum-static)
and separate packages with dynamically-linked binaries for recent versions (those listed in `DISTRIBUTIONS`) in the [`~ethereum/ethereum` PPA](https://launchpad.net/~ethereum/+archive/ubuntu/ethereum).
Expand Down
267 changes: 0 additions & 267 deletions scripts/deps-ppa/static_z3.sh

This file was deleted.

19 changes: 2 additions & 17 deletions scripts/release_ppa.sh
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ packagename=solc
# This needs to be a still active release
static_build_distribution=noble

DISTRIBUTIONS="jammy noble oracular"
DISTRIBUTIONS="jammy noble oracular plucky"

if is_release
then
Expand All @@ -92,7 +92,6 @@ cd "$distribution"
if [ "$distribution" = STATIC ]
then
pparepo=ethereum-static
SMTDEPENDENCY=""
CMAKE_OPTIONS="-DSOLC_LINK_STATIC=On -DCMAKE_EXE_LINKER_FLAGS=-static"
else
if is_release
Expand All @@ -101,20 +100,6 @@ else
else
pparepo=ethereum-dev
fi
if [ "$distribution" = focal ]
then
SMTDEPENDENCY="libz3-static-dev,
libcvc4-dev,
"
elif [ "$distribution" = disco ]
then
SMTDEPENDENCY="libz3-static-dev,
libcvc4-dev,
"
else
SMTDEPENDENCY="libz3-static-dev,
"
fi
CMAKE_OPTIONS=""
fi
ppafilesurl=https://launchpad.net/~ethereum/+archive/ubuntu/${pparepo}/+files
Expand Down Expand Up @@ -156,7 +141,7 @@ Source: solc
Section: science
Priority: extra
Maintainer: Christian (Buildserver key) <builds@ethereum.org>
Build-Depends: ${SMTDEPENDENCY}debhelper (>= 9.0.0),
Build-Depends: debhelper (>= 9.0.0),
cmake,
g++ (>= 5.0),
git,
Expand Down