From d1801219e309842202e3eb5045d22bad518fd063 Mon Sep 17 00:00:00 2001 From: Tim Cowlishaw Date: Wed, 25 Sep 2024 07:31:05 +0200 Subject: [PATCH] more CI updates, get rid of deprecation warnings --- .github/workflows/ruby.yml | 8 +------- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 002865a..8cbcd49 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -17,10 +17,4 @@ jobs: compose-file: "./compose.yml" down-flags: "--volumes" test-container: app - test-command: bash -e "/app/ci.sh" - - name: Deploy to staging Heroku - env: - HEROKU_API_TOKEN: ${{ secrets.HEROKU_API_TOKEN }} - HEROKU_APP_NAME: 'staging-makeworks' - if: github.ref == 'refs/heads/master' && job.status == 'success' - run: git push https://heroku:$HEROKU_API_TOKEN@git.heroku.com/$HEROKU_APP_NAME.git origin/master:master --force + test-command: "bash -e \"/app/ci.sh\"" diff --git a/Gemfile.lock b/Gemfile.lock index 82fc977..41a281a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -327,7 +327,7 @@ GEM oauth2 (~> 1.1) omniauth (~> 1.9) orm_adapter (0.5.0) - parser (3.3.0.5) + parser (3.3.5.0) ast (~> 2.4.1) racc pg (1.2.3) @@ -337,7 +337,7 @@ GEM public_suffix (5.0.1) puma (5.6.7) nio4r (~> 2.0) - racc (1.7.3) + racc (1.8.1) rack (2.2.8.1) rack-mini-profiler (2.3.2) rack (>= 1.2.0) @@ -446,7 +446,7 @@ GEM sprockets (>= 3.0.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - thor (1.3.0) + thor (1.3.2) tilt (2.0.10) timeout (0.4.1) turbo-rails (2.0.4) @@ -546,4 +546,4 @@ RUBY VERSION ruby 3.1.6p260 BUNDLED WITH - 2.1.4 + 2.5.20