From ab1dc62ed5c1e852d7020bcc8480e20bea258bff Mon Sep 17 00:00:00 2001 From: Step7750 Date: Mon, 1 Sep 2025 22:48:26 -0600 Subject: [PATCH 01/11] Upgrades GitHub Workflows Multiple are outdated and can't run anymore. --- .github/workflows/build.yml | 8 ++++---- .github/workflows/deploy.yml | 10 +++++----- .github/workflows/dev_deploy.yml | 12 ++++++------ .github/workflows/publish.yml | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f705b7e..a634501 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,16 +12,16 @@ jobs: strategy: matrix: - ruby-version: [2.5, 2.6, 2.7, 3.0] + ruby-version: [3.1, 3.2, 3.3] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Ruby - uses: ruby/setup-ruby@v1 + uses: ruby/setup-ruby@v1.170.0 with: ruby-version: ${{ matrix.ruby-version }} - - uses: actions/cache@v2 + - uses: actions/cache@v4 with: path: vendor/bundle key: gems-${{ runner.os }}-${{ matrix.ruby-version }}-${{ hashFiles('**/Gemfile.lock') }} diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 341cd5f..92ec22c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -8,16 +8,16 @@ jobs: deploy: runs-on: ubuntu-latest env: - ruby-version: 2.5 + ruby-version: 3.2 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Ruby - uses: ruby/setup-ruby@v1 + uses: ruby/setup-ruby@v1.170.0 with: ruby-version: ${{ env.ruby-version }} - - uses: actions/cache@v2 + - uses: actions/cache@v4 with: path: vendor/bundle key: gems-${{ runner.os }}-${{ matrix.ruby-version }}-${{ hashFiles('**/Gemfile.lock') }} @@ -34,7 +34,7 @@ jobs: - run: bundle exec middleman build - name: Deploy - uses: peaceiris/actions-gh-pages@v3 + uses: peaceiris/actions-gh-pages@v4 with: github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: ./build diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml index 7f1a40a..6d46164 100644 --- a/.github/workflows/dev_deploy.yml +++ b/.github/workflows/dev_deploy.yml @@ -8,16 +8,16 @@ jobs: deploy: runs-on: ubuntu-latest env: - ruby-version: 2.5 + ruby-version: 3.2 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Ruby - uses: ruby/setup-ruby@v1 + uses: ruby/setup-ruby@v1.170.0 with: ruby-version: ${{ env.ruby-version }} - - uses: actions/cache@v2 + - uses: actions/cache@v4 with: path: vendor/bundle key: gems-${{ runner.os }}-${{ matrix.ruby-version }}-${{ hashFiles('**/Gemfile.lock') }} @@ -34,7 +34,7 @@ jobs: - run: bundle exec middleman build - name: Push to Docker Hub - uses: docker/build-push-action@v1 + uses: docker/build-push-action@v6 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_ACCESS_KEY }} @@ -42,7 +42,7 @@ jobs: tag_with_ref: true - name: Deploy - uses: peaceiris/actions-gh-pages@v3.7.0-8 + uses: peaceiris/actions-gh-pages@v4 with: github_token: ${{ secrets.GITHUB_TOKEN }} destination_dir: dev diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d57930a..d81b0b8 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,10 +10,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out the repo - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Push to Docker Hub - uses: docker/build-push-action@v1 + uses: docker/build-push-action@v6 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_ACCESS_KEY }} From eedd1dcd0d0fb97387e50477a99491ae75ad2587 Mon Sep 17 00:00:00 2001 From: Step7750 Date: Mon, 1 Sep 2025 22:51:06 -0600 Subject: [PATCH 02/11] Downgrade ruby back --- .github/workflows/build.yml | 11 ++--------- .github/workflows/deploy.yml | 11 ++--------- .github/workflows/dev_deploy.yml | 11 ++--------- 3 files changed, 6 insertions(+), 27 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a634501..b0f972e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,17 +17,10 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up Ruby - uses: ruby/setup-ruby@v1.170.0 + uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby-version }} - - - uses: actions/cache@v4 - with: - path: vendor/bundle - key: gems-${{ runner.os }}-${{ matrix.ruby-version }}-${{ hashFiles('**/Gemfile.lock') }} - restore-keys: | - gems-${{ runner.os }}-${{ matrix.ruby-version }}- - gems-${{ runner.os }}- + bundler-cache: true # necessary to get ruby 2.3 to work nicely with bundler vendor/bundle cache # can remove once ruby 2.3 is no longer supported diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 92ec22c..a964793 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -13,17 +13,10 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up Ruby - uses: ruby/setup-ruby@v1.170.0 + uses: ruby/setup-ruby@v1 with: ruby-version: ${{ env.ruby-version }} - - - uses: actions/cache@v4 - with: - path: vendor/bundle - key: gems-${{ runner.os }}-${{ matrix.ruby-version }}-${{ hashFiles('**/Gemfile.lock') }} - restore-keys: | - gems-${{ runner.os }}-${{ matrix.ruby-version }}- - gems-${{ runner.os }}- + bundler-cache: true - run: bundle config set deployment 'true' - name: bundle install diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml index 6d46164..ea82716 100644 --- a/.github/workflows/dev_deploy.yml +++ b/.github/workflows/dev_deploy.yml @@ -13,17 +13,10 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up Ruby - uses: ruby/setup-ruby@v1.170.0 + uses: ruby/setup-ruby@v1 with: ruby-version: ${{ env.ruby-version }} - - - uses: actions/cache@v4 - with: - path: vendor/bundle - key: gems-${{ runner.os }}-${{ matrix.ruby-version }}-${{ hashFiles('**/Gemfile.lock') }} - restore-keys: | - gems-${{ runner.os }}-${{ matrix.ruby-version }}- - gems-${{ runner.os }}- + bundler-cache: true - run: bundle config set deployment 'true' - name: bundle install From 0cb9b490c94211555cfb4236303219133ac007de Mon Sep 17 00:00:00 2001 From: Step7750 Date: Mon, 1 Sep 2025 22:54:53 -0600 Subject: [PATCH 03/11] Fix nokogiri Dep --- .github/workflows/build.yml | 7 +++++++ .github/workflows/deploy.yml | 7 +++++++ .github/workflows/dev_deploy.yml | 7 +++++++ Gemfile | 1 + 4 files changed, 22 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b0f972e..024be4a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,6 +16,12 @@ jobs: steps: - uses: actions/checkout@v4 + + - name: Install system dependencies + run: | + sudo apt-get update + sudo apt-get install -y build-essential libxml2-dev libxslt-dev zlib1g-dev pkg-config + - name: Set up Ruby uses: ruby/setup-ruby@v1 with: @@ -27,6 +33,7 @@ jobs: - run: gem update --system - run: bundle config set deployment 'true' + - run: bundle config build.nokogiri --use-system-libraries - name: bundle install run: | bundle config path vendor/bundle diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a964793..2042010 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -12,6 +12,12 @@ jobs: steps: - uses: actions/checkout@v4 + + - name: Install system dependencies + run: | + sudo apt-get update + sudo apt-get install -y build-essential libxml2-dev libxslt-dev zlib1g-dev pkg-config + - name: Set up Ruby uses: ruby/setup-ruby@v1 with: @@ -19,6 +25,7 @@ jobs: bundler-cache: true - run: bundle config set deployment 'true' + - run: bundle config build.nokogiri --use-system-libraries - name: bundle install run: | bundle config path vendor/bundle diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml index ea82716..76fdbce 100644 --- a/.github/workflows/dev_deploy.yml +++ b/.github/workflows/dev_deploy.yml @@ -12,6 +12,12 @@ jobs: steps: - uses: actions/checkout@v4 + + - name: Install system dependencies + run: | + sudo apt-get update + sudo apt-get install -y build-essential libxml2-dev libxslt-dev zlib1g-dev pkg-config + - name: Set up Ruby uses: ruby/setup-ruby@v1 with: @@ -19,6 +25,7 @@ jobs: bundler-cache: true - run: bundle config set deployment 'true' + - run: bundle config build.nokogiri --use-system-libraries - name: bundle install run: | bundle config path vendor/bundle diff --git a/Gemfile b/Gemfile index 3897dff..3b2fbbe 100644 --- a/Gemfile +++ b/Gemfile @@ -11,3 +11,4 @@ gem 'redcarpet', '~> 3.5.0' gem 'nokogiri', '~> 1.11.0' gem 'sass' gem 'webrick' +gem 'net-ftp' From 0a2eef0d7ee223bd9133b229089135652c775fe5 Mon Sep 17 00:00:00 2001 From: Step7750 Date: Mon, 1 Sep 2025 22:57:25 -0600 Subject: [PATCH 04/11] Revert "Fix nokogiri Dep" This reverts commit 0cb9b490c94211555cfb4236303219133ac007de. --- .github/workflows/build.yml | 7 ------- .github/workflows/deploy.yml | 7 ------- .github/workflows/dev_deploy.yml | 7 ------- Gemfile | 1 - 4 files changed, 22 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 024be4a..b0f972e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,12 +16,6 @@ jobs: steps: - uses: actions/checkout@v4 - - - name: Install system dependencies - run: | - sudo apt-get update - sudo apt-get install -y build-essential libxml2-dev libxslt-dev zlib1g-dev pkg-config - - name: Set up Ruby uses: ruby/setup-ruby@v1 with: @@ -33,7 +27,6 @@ jobs: - run: gem update --system - run: bundle config set deployment 'true' - - run: bundle config build.nokogiri --use-system-libraries - name: bundle install run: | bundle config path vendor/bundle diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 2042010..a964793 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -12,12 +12,6 @@ jobs: steps: - uses: actions/checkout@v4 - - - name: Install system dependencies - run: | - sudo apt-get update - sudo apt-get install -y build-essential libxml2-dev libxslt-dev zlib1g-dev pkg-config - - name: Set up Ruby uses: ruby/setup-ruby@v1 with: @@ -25,7 +19,6 @@ jobs: bundler-cache: true - run: bundle config set deployment 'true' - - run: bundle config build.nokogiri --use-system-libraries - name: bundle install run: | bundle config path vendor/bundle diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml index 76fdbce..ea82716 100644 --- a/.github/workflows/dev_deploy.yml +++ b/.github/workflows/dev_deploy.yml @@ -12,12 +12,6 @@ jobs: steps: - uses: actions/checkout@v4 - - - name: Install system dependencies - run: | - sudo apt-get update - sudo apt-get install -y build-essential libxml2-dev libxslt-dev zlib1g-dev pkg-config - - name: Set up Ruby uses: ruby/setup-ruby@v1 with: @@ -25,7 +19,6 @@ jobs: bundler-cache: true - run: bundle config set deployment 'true' - - run: bundle config build.nokogiri --use-system-libraries - name: bundle install run: | bundle config path vendor/bundle diff --git a/Gemfile b/Gemfile index 3b2fbbe..3897dff 100644 --- a/Gemfile +++ b/Gemfile @@ -11,4 +11,3 @@ gem 'redcarpet', '~> 3.5.0' gem 'nokogiri', '~> 1.11.0' gem 'sass' gem 'webrick' -gem 'net-ftp' From 3ce3d532d92058b9710f19035aedf5de09a26cbd Mon Sep 17 00:00:00 2001 From: Step7750 Date: Mon, 1 Sep 2025 22:57:31 -0600 Subject: [PATCH 05/11] Revert "Downgrade ruby back" This reverts commit eedd1dcd0d0fb97387e50477a99491ae75ad2587. --- .github/workflows/build.yml | 11 +++++++++-- .github/workflows/deploy.yml | 11 +++++++++-- .github/workflows/dev_deploy.yml | 11 +++++++++-- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b0f972e..a634501 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,10 +17,17 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up Ruby - uses: ruby/setup-ruby@v1 + uses: ruby/setup-ruby@v1.170.0 with: ruby-version: ${{ matrix.ruby-version }} - bundler-cache: true + + - uses: actions/cache@v4 + with: + path: vendor/bundle + key: gems-${{ runner.os }}-${{ matrix.ruby-version }}-${{ hashFiles('**/Gemfile.lock') }} + restore-keys: | + gems-${{ runner.os }}-${{ matrix.ruby-version }}- + gems-${{ runner.os }}- # necessary to get ruby 2.3 to work nicely with bundler vendor/bundle cache # can remove once ruby 2.3 is no longer supported diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a964793..92ec22c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -13,10 +13,17 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up Ruby - uses: ruby/setup-ruby@v1 + uses: ruby/setup-ruby@v1.170.0 with: ruby-version: ${{ env.ruby-version }} - bundler-cache: true + + - uses: actions/cache@v4 + with: + path: vendor/bundle + key: gems-${{ runner.os }}-${{ matrix.ruby-version }}-${{ hashFiles('**/Gemfile.lock') }} + restore-keys: | + gems-${{ runner.os }}-${{ matrix.ruby-version }}- + gems-${{ runner.os }}- - run: bundle config set deployment 'true' - name: bundle install diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml index ea82716..6d46164 100644 --- a/.github/workflows/dev_deploy.yml +++ b/.github/workflows/dev_deploy.yml @@ -13,10 +13,17 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up Ruby - uses: ruby/setup-ruby@v1 + uses: ruby/setup-ruby@v1.170.0 with: ruby-version: ${{ env.ruby-version }} - bundler-cache: true + + - uses: actions/cache@v4 + with: + path: vendor/bundle + key: gems-${{ runner.os }}-${{ matrix.ruby-version }}-${{ hashFiles('**/Gemfile.lock') }} + restore-keys: | + gems-${{ runner.os }}-${{ matrix.ruby-version }}- + gems-${{ runner.os }}- - run: bundle config set deployment 'true' - name: bundle install From 66f211088ebd889e284a5d8e2beadbf46ce6fdcb Mon Sep 17 00:00:00 2001 From: Step7750 Date: Mon, 1 Sep 2025 22:57:36 -0600 Subject: [PATCH 06/11] Revert "Upgrades GitHub Workflows" This reverts commit ab1dc62ed5c1e852d7020bcc8480e20bea258bff. --- .github/workflows/build.yml | 8 ++++---- .github/workflows/deploy.yml | 10 +++++----- .github/workflows/dev_deploy.yml | 12 ++++++------ .github/workflows/publish.yml | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a634501..f705b7e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,16 +12,16 @@ jobs: strategy: matrix: - ruby-version: [3.1, 3.2, 3.3] + ruby-version: [2.5, 2.6, 2.7, 3.0] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v2 - name: Set up Ruby - uses: ruby/setup-ruby@v1.170.0 + uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby-version }} - - uses: actions/cache@v4 + - uses: actions/cache@v2 with: path: vendor/bundle key: gems-${{ runner.os }}-${{ matrix.ruby-version }}-${{ hashFiles('**/Gemfile.lock') }} diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 92ec22c..341cd5f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -8,16 +8,16 @@ jobs: deploy: runs-on: ubuntu-latest env: - ruby-version: 3.2 + ruby-version: 2.5 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v2 - name: Set up Ruby - uses: ruby/setup-ruby@v1.170.0 + uses: ruby/setup-ruby@v1 with: ruby-version: ${{ env.ruby-version }} - - uses: actions/cache@v4 + - uses: actions/cache@v2 with: path: vendor/bundle key: gems-${{ runner.os }}-${{ matrix.ruby-version }}-${{ hashFiles('**/Gemfile.lock') }} @@ -34,7 +34,7 @@ jobs: - run: bundle exec middleman build - name: Deploy - uses: peaceiris/actions-gh-pages@v4 + uses: peaceiris/actions-gh-pages@v3 with: github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: ./build diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml index 6d46164..7f1a40a 100644 --- a/.github/workflows/dev_deploy.yml +++ b/.github/workflows/dev_deploy.yml @@ -8,16 +8,16 @@ jobs: deploy: runs-on: ubuntu-latest env: - ruby-version: 3.2 + ruby-version: 2.5 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v2 - name: Set up Ruby - uses: ruby/setup-ruby@v1.170.0 + uses: ruby/setup-ruby@v1 with: ruby-version: ${{ env.ruby-version }} - - uses: actions/cache@v4 + - uses: actions/cache@v2 with: path: vendor/bundle key: gems-${{ runner.os }}-${{ matrix.ruby-version }}-${{ hashFiles('**/Gemfile.lock') }} @@ -34,7 +34,7 @@ jobs: - run: bundle exec middleman build - name: Push to Docker Hub - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v1 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_ACCESS_KEY }} @@ -42,7 +42,7 @@ jobs: tag_with_ref: true - name: Deploy - uses: peaceiris/actions-gh-pages@v4 + uses: peaceiris/actions-gh-pages@v3.7.0-8 with: github_token: ${{ secrets.GITHUB_TOKEN }} destination_dir: dev diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d81b0b8..d57930a 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,10 +10,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out the repo - uses: actions/checkout@v4 + uses: actions/checkout@v2 - name: Push to Docker Hub - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v1 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_ACCESS_KEY }} From e21e84c86e4f4724ac7045159c18e824b1b5e362 Mon Sep 17 00:00:00 2001 From: Step7750 Date: Mon, 1 Sep 2025 22:58:46 -0600 Subject: [PATCH 07/11] Upgrade cache --- .github/workflows/build.yml | 2 +- .github/workflows/deploy.yml | 2 +- .github/workflows/dev_deploy.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f705b7e..a5c2740 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: with: ruby-version: ${{ matrix.ruby-version }} - - uses: actions/cache@v2 + - uses: actions/cache@v4 with: path: vendor/bundle key: gems-${{ runner.os }}-${{ matrix.ruby-version }}-${{ hashFiles('**/Gemfile.lock') }} diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 341cd5f..da2ca1e 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -17,7 +17,7 @@ jobs: with: ruby-version: ${{ env.ruby-version }} - - uses: actions/cache@v2 + - uses: actions/cache@v4 with: path: vendor/bundle key: gems-${{ runner.os }}-${{ matrix.ruby-version }}-${{ hashFiles('**/Gemfile.lock') }} diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml index 7f1a40a..576e360 100644 --- a/.github/workflows/dev_deploy.yml +++ b/.github/workflows/dev_deploy.yml @@ -17,7 +17,7 @@ jobs: with: ruby-version: ${{ env.ruby-version }} - - uses: actions/cache@v2 + - uses: actions/cache@v4 with: path: vendor/bundle key: gems-${{ runner.os }}-${{ matrix.ruby-version }}-${{ hashFiles('**/Gemfile.lock') }} From a5de3c3713e0f9ce98c4483a165b57dde0c5f8b6 Mon Sep 17 00:00:00 2001 From: Step7750 Date: Mon, 1 Sep 2025 23:01:35 -0600 Subject: [PATCH 08/11] updates bundler --- .github/workflows/build.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a5c2740..fef9518 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,9 +29,8 @@ jobs: gems-${{ runner.os }}-${{ matrix.ruby-version }}- gems-${{ runner.os }}- - # necessary to get ruby 2.3 to work nicely with bundler vendor/bundle cache - # can remove once ruby 2.3 is no longer supported - - run: gem update --system + - name: Update bundler + run: gem install bundler - run: bundle config set deployment 'true' - name: bundle install From 95bd7532324189b6215e77bf906fb7167110e6bd Mon Sep 17 00:00:00 2001 From: Step7750 Date: Mon, 1 Sep 2025 23:03:35 -0600 Subject: [PATCH 09/11] Use bundler cache --- .github/workflows/build.yml | 18 +----------------- .github/workflows/deploy.yml | 15 +-------------- .github/workflows/dev_deploy.yml | 15 +-------------- 3 files changed, 3 insertions(+), 45 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fef9518..60dfefc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,22 +20,6 @@ jobs: uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby-version }} - - - uses: actions/cache@v4 - with: - path: vendor/bundle - key: gems-${{ runner.os }}-${{ matrix.ruby-version }}-${{ hashFiles('**/Gemfile.lock') }} - restore-keys: | - gems-${{ runner.os }}-${{ matrix.ruby-version }}- - gems-${{ runner.os }}- - - - name: Update bundler - run: gem install bundler - - - run: bundle config set deployment 'true' - - name: bundle install - run: | - bundle config path vendor/bundle - bundle install --jobs 4 --retry 3 + bundler-cache: true - run: bundle exec middleman build diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index da2ca1e..5d6f7f1 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -16,20 +16,7 @@ jobs: uses: ruby/setup-ruby@v1 with: ruby-version: ${{ env.ruby-version }} - - - uses: actions/cache@v4 - with: - path: vendor/bundle - key: gems-${{ runner.os }}-${{ matrix.ruby-version }}-${{ hashFiles('**/Gemfile.lock') }} - restore-keys: | - gems-${{ runner.os }}-${{ matrix.ruby-version }}- - gems-${{ runner.os }}- - - - run: bundle config set deployment 'true' - - name: bundle install - run: | - bundle config path vendor/bundle - bundle install --jobs 4 --retry 3 + bundler-cache: true - run: bundle exec middleman build diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml index 576e360..5f29461 100644 --- a/.github/workflows/dev_deploy.yml +++ b/.github/workflows/dev_deploy.yml @@ -16,20 +16,7 @@ jobs: uses: ruby/setup-ruby@v1 with: ruby-version: ${{ env.ruby-version }} - - - uses: actions/cache@v4 - with: - path: vendor/bundle - key: gems-${{ runner.os }}-${{ matrix.ruby-version }}-${{ hashFiles('**/Gemfile.lock') }} - restore-keys: | - gems-${{ runner.os }}-${{ matrix.ruby-version }}- - gems-${{ runner.os }}- - - - run: bundle config set deployment 'true' - - name: bundle install - run: | - bundle config path vendor/bundle - bundle install --jobs 4 --retry 3 + bundler-cache: true - run: bundle exec middleman build From b25126d2871ad79ec1f2e6b6d6d72946f14ca67f Mon Sep 17 00:00:00 2001 From: Step7750 Date: Mon, 1 Sep 2025 23:13:29 -0600 Subject: [PATCH 10/11] pin ruby version --- .github/workflows/build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 60dfefc..57ab1dd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,11 +8,11 @@ on: jobs: test: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 strategy: matrix: - ruby-version: [2.5, 2.6, 2.7, 3.0] + ruby-version: [2.7.2] steps: - uses: actions/checkout@v2 @@ -20,6 +20,7 @@ jobs: uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby-version }} + bundler: '2.2.33' bundler-cache: true - run: bundle exec middleman build From 4b0375b4f819d02fc145e98d9da0b1bd7c137ac4 Mon Sep 17 00:00:00 2001 From: Step7750 Date: Mon, 1 Sep 2025 23:13:41 -0600 Subject: [PATCH 11/11] ping ruby version --- .github/workflows/deploy.yml | 5 +++-- .github/workflows/dev_deploy.yml | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5d6f7f1..925c330 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -6,9 +6,9 @@ on: jobs: deploy: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 env: - ruby-version: 2.5 + ruby-version: 2.7.2 steps: - uses: actions/checkout@v2 @@ -16,6 +16,7 @@ jobs: uses: ruby/setup-ruby@v1 with: ruby-version: ${{ env.ruby-version }} + bundler: '2.2.33' bundler-cache: true - run: bundle exec middleman build diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml index 5f29461..ff084f2 100644 --- a/.github/workflows/dev_deploy.yml +++ b/.github/workflows/dev_deploy.yml @@ -6,9 +6,9 @@ on: jobs: deploy: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 env: - ruby-version: 2.5 + ruby-version: 2.7.2 steps: - uses: actions/checkout@v2 @@ -16,6 +16,7 @@ jobs: uses: ruby/setup-ruby@v1 with: ruby-version: ${{ env.ruby-version }} + bundler: '2.2.33' bundler-cache: true - run: bundle exec middleman build