gitian: bump build system to jammy from bionic

xanimo · Feb 2, 2024 · 26899f2 · 26899f2
1 parent e234707
commit 26899f2
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 34 deletions.
diff --git a/contrib/gitian-build.sh b/contrib/gitian-build.sh
@@ -124,9 +124,9 @@ popd
 
 pushd gitian-builder
 if [ "$USE_DOCKER" ]; then
-    bin/make-base-vm --docker --suite bionic --arch amd64
+    bin/make-base-vm --docker --suite jammy --arch amd64
 elif [ "$USE_LXC" ]; then
-    bin/make-base-vm --lxc --suite bionic --arch amd64
+    bin/make-base-vm --lxc --suite jammy --arch amd64
 fi
 
 if [ ! -d "inputs" ]; then
@@ -157,21 +157,21 @@ fi
 # fi
 
 # leaving commented in case it failure in loop above
-./bin/gbuild -m ${MEM} -j ${PROC} --commit libdogecoin=${COMMIT} --url libdogecoin=${URL} ../libdogecoin/contrib/gitian-descriptors/gitian-linux.yml
-if [ "$SIGNER" ]; then
-./bin/gsign --signer "$SIGNER" --release "$COMMIT"-"linux" \
-                --destination ${BUILD_SUFFIX}/sigs/ ../libdogecoin/contrib/gitian-descriptors/gitian-linux.yml 2>&- || \
-                echo "$0: Error on signature, detached signing"
-fi
-mv build/out/src/libdogecoin-*.tar.gz ${BUILD_SUFFIX}
+# ./bin/gbuild -m ${MEM} -j ${PROC} --commit libdogecoin=${COMMIT} --url libdogecoin=${URL} ../libdogecoin/contrib/gitian-descriptors/gitian-linux.yml
+# if [ "$SIGNER" ]; then
+# ./bin/gsign --signer "$SIGNER" --release "$COMMIT"-"linux" \
+#                 --destination ${BUILD_SUFFIX}/sigs/ ../libdogecoin/contrib/gitian-descriptors/gitian-linux.yml 2>&- || \
+#                 echo "$0: Error on signature, detached signing"
+# fi
+# mv build/out/src/libdogecoin-*.tar.gz ${BUILD_SUFFIX}
 
-./bin/gbuild -m ${MEM} -j ${PROC} --commit libdogecoin=${COMMIT} --url libdogecoin=${URL} ../libdogecoin/contrib/gitian-descriptors/gitian-win.yml
-if [ "$SIGNER" ]; then
-./bin/gsign --signer "$SIGNER" --release "$COMMIT"-"win" \
-                --destination ${BUILD_SUFFIX}/sigs/ ../libdogecoin/contrib/gitian-descriptors/gitian-win.yml 2>&- || \
-                echo "$0: Error on signature, detached signing"
-fi
-mv build/out/src/libdogecoin-*.zip ${BUILD_SUFFIX}
+# ./bin/gbuild -m ${MEM} -j ${PROC} --commit libdogecoin=${COMMIT} --url libdogecoin=${URL} ../libdogecoin/contrib/gitian-descriptors/gitian-win.yml
+# if [ "$SIGNER" ]; then
+# ./bin/gsign --signer "$SIGNER" --release "$COMMIT"-"win" \
+#                 --destination ${BUILD_SUFFIX}/sigs/ ../libdogecoin/contrib/gitian-descriptors/gitian-win.yml 2>&- || \
+#                 echo "$0: Error on signature, detached signing"
+# fi
+# mv build/out/src/libdogecoin-*.zip ${BUILD_SUFFIX}
 
 ./bin/gbuild -m ${MEM} -j ${PROC} --commit libdogecoin=${COMMIT} --url libdogecoin=${URL} ../libdogecoin/contrib/gitian-descriptors/gitian-osx.yml
 if [ "$SIGNER" ]; then

diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
@@ -2,32 +2,32 @@
 name: "libdogecoin-linux-0.1.3"
 enable_cache: true
 suites:
-- "bionic"
+- "jammy"
 architectures:
 - "amd64"
 packages:
 - "curl"
-- "shellcheck"
 - "g++-aarch64-linux-gnu"
-- "g++-7-aarch64-linux-gnu"
-- "gcc-7-aarch64-linux-gnu"
+- "g++-11-aarch64-linux-gnu"
+- "gcc-11-aarch64-linux-gnu"
 - "binutils-aarch64-linux-gnu"
 - "g++-arm-linux-gnueabihf"
-- "g++-7-arm-linux-gnueabihf"
-- "gcc-7-arm-linux-gnueabihf"
+- "g++-11-arm-linux-gnueabihf"
+- "gcc-11-arm-linux-gnueabihf"
 - "binutils-arm-linux-gnueabihf"
-- "g++-7-multilib"
-- "gcc-7-multilib"
-- "binutils-gold"
-- "git-core"
+- "g++-11-multilib"
+- "gcc-11-multilib"
+- "binutils"
+- "git"
 - "pkg-config"
 - "autoconf"
 - "libtool"
 - "automake"
+- "make"
 - "faketime"
 - "bsdmainutils"
 - "ca-certificates"
-- "python"
+- "python3"
 remotes:
 - "url": "${URL}"
   "dir": "libdogecoin"
@@ -144,7 +144,6 @@ script: |
   for i in ${HOSTS}; do
     export PATH=${BASEPREFIX}/${i}/native/bin:${ORIGPATH}
     ./contrib/scripts/build.sh --host ${i} --depends
-    ./contrib/scripts/combine.sh --target .libs/libdogecoin.a --append "depends/${i}/lib/libunistring.a"
     ./contrib/scripts/pack.sh --host=${i} --prefix=build --commit="0.1.3"
   done
 

diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml
@@ -2,7 +2,7 @@
 name: "libdogecoin-osx-0.1.3"
 enable_cache: true
 suites:
-- "bionic"
+- "jammy"
 architectures:
 - "amd64"
 packages:
@@ -22,6 +22,8 @@ packages:
 - "python3"
 - "python3-dev"
 - "python3-setuptools"
+- "libtinfo5"
+- "xorriso"
 remotes:
 - "url": "${URL}"
   "dir": "libdogecoin"

diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml
@@ -2,7 +2,7 @@
 name: "libdogecoin-win-0.1.3"
 enable_cache: true
 suites:
-- "bionic"
+- "jammy"
 architectures:
 - "amd64"
 packages:
@@ -15,12 +15,13 @@ packages:
 - "automake"
 - "faketime"
 - "bsdmainutils"
-- "mingw-w64"
-- "g++-mingw-w64"
+- "g++-mingw-w64-x86-64"
+- "g++"
+- "g++-mingw-w64-i686"
 - "nsis"
 - "zip"
 - "ca-certificates"
-- "python"
+- "python3"
 - "rename"
 remotes:
 - "url": "${URL}"
@@ -131,7 +132,6 @@ script: |
   for i in ${HOSTS}; do
     export PATH=${BASEPREFIX}/${i}/native/bin:${ORIGPATH}
     ./contrib/scripts/build.sh --host ${i} --depends
-    ./contrib/scripts/combine.sh --target .libs/libdogecoin.a --append "depends/${i}/lib/libunistring.a"
     ./contrib/scripts/pack.sh --host=${i} --prefix=build --commit="0.1.3"
   done