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 google/protobuf-gradle-plugin#415 (comment)
Blockdaemon · Sep 11, 2023 · 725da5a · 725da5a
1 parent e1fc4af
commit 725da5a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -23,22 +23,19 @@ 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 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 "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
@@ -22,22 +22,19 @@ 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 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 "protobuf-compiler (>=3.16)" -t "n=lunar"
 
       - uses: actions-rs/toolchain@v1
         with: