X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/14e316cd3e1ab5f25a54d0765ebad61ac665ccb4..00bc7e2e46dba86663711b6b020d509ca64ed089:/.github/workflows/test-kitchen.yml?ds=sidebyside

diff --git a/.github/workflows/test-kitchen.yml b/.github/workflows/test-kitchen.yml
index 5c622df16..76305aaa2 100644
--- a/.github/workflows/test-kitchen.yml
+++ b/.github/workflows/test-kitchen.yml
@@ -5,13 +5,13 @@ on:
   - pull_request
 
 concurrency:
-  group: ${{ github.workflow }}-{{ github.head_ref || github.ref }}
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
   cancel-in-progress: true
 
 jobs:
   kitchen:
     name: Test Kitchen
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         suite:
@@ -91,6 +91,9 @@ jobs:
           - spamassassin
           - ssl
           - stateofthemap
+          - stateofthemap-jekyll
+          - stateofthemap-static
+          - stateofthemap-wordpress
           - subversion
           - supybot
           - switch2osm
@@ -107,7 +110,17 @@ jobs:
           - wordpress
           - wiki
         os:
-          - ubuntu-2004
+          - ubuntu-2204
+        include:
+          - os: ubuntu-2004
+            suite: mailman
+          - os: ubuntu-2004
+            suite: osqa
+        exclude:
+          - suite: mailman
+            os: ubuntu-2204
+          - suite: osqa
+            os: ubuntu-2204
       fail-fast: false
     steps:
     - name: Check out code
@@ -115,6 +128,7 @@ jobs:
     - name: Setup ruby
       uses: ruby/setup-ruby@v1
       with:
+        ruby-version: 3.1
         bundler-cache: true
     - name: Run kitchen test ${{ matrix.suite }}-${{ matrix.os }}
       run: bundle exec kitchen test ${{ matrix.suite }}-${{ matrix.os }}