From f05cb1f1d5372c06b22b8fc26e364f857d26f1aa Mon Sep 17 00:00:00 2001
From: Nye Liu <nye@blockdaemon.com>
Date: Sun, 10 Sep 2023 19:24:23 -0700
Subject: [PATCH] Ubuntu lunar has protobuf 3.21. Don't use debian any more to
 get it.

--experimental_allow_proto3_optional requires protbuf 3.15 or later

https://github.com/google/protobuf-gradle-plugin/issues/415#issuecomment-781703996

Also need newer binutils.
---
 .github/workflows/release.yml | 12 +++++-------
 .github/workflows/test.yml    | 12 +++++-------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index bbfe283..f64b454 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -23,22 +23,20 @@ jobs:
           rust_stable=$(rustc --version | awk '{print $2}')
           echo "RUST_STABLE=$rust_stable" | tee -a $GITHUB_ENV
 
-      - if: runner.os == 'Linux'
+      - name: Install build requirements
+        if: runner.os == 'Linux'
         run: |
           sudo apt-get update
+          sudo apt-get dist-upgrade
           sudo apt-get install -y \
             gnupg \
-            ntp \
             libudev-dev \
             libsasl2-dev \
             libssl-dev \
             libzstd-dev
-          sudo touch /etc/apt/sources.list.d/debian.list
-          echo 'deb http://ftp.debian.org/debian sid main' | sudo tee -a /etc/apt/sources.list.d/debian.list
-          sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138
-          sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0E98404D386FA1D9
+          echo 'deb http://archive.ubuntu.com/ubuntu lunar main universe' | sudo tee -a /etc/apt/sources.list.d/lunar.list
           sudo apt-get update
-          sudo apt-get install -y protobuf-compiler
+          sudo apt-get satisfy -f -y binutils "protobuf-compiler (>=3.16)" -t "n=lunar"
 
       - uses: actions-rs/toolchain@v1
         with:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 76d0750..ec9dc8c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -22,22 +22,20 @@ jobs:
           rust_stable=$(rustc --version | awk '{print $2}')
           echo "RUST_STABLE=$rust_stable" | tee -a $GITHUB_ENV
 
-      - if: runner.os == 'Linux'
+      - name: Install build requirements
+        if: runner.os == 'Linux'
         run: |
           sudo apt-get update
+          sudo apt-get dist-upgrade
           sudo apt-get install -y \
             gnupg \
-            ntp \
             libudev-dev \
             libsasl2-dev \
             libssl-dev \
             libzstd-dev
-          sudo touch /etc/apt/sources.list.d/debian.list
-          echo 'deb http://ftp.debian.org/debian sid main' | sudo tee -a /etc/apt/sources.list.d/debian.list
-          sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138
-          sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0E98404D386FA1D9
+          echo 'deb http://archive.ubuntu.com/ubuntu lunar main universe' | sudo tee -a /etc/apt/sources.list.d/lunar.list
           sudo apt-get update
-          sudo apt-get install -y protobuf-compiler
+          sudo apt-get satisfy -f -y binutils "protobuf-compiler (>=3.16)" -t "n=lunar" -o Debug::pkgProblemResolver=1
 
       - uses: actions-rs/toolchain@v1
         with: