gitian: bump build system to focal from bionic

xanimo · Feb 3, 2024 · 65995d3 · 65995d3
1 parent e234707
commit 65995d3
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 27 deletions.
diff --git a/contrib/gitian-build.sh b/contrib/gitian-build.sh
@@ -109,7 +109,6 @@ if [ ! -d "gitian" ]; then
 fi
 
 pushd gitian
-
 if [ ! -d "gitian-builder" ]; then
     git clone https://github.com/devrandom/gitian-builder.git
 fi
@@ -123,10 +122,19 @@ pushd libdogecoin
 popd
 
 pushd gitian-builder
+if [ ! -d "patches" ]; then
+    mkdir -p patches
+fi
+
+if [ ! -f "patches/update-mirrorbase.patch" ]; then
+    wget -P patches https://gist.githubusercontent.com/xanimo/b8e4bc8ac554e384090e1e5eef19b5bf/raw/76f4294fae96a56ee01acf897be523ffaa1fffcb/update-mirrorbase.patch
+    git apply patches/update-mirrorbase.patch
+fi
+
 if [ "$USE_DOCKER" ]; then
-    bin/make-base-vm --docker --suite bionic --arch amd64
+    bin/make-base-vm --docker --suite focal --arch amd64
 elif [ "$USE_LXC" ]; then
-    bin/make-base-vm --lxc --suite bionic --arch amd64
+    bin/make-base-vm --lxc --suite focal --arch amd64
 fi
 
 if [ ! -d "inputs" ]; then
@@ -151,12 +159,6 @@ if [ ! -d "${BUILD_SUFFIX}" ]; then
     mkdir -p ${BUILD_SUFFIX}
 fi
 
-# uncomment once we fix mac and windows packaging
-# if [ "$SIGNER" ]; then
-#     DESCRIPTORS+=('win-signer' 'osx-signer')
-# 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" \

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"
+- "focal"
 architectures:
 - "amd64"
 packages:
 - "curl"
-- "shellcheck"
 - "g++-aarch64-linux-gnu"
-- "g++-7-aarch64-linux-gnu"
-- "gcc-7-aarch64-linux-gnu"
+- "g++-9-aarch64-linux-gnu"
+- "gcc-9-aarch64-linux-gnu"
 - "binutils-aarch64-linux-gnu"
 - "g++-arm-linux-gnueabihf"
-- "g++-7-arm-linux-gnueabihf"
-- "gcc-7-arm-linux-gnueabihf"
+- "g++-9-arm-linux-gnueabihf"
+- "gcc-9-arm-linux-gnueabihf"
 - "binutils-arm-linux-gnueabihf"
-- "g++-7-multilib"
-- "gcc-7-multilib"
-- "binutils-gold"
-- "git-core"
+- "g++-9-multilib"
+- "gcc-9-multilib"
+- "binutils"
+- "git"
 - "pkg-config"
 - "autoconf"
 - "libtool"
 - "automake"
+- "make"
 - "faketime"
 - "bsdmainutils"
 - "ca-certificates"
-- "python"
+- "python3"
 remotes:
 - "url": "${URL}"
   "dir": "libdogecoin"
@@ -145,6 +145,8 @@ script: |
     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/combine.sh --target .libs/libdogecoin.a --append "depends/${i}/lib/libevent.a"
+    ./contrib/scripts/combine.sh --target .libs/libdogecoin.a --append "depends/${i}/lib/libevent_core.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"
+- "focal"
 architectures:
 - "amd64"
 packages:
@@ -22,6 +22,8 @@ packages:
 - "python3"
 - "python3-dev"
 - "python3-setuptools"
+- "libtinfo5"
+- "xorriso"
 remotes:
 - "url": "${URL}"
   "dir": "libdogecoin"
@@ -112,6 +114,8 @@ script: |
     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/combine.sh --target .libs/libdogecoin.a --append "depends/${i}/lib/libevent.a"
+    ./contrib/scripts/combine.sh --target .libs/libdogecoin.a --append "depends/${i}/lib/libevent_core.a"
     ./contrib/scripts/pack.sh --host=${i} --prefix=build --commit="0.1.3"
   done
 

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"
+- "focal"
 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}"
@@ -132,6 +133,8 @@ script: |
     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/combine.sh --target .libs/libdogecoin.a --append "depends/${i}/lib/libevent.a"
+    ./contrib/scripts/combine.sh --target .libs/libdogecoin.a --append "depends/${i}/lib/libevent_core.a"
     ./contrib/scripts/pack.sh --host=${i} --prefix=build --commit="0.1.3"
   done
 

diff --git a/contrib/scripts/pack.sh b/contrib/scripts/pack.sh
@@ -109,7 +109,7 @@ if [ "$HOST" ]; then
         ;;
     esac
     BUILD_SUFFIX="libdogecoin"
-    EXE="`pwd`/such$BINARY_SUFFIX `pwd`/sendtx$BINARY_SUFFIX"
+    EXE="`pwd`/such$BINARY_SUFFIX `pwd`/sendtx$BINARY_SUFFIX `pwd`/spvnode$BINARY_SUFFIX"
     FILES="$LIB $EXE"
 fi
 
@@ -159,7 +159,7 @@ if [ ! -f "$BUILD_PREFIX/$BUILD_SUFFIX/checksums.txt" ]; then
         if [ ! -d "`pwd`/bin" ]; then
             mkdir -p `pwd`/bin
         fi
-        mv such* sendtx* "`pwd`/bin"
+        mv such* sendtx* spvnode* "`pwd`/bin"
     popd
 fi