From beb0f60e863e8f460d6402d5f47ec37a3d850d04 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Thu, 18 Jul 2024 09:31:35 +0000 Subject: [PATCH 1/3] Update all Bundler dependencies (2024-07-18) --- Gemfile.lock | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 898cac0..33fb196 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -47,54 +47,56 @@ GEM tzinfo (~> 2.0) base64 (0.2.0) bigdecimal (3.1.8) - builder (3.2.4) + builder (3.3.0) byebug (11.1.3) - concurrent-ruby (1.3.1) + concurrent-ruby (1.3.3) connection_pool (2.4.1) crass (1.0.6) drb (2.2.1) - erubi (1.12.0) - ffi (1.15.5) + erubi (1.13.0) + ffi (1.17.0-aarch64-linux-musl) + ffi (1.17.0-arm64-darwin) + ffi (1.17.0-x86_64-linux-gnu) groupdate (5.2.4) activesupport (>= 5) i18n (1.14.5) concurrent-ruby (~> 1.0) io-console (0.7.2) ipaddr (1.2.6) - irb (1.13.1) + irb (1.14.0) rdoc (>= 4.0.0) reline (>= 0.4.2) - json (2.7.1) - listen (3.7.1) + json (2.7.2) + listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - minitest (5.23.1) + minitest (5.24.1) mutex_m (0.2.0) net-http (0.1.1) net-protocol uri net-protocol (0.2.2) timeout - nio4r (2.7.0) - nokogiri (1.16.5-aarch64-linux) + nio4r (2.7.3) + nokogiri (1.16.6-aarch64-linux) racc (~> 1.4) - nokogiri (1.16.5-arm64-darwin) + nokogiri (1.16.6-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.5-x86_64-linux) + nokogiri (1.16.6-x86_64-linux) racc (~> 1.4) openssl (2.2.3) ipaddr - pg (1.4.5) + pg (1.5.6) psych (5.1.2) stringio puma (6.4.2) nio4r (~> 2.0) racc (1.8.0) - rack (3.0.11) - rack-cors (1.1.1) + rack (3.1.7) + rack-cors (2.0.2) rack (>= 2.0.0) rack-session (2.0.0) rack (>= 3.0.0) @@ -120,21 +122,21 @@ GEM zeitwerk (~> 2.6) rake (13.2.1) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) rdoc (6.7.0) psych (>= 4.0.0) - reline (0.5.8) + reline (0.5.9) io-console (~> 0.5) securerandom (0.3.1) - stringio (3.1.0) + stringio (3.1.1) thor (1.3.1) timeout (0.4.1) tzinfo (2.0.6) concurrent-ruby (~> 1.0) uri (0.13.0) webrick (1.8.1) - zeitwerk (2.6.15) + zeitwerk (2.6.16) PLATFORMS aarch64-linux-musl From dd729ecabf7f74b3d5dacde798eb61c565fa8c5f Mon Sep 17 00:00:00 2001 From: Joe Anderson Date: Thu, 18 Jul 2024 10:59:59 +0100 Subject: [PATCH 2/3] Upgrade Ruby and Bundler to fix ffi --- Dockerfile | 2 +- Gemfile | 4 ++-- Gemfile.lock | 29 ++++++++++++----------------- 3 files changed, 15 insertions(+), 20 deletions(-) diff --git a/Dockerfile b/Dockerfile index c7c0c51..1152901 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.0.7-alpine +FROM ruby:3.3.4-alpine RUN apk add --update --no-cache bash build-base tzdata postgresql-dev git diff --git a/Gemfile b/Gemfile index 8d3f979..90f8d97 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby '3.0.7' +ruby '3.3.4' # Rails gem 'activesupport' @@ -23,7 +23,7 @@ gem 'puma', '~> 6.4' # Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible gem 'rack-cors' -gem 'not_analytics_client', '~> 0.2.0', github: '12joan/not-analytics-client', branch: 'main' +gem 'not_analytics_client', '~> 0.3.0', github: '12joan/not-analytics-client', branch: 'main' gem 'groupdate', '~> 5.2' diff --git a/Gemfile.lock b/Gemfile.lock index 33fb196..818143e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,14 +1,14 @@ GIT remote: https://github.com/12joan/not-analytics-client.git - revision: ada3d03a91b5c5f601ee39c6ab6116d7d1a6c851 + revision: 2906a7d9f6fe35b4917f03356f70c2ac82a91eb0 branch: main specs: - not_analytics_client (0.2.0) - base64 (~> 0.1) - json (~> 2.5) - net-http (~> 0.1.1) - openssl (~> 2.2) - securerandom (~> 0.1) + not_analytics_client (0.3.0) + base64 (~> 0.2) + json (~> 2.7) + net-http (~> 0.4) + openssl (~> 3.2) + securerandom (~> 0.3) GEM remote: https://rubygems.org/ @@ -62,7 +62,6 @@ GEM i18n (1.14.5) concurrent-ruby (~> 1.0) io-console (0.7.2) - ipaddr (1.2.6) irb (1.14.0) rdoc (>= 4.0.0) reline (>= 0.4.2) @@ -75,11 +74,8 @@ GEM nokogiri (>= 1.12.0) minitest (5.24.1) mutex_m (0.2.0) - net-http (0.1.1) - net-protocol + net-http (0.4.1) uri - net-protocol (0.2.2) - timeout nio4r (2.7.3) nokogiri (1.16.6-aarch64-linux) racc (~> 1.4) @@ -87,8 +83,7 @@ GEM racc (~> 1.4) nokogiri (1.16.6-x86_64-linux) racc (~> 1.4) - openssl (2.2.3) - ipaddr + openssl (3.2.0) pg (1.5.6) psych (5.1.2) stringio @@ -152,7 +147,7 @@ DEPENDENCIES byebug groupdate (~> 5.2) listen (~> 3.3) - not_analytics_client (~> 0.2.0)! + not_analytics_client (~> 0.3.0)! pg (~> 1.1) puma (~> 6.4) rack-cors @@ -160,7 +155,7 @@ DEPENDENCIES tzinfo-data RUBY VERSION - ruby 3.0.7 + ruby 3.3.4p94 BUNDLED WITH - 2.2.33 + 2.5.15 From 7e4c83b05403d9704b61f29db89697acbece1f0e Mon Sep 17 00:00:00 2001 From: Joe Anderson Date: Thu, 18 Jul 2024 11:04:37 +0100 Subject: [PATCH 3/3] Remove inefficient caching --- .github/workflows/push.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index b054b48..719e799 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -11,9 +11,6 @@ jobs: - run: docker-compose pull - - uses: satackey/action-docker-layer-caching@v0.0.11 - continue-on-error: true - - run: docker-compose -f docker-compose.test.yml build - run: docker-compose -f docker-compose.test.yml run web sh -c 'rails db:setup && rails test' @@ -26,9 +23,6 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: satackey/action-docker-layer-caching@v0.0.11 - continue-on-error: true - - uses: zenato/docker-action@master with: username: ${{ secrets.REGISTRY_USERNAME }}