Use multiplication for secondary-actions margin and padding

[rails.git] / .github / workflows / tests.yml

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 1c82d20aeef4010e0b556713aa6079485d6e2ea6..3ee6129e113799a8818f455694e55266df9c6792 100644 (file)
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -3,33 +3,27 @@ on:
   - push
   - pull_request
 concurrency:
   - push
   - pull_request
 concurrency:

-  group: ${{ github.workflow }}-{{ github.head_ref || github.ref }}
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}

   cancel-in-progress: true
 jobs:
   test:
     name: Ubuntu ${{ matrix.ubuntu }}, Ruby ${{ matrix.ruby }}
     strategy:
       matrix:
   cancel-in-progress: true
 jobs:
   test:
     name: Ubuntu ${{ matrix.ubuntu }}, Ruby ${{ matrix.ruby }}
     strategy:
       matrix:

-        ubuntu: [20.04]
-        ruby: [2.7, 3.0]
+        ubuntu: [20.04, 22.04]
+        ruby: ['3.0', '3.1']

     runs-on: ubuntu-${{ matrix.ubuntu }}
     env:
       RAILS_ENV: test
       OPENSTREETMAP_MEMCACHE_SERVERS: 127.0.0.1
     steps:
     - name: Checkout source
     runs-on: ubuntu-${{ matrix.ubuntu }}
     env:
       RAILS_ENV: test
       OPENSTREETMAP_MEMCACHE_SERVERS: 127.0.0.1
     steps:
     - name: Checkout source

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

     - name: Setup ruby
     - name: Setup ruby

-      uses: actions/setup-ruby@v1.1.3
+      uses: ruby/setup-ruby@v1

       with:
         ruby-version: ${{ matrix.ruby }}
       with:
         ruby-version: ${{ matrix.ruby }}

-    - name: Cache gems
-      uses: actions/cache@v3
-      with:
-        path: vendor/bundle
-        key: bundle-ubuntu-${{ matrix.ubuntu }}-ruby-${{ matrix.ruby }}-${{ hashFiles('Gemfile.lock') }}
-        restore-keys: |
-          bundle-ubuntu-${{ matrix.ubuntu }}-ruby-${{ matrix.ruby }}-
+        bundler-cache: true

     - name: Cache node modules
       uses: actions/cache@v3
       with:
     - name: Cache node modules
       uses: actions/cache@v3
       with:


@@ -41,18 +35,11 @@ jobs:
       run: |
         sudo apt-get -yqq update
         sudo apt-get -yqq install memcached libvips-dev
       run: |
         sudo apt-get -yqq update
         sudo apt-get -yqq install memcached libvips-dev

-    - name: Install gems
-      run: |
-        gem install bundler
-        bundle config set deployment true
-        bundle install --jobs 4 --retry 3

     - name: Create database
       run: |
         sudo systemctl start postgresql
         sudo -u postgres createuser -s $(id -un)
         createdb openstreetmap
     - name: Create database
       run: |
         sudo systemctl start postgresql
         sudo -u postgres createuser -s $(id -un)
         createdb openstreetmap

-        psql -c "CREATE EXTENSION btree_gist" openstreetmap
-        psql -f db/functions/functions.sql openstreetmap

     - name: Configure rails
       run: |
         cp config/github.database.yml config/database.yml
     - name: Configure rails
       run: |
         cp config/github.database.yml config/database.yml


@@ -61,20 +48,23 @@ jobs:
     - name: Populate database
       run: |
         sed -f script/normalise-structure db/structure.sql > db/structure.expected
     - name: Populate database
       run: |
         sed -f script/normalise-structure db/structure.sql > db/structure.expected

-        bundle exec rake db:migrate
+        bundle exec rails db:migrate

         sed -f script/normalise-structure db/structure.sql > db/structure.actual
         diff -uw db/structure.expected db/structure.actual
     - name: Export javascript strings
         sed -f script/normalise-structure db/structure.sql > db/structure.actual
         diff -uw db/structure.expected db/structure.actual
     - name: Export javascript strings

-      run: bundle exec rake i18n:js:export
+      run: bundle exec rails i18n:js:export

     - name: Install node modules
     - name: Install node modules

-      run: bundle exec rake yarn:install
+      run: bundle exec bin/yarn install
+    - name: Compile assets
+      run: bundle exec rails assets:precompile

     - name: Run tests
       run: bundle exec rails test:all
     - name: Report completion to Coveralls
     - name: Run tests
       run: bundle exec rails test:all
     - name: Report completion to Coveralls

-      uses: coverallsapp/github-action@1.1.3
+      uses: coverallsapp/github-action@v2.2.3

       with:
         github-token: ${{ secrets.github_token }}
         flag-name: ubuntu-${{ matrix.ubuntu }}-ruby-${{ matrix.ruby }}
       with:
         github-token: ${{ secrets.github_token }}
         flag-name: ubuntu-${{ matrix.ubuntu }}-ruby-${{ matrix.ruby }}

+        format: lcov

         parallel: true
   finish:
     name: Finalise
         parallel: true
   finish:
     name: Finalise


@@ -82,7 +72,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Report completion to Coveralls
     runs-on: ubuntu-latest
     steps:
     - name: Report completion to Coveralls

-      uses: coverallsapp/github-action@1.1.3
+      uses: coverallsapp/github-action@v2.2.3

       with:
         github-token: ${{ secrets.github_token }}
         parallel-finished: true
       with:
         github-token: ${{ secrets.github_token }}
         parallel-finished: true