From 9c3bef0ac2578dc41a179b67219eaac9d2a8ff6f Mon Sep 17 00:00:00 2001
From: tobtoht <tob@featherwallet.org>
Date: Mon, 1 Dec 2025 11:10:13 +0100
Subject: [PATCH] ci: depends: bump container to ubuntu 22.04

---
 .github/workflows/depends.yml      | 23 +++++++++++++++--------
 contrib/depends/packages/zeromq.mk |  1 +
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/depends.yml b/.github/workflows/depends.yml
index d72aa6d9f..9cef8368c 100644
--- a/.github/workflows/depends.yml
+++ b/.github/workflows/depends.yml
@@ -26,7 +26,7 @@ jobs:
   build-cross:
     runs-on: ubuntu-latest
     container:
-      image: ubuntu:20.04
+      image: ubuntu:22.04
       env:
         DEBIAN_FRONTEND: noninteractive
         CCACHE_TEMPDIR: /tmp/.ccache-temp
@@ -56,11 +56,11 @@ jobs:
           - name: "Cross-Mac x86_64"
             host: "x86_64-apple-darwin"
             rust_host: "x86_64-apple-darwin"
-            packages: "clang-18 lld-18"
+            packages: "clang-19 lld-19"
           - name: "Cross-Mac aarch64"
             host: "arm64-apple-darwin"
             rust_host: "aarch64-apple-darwin"
-            packages: "clang-18 lld-18"
+            packages: "clang-19 lld-19"
           - name: "x86_64 Freebsd"
             host: "x86_64-unknown-freebsd"
             rust_host: "x86_64-unknown-freebsd"
@@ -77,8 +77,19 @@ jobs:
     steps:
     - name: set apt conf
       run: ${{env.APT_SET_CONF}}
+    - name: install packages
+      run: apt update; apt -y install ca-certificates curl
+    - name: prepare apple-darwin
+      if: ${{ matrix.toolchain.host == 'x86_64-apple-darwin' || matrix.toolchain.host == 'arm64-apple-darwin' }}
+      run: |
+          cat << EOF >> /etc/apt/sources.list
+          deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-19 main
+          deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-19 main
+          EOF
+          curl https://apt.llvm.org/llvm-snapshot.gpg.key > /etc/apt/trusted.gpg.d/apt.llvm.org.asc
+          echo "/usr/lib/llvm-19/bin/" >> $GITHUB_PATH
     - name: install dependencies
-      run: apt update; apt -y install build-essential cmake pkg-config curl git ca-certificates ccache ${{ matrix.toolchain.packages }}
+      run: apt update; apt -y install build-essential cmake pkg-config git ccache ${{ matrix.toolchain.packages }}
     - name: install rust
       # We can't use the latest Rust due to LLVM 17 not working with old `ld`s (such as in Ubuntu 20.04) for RISC-V
       # We could update ld (a pain), update Ubuntu (requires a large amount of changes), or downgrade Rust
@@ -116,10 +127,6 @@ jobs:
       run: |
         update-alternatives --set ${{ matrix.toolchain.host }}-g++ $(which ${{ matrix.toolchain.host }}-g++-posix)
         update-alternatives --set ${{ matrix.toolchain.host }}-gcc $(which ${{ matrix.toolchain.host }}-gcc-posix)
-    - name: prepare apple-darwin
-      if: ${{ matrix.toolchain.host == 'x86_64-apple-darwin' || matrix.toolchain.host == 'arm64-apple-darwin' }}
-      run: |
-        echo "/usr/lib/llvm-18/bin/" >> $GITHUB_PATH
     - uses: ./.github/actions/set-make-job-count
     - name: build
       run: |
diff --git a/contrib/depends/packages/zeromq.mk b/contrib/depends/packages/zeromq.mk
index 7255790d0..638c5aa29 100644
--- a/contrib/depends/packages/zeromq.mk
+++ b/contrib/depends/packages/zeromq.mk
@@ -6,6 +6,7 @@ $(package)_sha256_hash=6653ef5910f17954861fe72332e68b03ca6e4d9c7160eb3a8de5a5a91
 
 define $(package)_set_vars
   $(package)_config_opts=--without-documentation --disable-shared --without-libsodium --disable-curve
+  $(package)_cxxflags_mingw32+=-O1
 endef
 
 define $(package)_preprocess_cmds