Skip to content
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v6

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deployment-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
ports:
- 6379:6379
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
name: Set up Ruby
- uses: ruby/setup-ruby@v1
with:
Expand All @@ -49,7 +49,7 @@ jobs:
cp config/ingestion.example.yml config/ingestion.yml
bundle exec rake db:setup
- name: Set up Node
uses: actions/setup-node@v4
uses: actions/setup-node@v6
with:
node-version: '20.x'
cache: 'yarn'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-prod-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Setup
run: |
cp env.sample .env
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Setup
run: |
cp env.sample .env
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/migration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
sudo apt-get update
sudo apt-get install imagemagick
- name: Check out code
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Install Ruby & gems
uses: ruby/setup-ruby@v1
with:
Expand All @@ -76,7 +76,7 @@ jobs:
rm -rf db/migrate
mv db/migrate.bkp db/migrate
- name: Set up Node
uses: actions/setup-node@v4
uses: actions/setup-node@v6
with:
node-version: '20.x'
cache: 'yarn'
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,21 @@ jobs:
sudo apt-get update
sudo apt-get install imagemagick
- name: Check out code
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Install Ruby & gems
uses: ruby/setup-ruby@v1
with:
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
- name: Audit gems
run: bundle exec bundle-audit check --update
- name: Configure and initialize database
run: |
cp test/config/test_tess.yml config/tess.yml
cp config/secrets.github.yml config/secrets.yml
cp config/ingestion.example.yml config/ingestion.yml
bundle exec rake db:test:prepare
- name: Set up Node
uses: actions/setup-node@v4
uses: actions/setup-node@v6
with:
node-version: '20.x'
cache: 'yarn'
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-3.3.10
ruby-3.4.9
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG RUBY_VERSION=3.3.10
ARG RUBY_VERSION=3.4.9

#use ruby base image
FROM ruby:$RUBY_VERSION-slim AS base
Expand Down
11 changes: 5 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# frozen_string_literal: true

source 'https://rubygems.org'
source 'https://rubygems.org', cooldown: 14

gem 'rails', '7.2.3'
gem 'rails', '8.1.3'

gem 'active_model_serializers'
gem 'activerecord-session_store'
Expand Down Expand Up @@ -37,7 +37,6 @@ gem 'maxmind-db'
gem 'money-rails'
gem 'oai'
gem 'omniauth_openid_connect'
gem 'omniauth-rails_csrf_protection'
gem 'pg'
gem 'private_address_check'
gem 'public_activity'
Expand All @@ -51,6 +50,7 @@ gem 'redis'
gem 'rest-client'
gem 'reverse_markdown'
gem 'rss'
gem 'ruby-openai'
gem 'sassc-rails'
gem 'sass-rails'
gem 'sentry-rails'
Expand All @@ -60,7 +60,7 @@ gem 'sidekiq'
gem 'sidekiq-status'
gem 'simple_calendar', '~> 2.4'
gem 'simple_form'
gem 'simple_token_authentication'
gem 'simple_token_authentication', git: 'https://github.com/gonzalo-bulnes/simple_token_authentication.git', ref: 'f1cba4e' # Rails 8 support not yet released on Rubygems
gem 'sitemap_generator'
gem 'sitemap-parser'
gem 'slim'
Expand All @@ -75,6 +75,7 @@ gem 'whenever', require: false # Work around https://github.com/javan/whenever/i
gem 'will_paginate'

group :development, :test do
gem 'bundle-audit'
gem 'byebug'
gem 'pry-byebug'
gem 'rubocop'
Expand All @@ -100,5 +101,3 @@ group :test do
gem 'vcr'
gem 'webmock'
end

gem 'ruby-openai'
Loading