Merge pull request #313 from openstreetmap/dependabot/github_actions/actions/cache-v2

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

diff --git a/.github/workflows/test-kitchen.yml b/.github/workflows/test-kitchen.yml
index 85ec2038d81d384582b1ed96a322e4ac10834f47..a28a66e994c060a4475f76c6e25ba2835685b99c 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

+          - docker

           - donate
           - elasticsearch
           - exim
           - donate
           - elasticsearch
           - exim


@@ -40,10 +41,12 @@ jobs:
           - hardware
           - hot
           - incron
           - hardware
           - hot
           - incron

+          - irc

           - kibana
           - letsencrypt
           - logstash
           - logstash-forwarder
           - kibana
           - letsencrypt
           - logstash
           - logstash-forwarder

+          - mail

           - mailman
           - memcached
           - munin
           - mailman
           - memcached
           - munin


@@ -53,12 +56,16 @@ jobs:
           - networking
           - nginx
           - nodejs
           - networking
           - nginx
           - nodejs

+          - nominatim

           - ntp
           - openssh
           - osmosis
           - osqa
           - otrs
           - passenger
           - ntp
           - openssh
           - osmosis
           - osqa
           - otrs
           - passenger

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

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


@@ -78,15 +85,19 @@ jobs:
           - supybot
           - switch2osm
           - sysctl
           - supybot
           - switch2osm
           - sysctl

+          - sysfs

           - taginfo
           - tile
           - tilecache
           - taginfo
           - tile
           - tilecache

+          - tilelog

           - tools
           - trac
           - web-backend
           - web-cgimap
           - web-frontend
           - web-rails
           - tools
           - trac
           - web-backend
           - web-cgimap
           - web-frontend
           - web-rails

+          - wordpress
+          - wiki

         os:
           - ubuntu-1804
       fail-fast: false
         os:
           - ubuntu-1804
       fail-fast: false


@@ -96,7 +107,7 @@ jobs:
     - name: Setup ruby
       uses: actions/setup-ruby@v1
     - name: Cache gems
     - name: Setup ruby
       uses: actions/setup-ruby@v1
     - 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') }}


@@ -108,7 +119,8 @@ jobs:
         sudo aa-disable /usr/sbin/mysqld
     - name: Install gems
       run: |
         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 }}
     - name: Run kitchen test ${{ matrix.suite }}-${{ matrix.os }}
       run: bundle exec kitchen test ${{ matrix.suite }}-${{ matrix.os }}