From cc892226a8ccf7351da94fd33ae344919b6320c5 Mon Sep 17 00:00:00 2001 From: Jan Kessler Date: Fri, 13 Dec 2024 10:27:59 +0100 Subject: [PATCH] resolve magick-related Rspec failures on Github CI --- .github/workflows/ci.yml | 7 +------ Gemfile | 2 +- Gemfile.lock | 13 +++++++------ 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3bf8b526e0..a31d480428 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ on: jobs: test: name: Rubocop + RSpec + ESLint + License Header Check - runs-on: ubuntu-24.04 + runs-on: ruby:$RUBY_VERSION services: postgres: @@ -32,11 +32,6 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - name: Install Ruby ${{ env.RUBY_VERSION }} - uses: ruby/setup-ruby@v1 - with: - ruby-version: ${{ env.RUBY_VERSION }} - - name: Bundle cache uses: actions/cache@v2 with: diff --git a/Gemfile b/Gemfile index eee4ac6087..20d3630aa2 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } ruby '>= 3.3' gem 'active_model_serializers', '>= 0.10.14' -gem 'active_storage_validations', '>= 1.1.0' +gem 'active_storage_validations', '>= 1.3.4' gem 'aws-sdk-s3', require: false gem 'bcrypt', '~> 3.1.7' gem 'bigbluebutton-api-ruby', '1.9.1' diff --git a/Gemfile.lock b/Gemfile.lock index b00bf8d00a..dda8ee9378 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -50,11 +50,12 @@ GEM activemodel (>= 4.1) case_transform (>= 0.2) jsonapi-renderer (>= 0.1.1.beta1, < 0.3) - active_storage_validations (1.1.0) - activejob (>= 5.2.0) - activemodel (>= 5.2.0) - activestorage (>= 5.2.0) - activesupport (>= 5.2.0) + active_storage_validations (1.3.5) + activejob (>= 6.1.4) + activemodel (>= 6.1.4) + activestorage (>= 6.1.4) + activesupport (>= 6.1.4) + marcel (>= 1.0.3) activejob (7.2.2.1) activesupport (= 7.2.2.1) globalid (>= 0.3.6) @@ -505,7 +506,7 @@ PLATFORMS DEPENDENCIES active_model_serializers (>= 0.10.14) - active_storage_validations (>= 1.1.0) + active_storage_validations (>= 1.3.4) aws-sdk-s3 bcrypt (~> 3.1.7) bigbluebutton-api-ruby (= 1.9.1)