diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 59040bc4..7ae7527b 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -3,9 +3,9 @@ name: Deploy to GitHub pages on: push: branches: [ main ] - pull_request: - # The branches below must be a subset of the branches above - branches: [ main ] + # pull_request: + # # The branches below must be a subset of the branches above + # branches: [ main ] schedule: - cron: '0 6 * * *' workflow_dispatch: @@ -59,7 +59,7 @@ jobs: uses: ruby/setup-ruby@v1 with: bundler-cache: true - ruby-version: '3.1.2' + ruby-version: '3.2.2' - name: Install rails-erd run: | @@ -175,6 +175,9 @@ jobs: - name: Checkout uses: actions/checkout@v3 + - name: Pull changes + run: git pull --rebase origin main + - name: Get diagrams uses: actions/download-artifact@v2 with: @@ -187,7 +190,6 @@ jobs: git config user.email github-actions@github.com git add . git commit -m "updated entity relationship diagram" - git pull --rebase git push build-and-push: @@ -217,7 +219,7 @@ jobs: uses: ruby/setup-ruby@v1.101.0 with: bundler-cache: true - ruby-version: '3.1.2' + ruby-version: '3.2.2' - name: Validate C4 Models run: ./bin/c4-validate.sh diff --git a/.github/workflows/update_dependencies.yml b/.github/workflows/update_dependencies.yml index 37af9e04..23ec8a86 100644 --- a/.github/workflows/update_dependencies.yml +++ b/.github/workflows/update_dependencies.yml @@ -20,7 +20,7 @@ jobs: uses: ruby/setup-ruby@v1.101.0 with: bundler-cache: true - ruby-version: '3.1.2' + ruby-version: '3.2.2' - name: Unlock bundler run: bundle config unset deployment diff --git a/.ruby-version b/.ruby-version index ef538c28..be94e6f5 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.1.2 +3.2.2 diff --git a/Gemfile b/Gemfile index bc25e028..c035a2d6 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ # the following line to use "http://" source "https://rubygems.org" -ruby "3.1.2" +ruby "3.2.2" # Windows support gem "tzinfo-data", platforms: %i[mswin mingw jruby] diff --git a/Gemfile.lock b/Gemfile.lock index df54ab33..65962b06 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -380,7 +380,7 @@ DEPENDENCIES webmock RUBY VERSION - ruby 3.1.2p20 + ruby 3.2.2p53 BUNDLED WITH 2.3.14