Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update CI #606

Merged
merged 7 commits into from
Feb 1, 2024
Merged

Update CI #606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
29fbaf9
Update Ruby & Rails versions
tricknotes Feb 1, 2024
e0594d5
Update NodeJS version to 20
tricknotes Feb 1, 2024
d01063d
Update GitHub Actions
tricknotes Feb 1, 2024
f30aecd
Add missing config for public_file_server for Rails 7.1
tricknotes Feb 1, 2024
06a335f
Remove older Rails config
tricknotes Feb 1, 2024
7256adf
Use lower case for response header
tricknotes Feb 1, 2024
8c058ef
Switch default branch to "main" for CI
tricknotes Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 9 additions & 13 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: "CI Tests"

on:
push:
branches: "master"
branches: "main"
pull_request:
branches: "*"

Expand All @@ -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"
Expand All @@ -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') }}
Expand Down
11 changes: 4 additions & 7 deletions spec/dummy/application.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Style/TrailingCommaInHashLiteral: Put a comma after the last item of a multiline hash.

}

config.secret_token = "SECRET_TOKEN_IS_MIN_30_CHARS_LONG"
config.secret_key_base = "SECRET_KEY_BASE"
Expand Down