From fa1cd5c263ba1ea2a6dcacca43c44d5f276e11ee Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Thu, 26 Jun 2025 11:32:38 -0400
Subject: [PATCH] Install the Maven-fetched FoundationDB client library on
 GitHub Actions runner

---
 .github/workflows/test.yml | 18 ++++++------------
 service/pom.xml            |  2 +-
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5b7bf6836..c226ccff7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -32,17 +32,11 @@ jobs:
           HOME: /root
       - name: Install APT packages
         # ca-certificates: required for AWS CRT client
-        run: apt update && apt install -y ca-certificates curl
-      - name: Download and install FoundationDB client
-        env:
-          # Note that even-numbered patch versions have AVX instructions disabled; not all GitHub Actions runners have
-          # AVX-capable processors, and we should take care to use non-AVX FoundationDB versions.
-          FOUNDATIONDB_VERSION: 7.3.62
-          FOUNDATIONDB_SHA256: 5cedd29f9dd31e6ad259bd2bd14b61293372bcb8c0c2d8dc4cf4689203790547
+        run: apt update && apt install -y ca-certificates
+      - name: Download and install FoundationDB client library
         run: |
-          curl -L https://github.com/apple/foundationdb/releases/download/${FOUNDATIONDB_VERSION}/foundationdb-clients_${FOUNDATIONDB_VERSION}-1_amd64.deb -O && \
-          echo "${FOUNDATIONDB_SHA256}  foundationdb-clients_${FOUNDATIONDB_VERSION}-1_amd64.deb" | sha256sum --check --status - && \
-          apt install -y ./foundationdb-clients_${FOUNDATIONDB_VERSION}-1_amd64.deb && \
-          rm foundationdb-clients_${FOUNDATIONDB_VERSION}-1_amd64.deb
+          ./mvnw -e -B -Pexclude-spam-filter clean prepare-package -DskipTests=true
+          cp service/target/jib-extra/usr/lib/libfdb_c.x86_64.so /usr/lib/libfdb_c.x86_64.so
+          ldconfig
       - name: Build with Maven
-        run: ./mvnw -e -B verify -DfoundationDb.serviceContainerName=foundationdb
+        run: ./mvnw -e -B clean verify -DfoundationDb.serviceContainerName=foundationdb
diff --git a/service/pom.xml b/service/pom.xml
index 7a4202516..12113caef 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -560,7 +560,7 @@
 
             <configuration>
               <url>https://github.com/apple/foundationdb/releases/download/${foundationdb.version}/libfdb_c.x86_64.so</url>
-              <outputDirectory>${project.build.directory}/jib-extra/usr/local</outputDirectory>
+              <outputDirectory>${project.build.directory}/jib-extra/usr/lib</outputDirectory>
               <sha256>${foundationdb.client-library-sha256}</sha256>
             </configuration>
           </plugin>