Merge branch 'update-ci' into rack-3

tricknotes · Feb 1, 2024 · b223a06 · b223a06
2 parents 2f1a937 + 8c058ef
commit b223a06
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 19 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -13,27 +13,23 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["2.7", "3.0", "3.1"]
-        rails: ["6.0", "6.1", "7.0"]
+        ruby: ["3.0", "3.1", "3.2"]
+        rails: ["6.1", "7.0", "7.1"]
         include:
-          - ruby: "2.7"
-            rails: "5.2"
-          - ruby: "3.2"
-            rails: "7.0"
-          - ruby: "3.2"
+          - ruby: "3.3"
             rails: "main"
 
     env:
       RAILS_ENV: "test"
       RAILS_VERSION: "${{ matrix.rails }}"
 
     steps:
-    - uses: "actions/checkout@v1"
+    - uses: "actions/checkout@v4"
 
-    - name: "Install NodeJS 18.x"
-      uses: "actions/setup-node@v1"
+    - name: "Install NodeJS"
+      uses: "actions/setup-node@v4"
       with:
-        node-version: "18.x"
+        node-version: "20.x"
 
     - name: "Install Ruby ${{ matrix.ruby }}"
       uses: "ruby/setup-ruby@v1"
@@ -46,7 +42,7 @@ jobs:
         bundle lock
 
     - name: "Cache Ruby dependencies"
-      uses: "actions/cache@v1"
+      uses: "actions/cache@v4"
       with:
         path: "vendor/bundle"
         key: bundle-${{ hashFiles('Gemfile.lock') }}

diff --git a/spec/dummy/application.rb b/spec/dummy/application.rb
@@ -25,13 +25,10 @@ class Application < Rails::Application
     # Print deprecation notices to the stderr.
     config.active_support.deprecation = :stderr
 
-    if Rails.version >= "5"
-      config.public_file_server.headers = {
-        "Cache-Control" => CACHE_CONTROL_FIVE_MINUTES
-      }
-    else
-      config.static_cache_control = CACHE_CONTROL_FIVE_MINUTES
-    end
+    config.public_file_server.enabled = true
+    config.public_file_server.headers = {
+      "cache-control" => CACHE_CONTROL_FIVE_MINUTES
+    }
 
     config.secret_token = "SECRET_TOKEN_IS_MIN_30_CHARS_LONG"
     config.secret_key_base = "SECRET_KEY_BASE"