Skip to content

Commit db53ca5

Browse files
authored
Merge pull request #15932 from ethereum/releasePPAScript
Remove Z3 from ppa scripts and add ubuntu plucky.
2 parents cc6a9cf + fd2d543 commit db53ca5

File tree

3 files changed

+3
-288
lines changed

3 files changed

+3
-288
lines changed

ReleaseChecklist.md

+1-4
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,7 @@ At least a day before the release:
8585

8686
### PPA
8787
- [ ] 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.
88-
- [ ] 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.
89-
- [ ] 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.
90-
Note that it may be included in the `z3-static` multipackage (follow the `View package details` link to check).
91-
If not present, run `scripts/deps-ppa/static_z3.sh` and wait for the builds to succeed before continuing.
88+
- [ ] Double-check that the `DISTRIBUTIONS` list in `scripts/release_ppa.sh` contains the most recent versions of Ubuntu.
9289
- [ ] Run `scripts/release_ppa.sh v$VERSION` to create the PPA release.
9390
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)
9491
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).

scripts/deps-ppa/static_z3.sh

-267
This file was deleted.

scripts/release_ppa.sh

+2-17
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ packagename=solc
6868
# This needs to be a still active release
6969
static_build_distribution=noble
7070

71-
DISTRIBUTIONS="jammy noble oracular"
71+
DISTRIBUTIONS="jammy noble oracular plucky"
7272

7373
if is_release
7474
then
@@ -92,7 +92,6 @@ cd "$distribution"
9292
if [ "$distribution" = STATIC ]
9393
then
9494
pparepo=ethereum-static
95-
SMTDEPENDENCY=""
9695
CMAKE_OPTIONS="-DSOLC_LINK_STATIC=On -DCMAKE_EXE_LINKER_FLAGS=-static"
9796
else
9897
if is_release
@@ -101,20 +100,6 @@ else
101100
else
102101
pparepo=ethereum-dev
103102
fi
104-
if [ "$distribution" = focal ]
105-
then
106-
SMTDEPENDENCY="libz3-static-dev,
107-
libcvc4-dev,
108-
"
109-
elif [ "$distribution" = disco ]
110-
then
111-
SMTDEPENDENCY="libz3-static-dev,
112-
libcvc4-dev,
113-
"
114-
else
115-
SMTDEPENDENCY="libz3-static-dev,
116-
"
117-
fi
118103
CMAKE_OPTIONS=""
119104
fi
120105
ppafilesurl=https://launchpad.net/~ethereum/+archive/ubuntu/${pparepo}/+files
@@ -156,7 +141,7 @@ Source: solc
156141
Section: science
157142
Priority: extra
158143
Maintainer: Christian (Buildserver key) <[email protected]>
159-
Build-Depends: ${SMTDEPENDENCY}debhelper (>= 9.0.0),
144+
Build-Depends: debhelper (>= 9.0.0),
160145
cmake,
161146
g++ (>= 5.0),
162147
git,

0 commit comments

Comments
 (0)