diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f705b7e..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,23 +20,7 @@ jobs: uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby-version }} - - - uses: actions/cache@v2 - 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 - - run: gem update --system - - - run: bundle config set deployment 'true' - - name: bundle install - run: | - bundle config path vendor/bundle - bundle install --jobs 4 --retry 3 + bundler: '2.2.33' + bundler-cache: true - run: bundle exec middleman build diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 341cd5f..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,20 +16,8 @@ jobs: uses: ruby/setup-ruby@v1 with: ruby-version: ${{ env.ruby-version }} - - - uses: actions/cache@v2 - 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: '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 7f1a40a..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,20 +16,8 @@ jobs: uses: ruby/setup-ruby@v1 with: ruby-version: ${{ env.ruby-version }} - - - uses: actions/cache@v2 - 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: '2.2.33' + bundler-cache: true - run: bundle exec middleman build