From f2c9ee244d7a126cc303aae9b0a109e378810e02 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Mon, 19 Sep 2022 13:49:34 -0400 Subject: [PATCH 1/2] ci: update pipelines to use ruby 3.1 --- .github/workflows/ci.yml | 10 +++------- .github/workflows/gem-install.yml | 10 +++++----- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f95b54d1..61c8bbea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,18 +19,14 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ruby: [2.7, "3.0", 3.1] - + ruby: ["2.7", "3.0", "3.1"] steps: - uses: actions/checkout@v2 - - - name: Set up Ruby - uses: ruby/setup-ruby@v1 + - uses: ruby/setup-ruby@v1 with: - ruby-version: ${{ matrix.ruby }} + ruby-version: ${{matrix.ruby}} bundler: latest bundler-cache: true - - name: Run tests run: bin/test diff --git a/.github/workflows/gem-install.yml b/.github/workflows/gem-install.yml index f43b82aa..9b75081e 100644 --- a/.github/workflows/gem-install.yml +++ b/.github/workflows/gem-install.yml @@ -25,7 +25,7 @@ jobs: - uses: actions/checkout@v2 - uses: ruby/setup-ruby@v1 with: - ruby-version: "3.0" + ruby-version: "3.1" bundler: latest bundler-cache: true - run: "bundle exec rake gem:${{matrix.platform}}" @@ -41,7 +41,7 @@ jobs: steps: - uses: ruby/setup-ruby@v1 with: - ruby-version: "3.0" + ruby-version: "3.1" - uses: actions/download-artifact@v2 with: name: gem-ruby @@ -55,7 +55,7 @@ jobs: steps: - uses: ruby/setup-ruby@v1 with: - ruby-version: "3.0" + ruby-version: "3.1" - uses: actions/download-artifact@v2 with: name: gem-x86_64-linux @@ -67,7 +67,7 @@ jobs: needs: ["package"] runs-on: ubuntu-latest container: - image: ruby:3.0-alpine + image: ruby:3.1-alpine steps: - uses: actions/download-artifact@v2 with: @@ -83,7 +83,7 @@ jobs: steps: - uses: ruby/setup-ruby@v1 with: - ruby-version: "3.0" + ruby-version: "3.1" - uses: actions/download-artifact@v2 with: name: gem-x86_64-darwin From 5aea4f5fa21e4672ff7b25f9eefef4aa364404bd Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Mon, 19 Sep 2022 13:50:28 -0400 Subject: [PATCH 2/2] ci: delete Gemfile.lock https://bundler.io/blog/2018/01/17/making-gem-development-a-little-better.html --- .github/workflows/ci.yml | 2 ++ .github/workflows/gem-install.yml | 1 + 2 files changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 61c8bbea..2e03084a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,6 +22,7 @@ jobs: ruby: ["2.7", "3.0", "3.1"] steps: - uses: actions/checkout@v2 + - run: rm Gemfile.lock - uses: ruby/setup-ruby@v1 with: ruby-version: ${{matrix.ruby}} @@ -38,6 +39,7 @@ jobs: runs-on: ${{matrix.plat}}-latest steps: - uses: actions/checkout@v2 + - run: rm Gemfile.lock - uses: ruby/setup-ruby@v1 with: ruby-version: "3.1" diff --git a/.github/workflows/gem-install.yml b/.github/workflows/gem-install.yml index 9b75081e..a875dc54 100644 --- a/.github/workflows/gem-install.yml +++ b/.github/workflows/gem-install.yml @@ -23,6 +23,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + - run: rm Gemfile.lock - uses: ruby/setup-ruby@v1 with: ruby-version: "3.1"