test on ubuntu 22 and 24

Islandora-Devops · Nov 6, 2024 · 717a585 · 717a585
1 parent b05d758
commit 717a585
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
@@ -17,7 +17,10 @@ on:
     - cron: '15 11 * * *'
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-22.04, ubuntu-24.04]
     env:
       ISLANDORA_TAG: "${{ github.event.inputs.buildkit-tag }}"
       ISLANDORA_STARTER_REF: "${{ github.event.inputs.starter-site-ref }}"

diff --git a/tests/init-template-starter.sh b/tests/init-template-starter.sh
@@ -22,8 +22,10 @@ cp ./tests/solr.php drupal/rootfs/var/www/drupal/
 
 # until https://github.com/Islandora-Devops/isle-site-template/issues/46 closes
 # hack this
-if [[ "$(uname)" == "Linux" && -z "$SSH_AUTH_SOCK" ]]; then
-  eval "$(ssh-agent -s)"
+if [[ "$(uname)" == "Linux" ]]; then
+  if [ ! -v SSH_AUTH_SOCK ] || [ "$SSH_AUTH_SOCK" = "" ]; then
+    eval "$(ssh-agent -s)"
+  fi
 fi
 
 ./generate-certs.sh