Merge remote-tracking branch 'github/pull/349' into master

[chef.git] / .github / workflows / test-kitchen.yml

diff --git a/.github/workflows/test-kitchen.yml b/.github/workflows/test-kitchen.yml
index f62bc5d9308b252b9a11cfe811dfcd126010d8ce..0fcb574614cabd77c9ea1ef9c2b0b2963fb29dee 100644 (file)
--- a/.github/workflows/test-kitchen.yml
+++ b/.github/workflows/test-kitchen.yml
@@ -25,6 +25,7 @@ jobs:
           - devices
           - dhcpd
           - dmca
           - devices
           - dhcpd
           - dmca

+          - dns

           - docker
           - donate
           - elasticsearch
           - docker
           - donate
           - elasticsearch


@@ -63,6 +64,9 @@ jobs:
           - osqa
           - otrs
           - passenger
           - osqa
           - otrs
           - passenger

+          - php
+          - php-apache
+          - php-fpm

           - piwik
           - planet
           - planet-current
           - piwik
           - planet
           - planet-current


@@ -70,6 +74,8 @@ jobs:
           - planet-notes
           - planet-replication
           - postgresql
           - planet-notes
           - planet-replication
           - postgresql

+          - prometheus
+          - prometheus-server

           - python
           - rsyncd
           - serverinfo
           - python
           - rsyncd
           - serverinfo


@@ -96,15 +102,21 @@ jobs:
           - wordpress
           - wiki
         os:
           - wordpress
           - wiki
         os:

-          - ubuntu-1804
+          - ubuntu-2004
+        include:
+          - suite: trac
+            os: ubuntu-1804
+        exclude:
+          - suite: trac
+            os: ubuntu-2004

       fail-fast: false
     steps:
     - name: Check out code
       uses: actions/checkout@v2
     - name: Setup ruby
       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.2

     - name: Cache gems
     - name: Cache gems

-      uses: actions/cache@v1
+      uses: actions/cache@v2

       with:
         path: vendor/bundle
         key: bundle-${{ runner.OS }}-${{ hashFiles('Gemfile.lock') }}
       with:
         path: vendor/bundle
         key: bundle-${{ runner.OS }}-${{ hashFiles('Gemfile.lock') }}