diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index f8de2bd..ba96aea 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -2,10 +2,10 @@ name: Tests on: push: - branches: [master] + branches: [main] paths-ignore: ['*.md'] pull_request: - type: [opened, reopened, edited] + types: [opened, reopened, edited] paths-ignore: ['*.md'] jobs: @@ -15,24 +15,12 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v1 + uses: actions/checkout@v4 - name: Setup Ruby - uses: actions/setup-ruby@v1 + uses: ruby/setup-ruby@v1 with: - ruby-version: '2.5.x' - - name: Install bundler - run: | - gem install bundler - bundle config path vendor/bundle - - name: Cache gems - id: cache - uses: actions/cache@v1 - with: - path: vendor/bundle - key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile') }} - - name: Install gems - if: steps.cache.outputs.cache-hit != 'true' - run: bundle install --jobs 4 --retry 3 + ruby-version: '3.1' + bundler-cache: true - name: Clone helpers run: | git clone https://github.com/puppetlabs/puppetlabs-ruby_task_helper ../ruby_task_helper @@ -45,11 +33,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v1 + uses: actions/checkout@v4 - name: Setup Ruby - uses: actions/setup-ruby@v1 + uses: ruby/setup-ruby@v1 with: - ruby-version: '2.5.x' + ruby-version: '3.1' - name: Install rubocop run: gem install rubocop - name: Run rubocop diff --git a/metadata.json b/metadata.json index 27e0db6..aaf3fc1 100644 --- a/metadata.json +++ b/metadata.json @@ -13,7 +13,7 @@ }, { "name":"puppetlabs-ruby_task_helper", - "version_requirement":">= 0.4.0 < 1.0.0" + "version_requirement":">= 0.4.0 < 2.0.0" } ], "operatingsystem_support": [