X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/ebe7ceb136d38c41bcc193b93bb2f619ffe61944..1f226728b8d363340f3ccd696ce1259bb0159ef5:/.github/workflows/test-kitchen.yml

diff --git a/.github/workflows/test-kitchen.yml b/.github/workflows/test-kitchen.yml
index 99353fd3f..acb40b6f4 100644
--- a/.github/workflows/test-kitchen.yml
+++ b/.github/workflows/test-kitchen.yml
@@ -25,6 +25,7 @@ jobs:
           - devices
           - dhcpd
           - dmca
+          - dns
           - docker
           - donate
           - elasticsearch
@@ -56,12 +57,16 @@ jobs:
           - networking
           - nginx
           - nodejs
+          - nominatim
           - ntp
           - openssh
           - osmosis
           - osqa
           - otrs
           - passenger
+          - php
+          - php-apache
+          - php-fpm
           - piwik
           - planet
           - planet-current
@@ -69,6 +74,8 @@ jobs:
           - planet-notes
           - planet-replication
           - postgresql
+          - prometheus
+          - prometheus-server
           - python
           - rsyncd
           - serverinfo
@@ -95,15 +102,25 @@ jobs:
           - wordpress
           - wiki
         os:
-          - ubuntu-1804
+          - ubuntu-2004
+        include:
+          - suite: osqa
+            os: ubuntu-1804
+          - suite: trac
+            os: ubuntu-1804
+        exclude:
+          - suite: osqa
+            os: ubuntu-2004
+          - suite: trac
+            os: ubuntu-2004
       fail-fast: false
     steps:
     - name: Check out code
       uses: actions/checkout@v2
     - name: Setup ruby
-      uses: actions/setup-ruby@v1
+      uses: actions/setup-ruby@v1.1.1
     - name: Cache gems
-      uses: actions/cache@v1
+      uses: actions/cache@v2
       with:
         path: vendor/bundle
         key: bundle-${{ runner.OS }}-${{ hashFiles('Gemfile.lock') }}
@@ -115,7 +132,8 @@ jobs:
         sudo aa-disable /usr/sbin/mysqld
     - name: Install gems
       run: |
-        gem install bundler --version "~> 1.17"
-        bundle install --jobs 4 --retry 3 --deployment
+        gem install bundler
+        bundle config set deployment true
+        bundle install --jobs 4 --retry 3
     - name: Run kitchen test ${{ matrix.suite }}-${{ matrix.os }}
       run: bundle exec kitchen test ${{ matrix.suite }}-${{ matrix.os }}