Merge branch 'release/5.11.0'

geobtaa · Oct 25, 2024 · c3c24b2 · c3c24b2
2 parents 211c100 + c14abbf
commit c3c24b2
Show file tree

Hide file tree

Showing 28 changed files with 353 additions and 144 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -91,8 +91,10 @@ jobs:
         bundle exec rake geoportal:ci --trace
 
     - name: Artifacts - Upload coverage
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       if: always()
       with:
         name: coverage
-        path: coverage/
+        path: |
+          coverage/
+          tmp/screenshots/
diff --git a/.gitignore b/.gitignore
@@ -19,6 +19,7 @@
 /tmp
 jettywrapper.log
 *.log
+coverage
 
 # Sitemap is generated periodically
 public/sitemap.xml*

diff --git a/Gemfile b/Gemfile
@@ -147,6 +147,7 @@ group :test do
   gem 'minitest'
   gem 'minitest-ci', '~> 3.4.0'
   gem 'minitest-reporters'
+  gem 'simplecov', require: false
 end
 
 gem 'net-ftp'