Merge pull request #406 from OpenHistoricalMap/update-actions

Update workflows: bump rails version in ohm-tests, try new display config

Author: erictheise

.github/workflows/ohm-tests.yml

@@ -13,7 +13,7 @@ jobs:
     name: Ruby ${{ matrix.ruby }}
     strategy:
       matrix:
-        ruby: ['3.2']
+        ruby: ['3.4']
       fail-fast: false
     runs-on: ubuntu-latest
     env:
@@ -22,21 +22,21 @@ jobs:
     timeout-minutes: 20
     steps:
     - name: Checkout source
-      uses: actions/checkout@v6
+      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
     - name: Setup ruby
-      uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@6aaa311d81eba98ae12eaffbcb63296ace0efcde # v1.307.0
       with:
         ruby-version: ${{ matrix.ruby }}
         rubygems: 3.4.10
         bundler-cache: true
     - name: Cache node modules
-      uses: actions/setup-node@v6
+      uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
       with:
         cache: yarn
     - name: Install packages
       run: |
         sudo apt-get -yqq update
-        sudo apt-get -yqq install memcached libvips-dev
+        sudo apt-get -yqq install memcached libvips-dev xvfb mesa-utils libgl1-mesa-dri postgresql-postgis
     - name: Install node modules
       run: bundle exec bin/yarn install
     - name: Create database
@@ -63,20 +63,26 @@ jobs:
       timeout-minutes: 10
     - name: Create tmp/pids directory
       run: mkdir -p tmp/pids
-    - name: Run ruby on rails tests
+    - name: Enable virtual display
+      run: Xvfb :99 -screen 0 1024x768x24 &
+    - name: Run tests
       run: bundle exec rails test:all
+      env:
+        DISPLAY: ":99"
       continue-on-error: true
     - name: Run javascript tests
       run: bundle exec teaspoon
+      env:
+        DISPLAY: ":99"
     - name: Upload screenshots
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
       if: failure()
       with:
-        name: screenshots-${{ github.run_attempt }}
+        name: screenshots
         path: tmp/screenshots
         if-no-files-found: ignore
     - name: Report completion to Coveralls
-      uses: coverallsapp/github-action@v2
+      uses: coverallsapp/github-action@5cbfd81b66ca5d10c19b062c04de0199c215fb6e # v2.3.7
       with:
         github-token: ${{ secrets.github_token }}
         flag-name: ruby-${{ matrix.ruby }}
@@ -89,7 +95,7 @@ jobs:
     timeout-minutes: 1
     steps:
     - name: Report completion to Coveralls
-      uses: coverallsapp/github-action@v2
+      uses: coverallsapp/github-action@5cbfd81b66ca5d10c19b062c04de0199c215fb6e # v2.3.7
       with:
         github-token: ${{ secrets.github_token }}
         parallel-finished: true

.github/workflows/tests.yml

@@ -11,7 +11,7 @@ jobs:
     name: Ruby ${{ matrix.ruby }}
     strategy:
       matrix:
-        ruby: ['3.2', '3.3', '3.4']
+        ruby: ['3.3', '3.4', '4.0']
       fail-fast: false
     runs-on: ubuntu-latest
     env:
@@ -20,21 +20,21 @@ jobs:
     timeout-minutes: 20
     steps:
     - name: Checkout source
-      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
     - name: Setup ruby
-      uses: ruby/setup-ruby@8aeb6ff8030dd539317f8e1769a044873b56ea71 # v1.268.0
+      uses: ruby/setup-ruby@6aaa311d81eba98ae12eaffbcb63296ace0efcde # v1.307.0
       with:
         ruby-version: ${{ matrix.ruby }}
         rubygems: 3.4.10
         bundler-cache: true
     - name: Cache node modules
-      uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+      uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
       with:
         cache: yarn
     - name: Install packages
       run: |
         sudo apt-get -yqq update
-        sudo apt-get -yqq install memcached libvips-dev
+        sudo apt-get -yqq install memcached libvips-dev xvfb mesa-utils libgl1-mesa-dri postgresql-postgis
     - name: Create database
       run: |
         sudo systemctl start postgresql
@@ -61,12 +61,19 @@ jobs:
       timeout-minutes: 10
     - name: Create tmp/pids directory
       run: mkdir -p tmp/pids
+    - name: Enable virtual display
+      run: Xvfb :99 -screen 0 1024x768x24 &
     - name: Run tests
       run: bundle exec rails test:all
+      env:
+        DISPLAY: ":99"
+      continue-on-error: true
     - name: Run javascript tests
       run: bundle exec teaspoon
+      env:
+        DISPLAY: ":99"
     - name: Upload screenshots
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+      uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
       if: failure()
       with:
         name: screenshots