Skip to content

Commit

Permalink
Merge branch 'master' into add-timescaledb-to-stack
Browse files Browse the repository at this point in the history
  • Loading branch information
simi committed Jun 1, 2024
2 parents d49e2de + 8c6080f commit e4289ae
Show file tree
Hide file tree
Showing 59 changed files with 982 additions and 547 deletions.
2 changes: 1 addition & 1 deletion .github/actions/setup-rubygems.org/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ runs:
shell: bash
run: |
docker compose up -d --wait
- uses: ruby/setup-ruby@70da3bbf44ac06db1b0547ce2acc9380a5270d1e # v1.175.0
- uses: ruby/setup-ruby@0cde4689ba33c09f1b890c1725572ad96751a3fc # v1.178.0
with:
ruby-version: ${{ inputs.ruby-version }}
bundler-cache: true
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ jobs:

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

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

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

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@cdcdbb579706841c47f7063dda365e292e5cad7a # v2.13.4
uses: github/codeql-action/analyze@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7
with:
category: "/language:${{matrix.language}}"
6 changes: 3 additions & 3 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
name: Docker build (and optional push)
runs-on: ubuntu-22.04
env:
RUBYGEMS_VERSION: 3.5.10
RUBY_VERSION: 3.3.1
RUBYGEMS_VERSION: 3.5.11
RUBY_VERSION: 3.3.2
steps:
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # master
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ jobs:
name: Rubocop
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
- uses: ruby/setup-ruby@cacc9f1c0b3f4eb8a16a6bb0ed10897b43b9de49 # v1.176.0
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- uses: ruby/setup-ruby@0cde4689ba33c09f1b890c1725572ad96751a3fc # v1.178.0
with:
bundler-cache: true
- name: Rubocop
Expand All @@ -22,8 +22,8 @@ jobs:
name: Brakeman
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
- uses: ruby/setup-ruby@cacc9f1c0b3f4eb8a16a6bb0ed10897b43b9de49 # v1.176.0
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- uses: ruby/setup-ruby@0cde4689ba33c09f1b890c1725572ad96751a3fc # v1.178.0
with:
bundler-cache: true
- name: Brakeman
Expand All @@ -32,8 +32,8 @@ jobs:
name: Importmap Verify
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
- uses: ruby/setup-ruby@cacc9f1c0b3f4eb8a16a6bb0ed10897b43b9de49 # v1.176.0
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- uses: ruby/setup-ruby@0cde4689ba33c09f1b890c1725572ad96751a3fc # v1.178.0
with:
bundler-cache: true
- name: Importmap Verify
Expand All @@ -50,8 +50,8 @@ jobs:
steps:
- name: login to Github Packages
run: echo "${{ github.token }}" | docker login https://ghcr.io -u ${GITHUB_ACTOR} --password-stdin
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
- uses: ruby/setup-ruby@cacc9f1c0b3f4eb8a16a6bb0ed10897b43b9de49 # v1.176.0
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- uses: ruby/setup-ruby@0cde4689ba33c09f1b890c1725572ad96751a3fc # v1.178.0
with:
bundler-cache: true
- name: krane render
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:

steps:
- name: "Checkout code"
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v3.1.0
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v3.1.0
with:
persist-credentials: false

Expand Down Expand Up @@ -67,6 +67,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@cdcdbb579706841c47f7063dda365e292e5cad7a # v2.13.4
uses: github/codeql-action/upload-sarif@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7
with:
sarif_file: results.sarif
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ jobs:
matrix:
rubygems:
- name: locked
version: "3.5.10"
version: "3.5.11"
- name: latest
version: latest
ruby_version: ["3.3.1"]
ruby_version: ["3.3.2"]
tests:
- name: general
command: test
Expand All @@ -42,7 +42,7 @@ jobs:
# Fail hard when Toxiproxy is not running to ensure all tests (even Toxiproxy optional ones) are passing
REQUIRE_TOXIPROXY: true
steps:
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6

- name: Setup rubygems.org
uses: ./.github/actions/setup-rubygems.org
Expand All @@ -64,6 +64,6 @@ jobs:

- name: Upload coverage to Codecov
if: matrix.rubygems.name == 'locked' && (success() || failure())
uses: codecov/codecov-action@5ecb98a3c6b747ed38dc09f787459979aebb39be # v4.3.1
uses: codecov/codecov-action@125fc84a9a348dbcf27191600683ec096ec9021c # v4.4.1
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.1
3.3.2
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ cp config/database.yml.ts-sample config/database.yml
docker compose up -d db cache search # run required dependencies
docker compose up -d db-ts # run optional TimescaleDB dependency
bin/rails db:setup # setup all databases, including optional Timescale one
bin/rails s # start rails server as ususal
bin/rails s # start rails server as usual
```
Database Layout
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# syntax = docker/dockerfile:1.4

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

# Install packages
Expand Down
20 changes: 10 additions & 10 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ ruby file: ".ruby-version"
gem "rails", "~> 7.1.0", ">= 7.1.3.2"
gem "rails-i18n", "~> 7.0"

gem "aws-sdk-s3", "~> 1.149"
gem "aws-sdk-sqs", "~> 1.73"
gem "aws-sdk-s3", "~> 1.151"
gem "aws-sdk-sqs", "~> 1.74"
gem "bootsnap", "~> 1.18"
gem "clearance", "~> 2.7"
gem "dalli", "~> 3.2"
gem "ddtrace", "~> 1.23", require: "ddtrace/auto_instrument"
gem "dogstatsd-ruby", "~> 5.5"
gem "google-protobuf", "~> 4.26"
gem "google-protobuf", "~> 4.27"
gem "faraday", "~> 2.9"
gem "faraday-retry", "~> 2.2"
gem "good_job", "~> 3.28"
gem "good_job", "~> 3.29"
gem "gravtastic", "~> 3.2"
gem "high_voltage", "~> 3.1"
gem "honeybadger", "~> 5.5.1" # see https://github.com/rubygems/rubygems.org/pull/4598
Expand All @@ -34,7 +34,7 @@ gem "rack", "~> 3.0"
gem "rackup", "~> 2.1"
gem "rack-utf8_sanitizer", "~> 1.8"
gem "rbtrace", "~> 0.5.1"
gem "rdoc", "~> 6.6"
gem "rdoc", "~> 6.7"
gem "roadie-rails", "~> 3.2"
gem "ruby-magic", "~> 0.6"
gem "shoryuken", "~> 6.2", require: false
Expand All @@ -57,7 +57,7 @@ gem "strong_migrations", "~> 1.8"
gem "phlex-rails", "~> 1.2"
gem "discard", "~> 1.3"
gem "user_agent_parser", "~> 2.17"
gem "pghero", "~> 3.4"
gem "pghero", "~> 3.5"

# Admin dashboard
gem "avo", "~> 2.51"
Expand Down Expand Up @@ -116,21 +116,21 @@ group :development do
gem "rails-erd", "~> 1.7"
gem "listen", "~> 3.9"
gem "letter_opener", "~> 1.10"
gem "letter_opener_web", "~> 2.0"
gem "letter_opener_web", "~> 3.0"
gem "derailed_benchmarks", "~> 2.1"
gem "memory_profiler", "~> 1.0"
end

group :test do
gem "minitest", "~> 5.22", require: false
gem "minitest", "~> 5.23", require: false
gem "capybara", "~> 3.40"
gem "launchy", "~> 3.0"
gem "rack-test", "~> 2.1", require: "rack/test"
gem "rails-controller-testing", "~> 1.0"
gem "mocha", "~> 2.2", require: false
gem "mocha", "~> 2.3", require: false
gem "shoulda-context", "~> 3.0.0.rc1"
gem "shoulda-matchers", "~> 6.2"
gem "selenium-webdriver", "~> 4.20"
gem "selenium-webdriver", "~> 4.21"
gem "webmock", "~> 3.23"
gem "simplecov", "~> 0.22", require: false
gem "simplecov-cobertura", "~> 2.1", require: false
Expand Down
Loading

0 comments on commit e4289ae

Please sign in to comment.