nominiatim: reinclude commented out code

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

diff --git a/.github/workflows/test-kitchen.yml b/.github/workflows/test-kitchen.yml
index edfe0b8321479d98e3b4dfe86d4562734ea1c7b2..55c525f64d21e7ddbea90e252a780eb1b46add00 100644 (file)
--- a/.github/workflows/test-kitchen.yml
+++ b/.github/workflows/test-kitchen.yml
@@ -1,7 +1,13 @@
 name: Test Kitchen
 name: Test Kitchen

+

 on:
   - push
   - pull_request
 on:
   - push
   - pull_request

+
+concurrency:
+  group: ${{ github.workflow }}-{{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+

 jobs:
   kitchen:
     name: Test Kitchen
 jobs:
   kitchen:
     name: Test Kitchen


@@ -25,6 +31,8 @@ jobs:
           - devices
           - dhcpd
           - dmca
           - devices
           - dhcpd
           - dmca

+          - dns
+          - docker

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


@@ -40,10 +48,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 +63,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


@@ -66,12 +80,13 @@ jobs:
           - planet-notes
           - planet-replication
           - postgresql
           - planet-notes
           - planet-replication
           - postgresql

+          - prometheus
+          - prometheus-server

           - python
           - rsyncd
           - serverinfo
           - snmpd
           - spamassassin
           - python
           - rsyncd
           - serverinfo
           - snmpd
           - spamassassin

-          - squid

           - ssl
           - stateofthemap
           - subversion
           - ssl
           - stateofthemap
           - subversion


@@ -81,36 +96,23 @@ jobs:
           - sysfs
           - taginfo
           - tile
           - sysfs
           - taginfo
           - tile

-          - tilecache
+          - tilelog

           - tools
           - trac
           - tools
           - trac

-          - web-backend

           - web-cgimap
           - web-frontend
           - web-rails
           - wordpress
           - web-cgimap
           - web-frontend
           - web-rails
           - wordpress

+          - wiki

         os:
         os:

-          - ubuntu-1804
+          - ubuntu-2004

       fail-fast: false
     steps:
     - name: Check out code
       fail-fast: false
     steps:
     - name: Check out code

-      uses: actions/checkout@v2
+      uses: actions/checkout@v3

     - name: Setup ruby
     - name: Setup ruby

-      uses: actions/setup-ruby@v1
-    - name: Cache gems
-      uses: actions/cache@v1
+      uses: ruby/setup-ruby@v1

       with:
       with:

-        path: vendor/bundle
-        key: bundle-${{ runner.OS }}-${{ hashFiles('Gemfile.lock') }}
-        restore-keys: |
-          bundle-${{ runner.OS }}-
-    - name: Disable apparmor for mysqld
-      run: |
-        sudo apt-get install apparmor-utils
-        sudo aa-disable /usr/sbin/mysqld
-    - name: Install gems
-      run: |
-        gem install bundler --version "~> 1.17"
-        bundle install --jobs 4 --retry 3 --deployment
+        bundler-cache: true

     - 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 }}