From 9c4e3e25e65e2fcf795a6261b294960dad2c25a6 Mon Sep 17 00:00:00 2001
From: Kunal Mehta <legoktm@debian.org>
Date: Tue, 15 Oct 2024 17:23:34 -0400
Subject: [PATCH] Run tests in a noble dev environment in CI

---
 .github/workflows/ci.yml | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ff36655cc2..0e8f26ea96 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -38,42 +38,60 @@ jobs:
 
   test-app:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ubuntu_version:
+          - focal
+          - noble
     steps:
       - uses: actions/checkout@v4
       - name: Build image
         run: |
-          DOCKER_BUILD_VERBOSE=true ./securedrop/bin/dev-shell true
+          UBUNTU_VERSION=${{ matrix.ubuntu_version }} DOCKER_BUILD_VERBOSE=true ./securedrop/bin/dev-shell true
       - name: Run application tests
         run: |
-          make test-app
+          UBUNTU_VERSION=${{ matrix.ubuntu_version }} make test-app
 
   test-functional:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ubuntu_version:
+          - focal
+          - noble
     steps:
       - uses: actions/checkout@v4
       - name: Build image
         run: |
-          DOCKER_BUILD_VERBOSE=true ./securedrop/bin/dev-shell true
+          UBUNTU_VERSION=${{ matrix.ubuntu_version }} DOCKER_BUILD_VERBOSE=true ./securedrop/bin/dev-shell true
       - name: Run functional tests
         run: |
-          make test-functional
+          UBUNTU_VERSION=${{ matrix.ubuntu_version }} make test-functional
 
   test-pageslayout:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ubuntu_version:
+          - focal
+          - noble
     steps:
       - uses: actions/checkout@v4
       - name: Build image
         run: |
-          DOCKER_BUILD_VERBOSE=true ./securedrop/bin/dev-shell true
+          UBUNTU_VERSION=${{ matrix.ubuntu_version }} DOCKER_BUILD_VERBOSE=true ./securedrop/bin/dev-shell true
       - name: Run page layout tests
         run: |
-          make test-pageslayout
+          UBUNTU_VERSION=${{ matrix.ubuntu_version }} make test-pageslayout
       - name: Validate HTML (informational)
         run: |
-          make validate-test-html || true
+          UBUNTU_VERSION=${{ matrix.ubuntu_version }} make validate-test-html || true
       - name: Validate accessibility (informational)
         run: |
-          make accessibility-summary || true
+          UBUNTU_VERSION=${{ matrix.ubuntu_version }} make accessibility-summary || true
 
   rust:
     runs-on: ubuntu-latest