Skip to content

Commit ecdb6da

Browse files
committed
Merge branch 'master' into add-timescaledb-to-stack
2 parents d49e2de + 8c6080f commit ecdb6da

File tree

58 files changed

+981
-546
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+981
-546
lines changed

.github/actions/setup-rubygems.org/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ runs:
1414
shell: bash
1515
run: |
1616
docker compose up -d --wait
17-
- uses: ruby/setup-ruby@70da3bbf44ac06db1b0547ce2acc9380a5270d1e # v1.175.0
17+
- uses: ruby/setup-ruby@0cde4689ba33c09f1b890c1725572ad96751a3fc # v1.178.0
1818
with:
1919
ruby-version: ${{ inputs.ruby-version }}
2020
bundler-cache: true

.github/workflows/codeql.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ jobs:
4141

4242
steps:
4343
- name: Checkout repository
44-
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
44+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
4545

4646
# Initializes the CodeQL tools for scanning.
4747
- name: Initialize CodeQL
48-
uses: github/codeql-action/init@cdcdbb579706841c47f7063dda365e292e5cad7a # v2.13.4
48+
uses: github/codeql-action/init@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7
4949
with:
5050
languages: ${{ matrix.language }}
5151
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -58,7 +58,7 @@ jobs:
5858
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5959
# If this step fails, then you should remove it and run the build manually (see below)
6060
- name: Autobuild
61-
uses: github/codeql-action/autobuild@cdcdbb579706841c47f7063dda365e292e5cad7a # v2.13.4
61+
uses: github/codeql-action/autobuild@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7
6262

6363
# ℹ️ Command-line programs to run using the OS shell.
6464
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -71,6 +71,6 @@ jobs:
7171
# ./location_of_script_within_repo/buildscript.sh
7272

7373
- name: Perform CodeQL Analysis
74-
uses: github/codeql-action/analyze@cdcdbb579706841c47f7063dda365e292e5cad7a # v2.13.4
74+
uses: github/codeql-action/analyze@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7
7575
with:
7676
category: "/language:${{matrix.language}}"

.github/workflows/docker.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
name: Docker build (and optional push)
1515
runs-on: ubuntu-22.04
1616
env:
17-
RUBYGEMS_VERSION: 3.5.10
18-
RUBY_VERSION: 3.3.1
17+
RUBYGEMS_VERSION: 3.5.11
18+
RUBY_VERSION: 3.3.2
1919
steps:
20-
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
20+
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
2121
- name: Set up Docker Buildx
2222
id: buildx
2323
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # master

.github/workflows/lint.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ jobs:
1212
name: Rubocop
1313
runs-on: ubuntu-22.04
1414
steps:
15-
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
16-
- uses: ruby/setup-ruby@cacc9f1c0b3f4eb8a16a6bb0ed10897b43b9de49 # v1.176.0
15+
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
16+
- uses: ruby/setup-ruby@0cde4689ba33c09f1b890c1725572ad96751a3fc # v1.178.0
1717
with:
1818
bundler-cache: true
1919
- name: Rubocop
@@ -22,8 +22,8 @@ jobs:
2222
name: Brakeman
2323
runs-on: ubuntu-22.04
2424
steps:
25-
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
26-
- uses: ruby/setup-ruby@cacc9f1c0b3f4eb8a16a6bb0ed10897b43b9de49 # v1.176.0
25+
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
26+
- uses: ruby/setup-ruby@0cde4689ba33c09f1b890c1725572ad96751a3fc # v1.178.0
2727
with:
2828
bundler-cache: true
2929
- name: Brakeman
@@ -32,8 +32,8 @@ jobs:
3232
name: Importmap Verify
3333
runs-on: ubuntu-22.04
3434
steps:
35-
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
36-
- uses: ruby/setup-ruby@cacc9f1c0b3f4eb8a16a6bb0ed10897b43b9de49 # v1.176.0
35+
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
36+
- uses: ruby/setup-ruby@0cde4689ba33c09f1b890c1725572ad96751a3fc # v1.178.0
3737
with:
3838
bundler-cache: true
3939
- name: Importmap Verify
@@ -50,8 +50,8 @@ jobs:
5050
steps:
5151
- name: login to Github Packages
5252
run: echo "${{ github.token }}" | docker login https://ghcr.io -u ${GITHUB_ACTOR} --password-stdin
53-
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
54-
- uses: ruby/setup-ruby@cacc9f1c0b3f4eb8a16a6bb0ed10897b43b9de49 # v1.176.0
53+
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
54+
- uses: ruby/setup-ruby@0cde4689ba33c09f1b890c1725572ad96751a3fc # v1.178.0
5555
with:
5656
bundler-cache: true
5757
- name: krane render

.github/workflows/scorecards.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232

3333
steps:
3434
- name: "Checkout code"
35-
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v3.1.0
35+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v3.1.0
3636
with:
3737
persist-credentials: false
3838

@@ -67,6 +67,6 @@ jobs:
6767

6868
# Upload the results to GitHub's code scanning dashboard.
6969
- name: "Upload to code-scanning"
70-
uses: github/codeql-action/upload-sarif@cdcdbb579706841c47f7063dda365e292e5cad7a # v2.13.4
70+
uses: github/codeql-action/upload-sarif@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7
7171
with:
7272
sarif_file: results.sarif

.github/workflows/test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ jobs:
2626
matrix:
2727
rubygems:
2828
- name: locked
29-
version: "3.5.10"
29+
version: "3.5.11"
3030
- name: latest
3131
version: latest
32-
ruby_version: ["3.3.1"]
32+
ruby_version: ["3.3.2"]
3333
tests:
3434
- name: general
3535
command: test
@@ -42,7 +42,7 @@ jobs:
4242
# Fail hard when Toxiproxy is not running to ensure all tests (even Toxiproxy optional ones) are passing
4343
REQUIRE_TOXIPROXY: true
4444
steps:
45-
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
45+
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
4646

4747
- name: Setup rubygems.org
4848
uses: ./.github/actions/setup-rubygems.org
@@ -64,6 +64,6 @@ jobs:
6464

6565
- name: Upload coverage to Codecov
6666
if: matrix.rubygems.name == 'locked' && (success() || failure())
67-
uses: codecov/codecov-action@5ecb98a3c6b747ed38dc09f787459979aebb39be # v4.3.1
67+
uses: codecov/codecov-action@125fc84a9a348dbcf27191600683ec096ec9021c # v4.4.1
6868
env:
6969
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.3.1
1+
3.3.2

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# syntax = docker/dockerfile:1.4
22

33
# Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile
4-
ARG RUBY_VERSION=3.3.1
5-
ARG ALPINE_VERSION=3.18
4+
ARG RUBY_VERSION=3.3.2
5+
ARG ALPINE_VERSION=3.20
66
FROM ruby:$RUBY_VERSION-alpine${ALPINE_VERSION} as base
77

88
# Install packages

Gemfile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ ruby file: ".ruby-version"
55
gem "rails", "~> 7.1.0", ">= 7.1.3.2"
66
gem "rails-i18n", "~> 7.0"
77

8-
gem "aws-sdk-s3", "~> 1.149"
9-
gem "aws-sdk-sqs", "~> 1.73"
8+
gem "aws-sdk-s3", "~> 1.151"
9+
gem "aws-sdk-sqs", "~> 1.74"
1010
gem "bootsnap", "~> 1.18"
1111
gem "clearance", "~> 2.7"
1212
gem "dalli", "~> 3.2"
1313
gem "ddtrace", "~> 1.23", require: "ddtrace/auto_instrument"
1414
gem "dogstatsd-ruby", "~> 5.5"
15-
gem "google-protobuf", "~> 4.26"
15+
gem "google-protobuf", "~> 4.27"
1616
gem "faraday", "~> 2.9"
1717
gem "faraday-retry", "~> 2.2"
18-
gem "good_job", "~> 3.28"
18+
gem "good_job", "~> 3.29"
1919
gem "gravtastic", "~> 3.2"
2020
gem "high_voltage", "~> 3.1"
2121
gem "honeybadger", "~> 5.5.1" # see https://github.com/rubygems/rubygems.org/pull/4598
@@ -34,7 +34,7 @@ gem "rack", "~> 3.0"
3434
gem "rackup", "~> 2.1"
3535
gem "rack-utf8_sanitizer", "~> 1.8"
3636
gem "rbtrace", "~> 0.5.1"
37-
gem "rdoc", "~> 6.6"
37+
gem "rdoc", "~> 6.7"
3838
gem "roadie-rails", "~> 3.2"
3939
gem "ruby-magic", "~> 0.6"
4040
gem "shoryuken", "~> 6.2", require: false
@@ -57,7 +57,7 @@ gem "strong_migrations", "~> 1.8"
5757
gem "phlex-rails", "~> 1.2"
5858
gem "discard", "~> 1.3"
5959
gem "user_agent_parser", "~> 2.17"
60-
gem "pghero", "~> 3.4"
60+
gem "pghero", "~> 3.5"
6161

6262
# Admin dashboard
6363
gem "avo", "~> 2.51"
@@ -116,21 +116,21 @@ group :development do
116116
gem "rails-erd", "~> 1.7"
117117
gem "listen", "~> 3.9"
118118
gem "letter_opener", "~> 1.10"
119-
gem "letter_opener_web", "~> 2.0"
119+
gem "letter_opener_web", "~> 3.0"
120120
gem "derailed_benchmarks", "~> 2.1"
121121
gem "memory_profiler", "~> 1.0"
122122
end
123123

124124
group :test do
125-
gem "minitest", "~> 5.22", require: false
125+
gem "minitest", "~> 5.23", require: false
126126
gem "capybara", "~> 3.40"
127127
gem "launchy", "~> 3.0"
128128
gem "rack-test", "~> 2.1", require: "rack/test"
129129
gem "rails-controller-testing", "~> 1.0"
130-
gem "mocha", "~> 2.2", require: false
130+
gem "mocha", "~> 2.3", require: false
131131
gem "shoulda-context", "~> 3.0.0.rc1"
132132
gem "shoulda-matchers", "~> 6.2"
133-
gem "selenium-webdriver", "~> 4.20"
133+
gem "selenium-webdriver", "~> 4.21"
134134
gem "webmock", "~> 3.23"
135135
gem "simplecov", "~> 0.22", require: false
136136
gem "simplecov-cobertura", "~> 2.1", require: false

0 commit comments

Comments
 (0)