From f263f7e886286af4c6edcb21f2fb4b2d45846a07 Mon Sep 17 00:00:00 2001 From: Jamie McCarthy Date: Mon, 12 Feb 2024 06:56:37 -0600 Subject: [PATCH 1/6] Run ci/rubyonrails with bundle exec --- ci/rubyonrails.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/rubyonrails.yml b/ci/rubyonrails.yml index 20ff014..dba16cb 100644 --- a/ci/rubyonrails.yml +++ b/ci/rubyonrails.yml @@ -51,8 +51,8 @@ jobs: bundler-cache: true # Add or replace any other lints here - name: Security audit dependencies - run: bin/bundler-audit --update + run: bundle exec bundler-audit --update - name: Security audit application code - run: bin/brakeman -q -w2 + run: bundle exec brakeman -q -w2 - name: Lint Ruby files - run: bin/rubocop --parallel + run: bundle exec rubocop --parallel From e4840c47d074b5cdaff1d1d3684b2fed38c548d7 Mon Sep 17 00:00:00 2001 From: Jamie McCarthy Date: Mon, 12 Feb 2024 06:57:16 -0600 Subject: [PATCH 2/6] Spell bundle-audit without the r Usage as described in https://github.com/rubysec/bundler-audit#readme --- ci/rubyonrails.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/rubyonrails.yml b/ci/rubyonrails.yml index dba16cb..c9835fb 100644 --- a/ci/rubyonrails.yml +++ b/ci/rubyonrails.yml @@ -51,7 +51,7 @@ jobs: bundler-cache: true # Add or replace any other lints here - name: Security audit dependencies - run: bundle exec bundler-audit --update + run: bundle exec bundle-audit --update - name: Security audit application code run: bundle exec brakeman -q -w2 - name: Lint Ruby files From 4b8ca42dd9f838356c049899bc877fcda8bf6539 Mon Sep 17 00:00:00 2001 From: Jamie McCarthy Date: Mon, 12 Feb 2024 06:59:39 -0600 Subject: [PATCH 3/6] Prefer ruby/setup-ruby@v1 As recommended in https://github.com/ruby/setup-ruby#setup-ruby --- ci/rubyonrails.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/rubyonrails.yml b/ci/rubyonrails.yml index c9835fb..d62b552 100644 --- a/ci/rubyonrails.yml +++ b/ci/rubyonrails.yml @@ -30,7 +30,7 @@ jobs: uses: actions/checkout@v3 # Add or replace dependency steps here - name: Install Ruby and gems - uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0 + uses: ruby/setup-ruby@v1 with: bundler-cache: true # Add or replace database setup steps here @@ -46,7 +46,7 @@ jobs: - name: Checkout code uses: actions/checkout@v3 - name: Install Ruby and gems - uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0 + uses: ruby/setup-ruby@v1 with: bundler-cache: true # Add or replace any other lints here From e656ded9f0017958db40fbd074f083d5b9c29c62 Mon Sep 17 00:00:00 2001 From: Jamie McCarthy Date: Fri, 26 Apr 2024 07:16:34 -0400 Subject: [PATCH 4/6] Reference ruby/setup-ruby with latest commit hash As required in pull_request_template.md --- ci/rubyonrails.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/rubyonrails.yml b/ci/rubyonrails.yml index 17e08b4..b976f3f 100644 --- a/ci/rubyonrails.yml +++ b/ci/rubyonrails.yml @@ -30,7 +30,7 @@ jobs: uses: actions/checkout@v4 # Add or replace dependency steps here - name: Install Ruby and gems - uses: ruby/setup-ruby@v1 + uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # v1.175.1 with: bundler-cache: true # Add or replace database setup steps here @@ -46,7 +46,7 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - name: Install Ruby and gems - uses: ruby/setup-ruby@v1 + uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # v1.175.1 with: bundler-cache: true # Add or replace any other lints here From 5a11e5968cb905fe46c844bb8147628cfe226f40 Mon Sep 17 00:00:00 2001 From: Jamie McCarthy Date: Sat, 8 Jun 2024 11:47:24 -0400 Subject: [PATCH 5/6] Reference latest ruby/setup-ruby (1.179.1) with commit hash Can build ruby 3.1.6 and 3.3.2 --- ci/rubyonrails.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/rubyonrails.yml b/ci/rubyonrails.yml index b976f3f..f3177e2 100644 --- a/ci/rubyonrails.yml +++ b/ci/rubyonrails.yml @@ -30,7 +30,7 @@ jobs: uses: actions/checkout@v4 # Add or replace dependency steps here - name: Install Ruby and gems - uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # v1.175.1 + uses: ruby/setup-ruby@78c01b705fd9d5ad960d432d3a0cfa341d50e410 # v1.179.1 with: bundler-cache: true # Add or replace database setup steps here @@ -46,7 +46,7 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - name: Install Ruby and gems - uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # v1.175.1 + uses: ruby/setup-ruby@78c01b705fd9d5ad960d432d3a0cfa341d50e410 # v1.179.1 with: bundler-cache: true # Add or replace any other lints here From 0321f5f585a59bc25d0a7885165edf7f63b2d2f2 Mon Sep 17 00:00:00 2001 From: Jamie McCarthy Date: Sat, 8 Jun 2024 12:19:48 -0400 Subject: [PATCH 6/6] Run lint with binstubs --- ci/rubyonrails.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ci/rubyonrails.yml b/ci/rubyonrails.yml index f3177e2..ad3ac88 100644 --- a/ci/rubyonrails.yml +++ b/ci/rubyonrails.yml @@ -49,10 +49,12 @@ jobs: uses: ruby/setup-ruby@78c01b705fd9d5ad960d432d3a0cfa341d50e410 # v1.179.1 with: bundler-cache: true + - name: Generate binstubs + run: bundle binstubs bundler-audit brakeman rubocop # Add or replace any other lints here - name: Security audit dependencies - run: bundle exec bundle-audit --update + run: bin/bundler-audit --update - name: Security audit application code - run: bundle exec brakeman -q -w2 + run: bin/brakeman -q -w2 - name: Lint Ruby files - run: bundle exec rubocop --parallel + run: bin/rubocop --parallel