From 25977274984b3f87d464bc1591b393b9a32da6f0 Mon Sep 17 00:00:00 2001
From: Daniel Mendler <mail@daniel-mendler.de>
Date: Sat, 20 Jan 2024 17:41:59 +0100
Subject: [PATCH] Update ci

---
 .github/workflows/test.yml | 44 ++++++++++++++++++++++----------------
 Gemfile                    |  2 +-
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5f8b5b72..b74c3f03 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -21,28 +21,34 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      - run: bundle update && bundle exec rake test
-      - run: bundle update && bundle exec rake test:sinatra
-        name: "rake test:rails SINATRA=2.2.4"
+      - run: bundle install && bundle exec rake test
+      - run: bundle install && bundle exec rake test:sinatra
+        name: "rake test:sinatra SINATRA=2.2.4"
         env:
           SINATRA: 2.2.4
-      - run: bundle update && bundle exec rake test:sinatra
-        name: "rake test:rails SINATRA=3.0.6"
+      - run: bundle install && bundle exec rake test:sinatra
+        name: "rake test:sinatra SINATRA=3.0.6"
+        if: ${{ matrix.ruby != '2.5' }}
         env:
           SINATRA: 3.0.6
-      - run: bundle update && bundle exec rake test:sinatra
-        name: "rake test:rails SINATRA=3.1.0"
+      - run: bundle install && bundle exec rake test:sinatra
+        name: "rake test:sinatra SINATRA=3.1.0"
         if: ${{ matrix.ruby != '2.5' }}
         env:
           SINATRA: 3.1.0
-      - run: bundle update && bundle exec rake test:sinatra
-        name: "rake test:rails SINATRA=3.2.0"
+      - run: bundle install && bundle exec rake test:sinatra
+        name: "rake test:sinatra SINATRA=3.2.0"
         if: ${{ matrix.ruby != '2.5' }}
         env:
           SINATRA: 3.2.0
-      - run: bundle update && bundle exec rake test:sinatra
-        name: "rake test:rails SINATRA=main"
+      - run: bundle install && bundle exec rake test:sinatra
+        name: "rake test:sinatra SINATRA=4.0.0"
         if: ${{ matrix.ruby != '2.5' }}
+        env:
+          SINATRA: 4.0.0
+      - run: bundle install && bundle exec rake test:sinatra
+        name: "rake test:sinatra SINATRA=main"
+        if: ${{ matrix.ruby != '2.5' && matrix.ruby != '2.6' }}
         env:
           SINATRA: main
   rails-5:
@@ -55,7 +61,7 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: 2.7
-      - run: bundle update && bundle exec rake test:rails
+      - run: bundle install && bundle exec rake test:rails
         name: "rake test:rails RAILS=5.2.8"
         env:
           RAILS: 5.2.8
@@ -69,11 +75,11 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: 2.7
-      - run: bundle update && bundle exec rake test:rails
+      - run: bundle install && bundle exec rake test:rails
         name: "rake test:rails RAILS=6.0.6"
         env:
           RAILS: 6.0.6
-      - run: bundle update && bundle exec rake test:rails
+      - run: bundle install && bundle exec rake test:rails
         name: "rake test:rails RAILS=6.1.7"
         env:
           RAILS: 6.1.7
@@ -87,15 +93,15 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: 3.0
-      - run: bundle update && bundle exec rake test:rails
-        name: "rake test:rails RAILS=7.0.7"
+      - run: bundle install && bundle exec rake test:rails
+        name: "rake test:rails RAILS=7.0.8"
         env:
           RAILS: 7.0.8
-      - run: bundle update && bundle exec rake test:rails
-        name: "rake test:rails RAILS=7.1.0"
+      - run: bundle install && bundle exec rake test:rails
+        name: "rake test:rails RAILS=7.1.2"
         env:
           RAILS: 7.1.2
-      - run: bundle update && bundle exec rake test:rails
+      - run: bundle install && bundle exec rake test:rails
         name: "rake test:rails RAILS=main"
         env:
           RAILS: main
diff --git a/Gemfile b/Gemfile
index 93300652..f88590a2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -38,6 +38,6 @@ if ENV['SINATRA']
   if ENV['SINATRA'] == 'main'
     gem 'sinatra', github: 'sinatra/sinatra'
   else
-    gem 'sinatra', tag: "v#{ENV['SINATRA']}"
+    gem 'sinatra', "= #{ENV['SINATRA']}"
   end
 end