diff --git a/.github/workflows/pr_tests.yml b/.github/workflows/pr_tests.yml index 092c284..0eb570f 100644 --- a/.github/workflows/pr_tests.yml +++ b/.github/workflows/pr_tests.yml @@ -35,7 +35,7 @@ jobs: - name: "Install Ruby 2.7" uses: ruby/setup-ruby@v1 # ruby/setup-ruby@ec106b438a1ff6ff109590de34ddc62c540232e0 with: - ruby-version: 2.7 + ruby-version: 4.0.5 bundler-cache: true - run: "bundle exec rake syntax" @@ -47,7 +47,7 @@ jobs: - name: "Install Ruby 2.7" uses: ruby/setup-ruby@v1 with: - ruby-version: 2.7 + ruby-version: 4.0.5 bundler-cache: true - run: "bundle exec rake lint" - run: "bundle exec rake metadata_lint" @@ -62,7 +62,7 @@ jobs: - name: "Install Ruby 2.7" uses: ruby/setup-ruby@v1 with: - ruby-version: 2.7 + ruby-version: 4.0.5 bundler-cache: true - run: | bundle show @@ -76,7 +76,7 @@ jobs: - name: 'Install Ruby 2.7' uses: ruby/setup-ruby@v1 with: - ruby-version: 2.7 + ruby-version: 4.0.5 bundler-cache: true - run: bundle exec rake check:dot_underscore - run: bundle exec rake check:test_file @@ -89,7 +89,7 @@ jobs: - name: 'Install Ruby 2.7' uses: ruby/setup-ruby@v1 with: - ruby-version: 2.7 + ruby-version: 4.0.5 bundler-cache: true - name: 'Tags and changelogs' run: | diff --git a/.github/workflows/tag_deploy.yml b/.github/workflows/tag_deploy.yml index 0c91ff1..5c6df63 100644 --- a/.github/workflows/tag_deploy.yml +++ b/.github/workflows/tag_deploy.yml @@ -55,7 +55,7 @@ jobs: clean: true - uses: ruby/setup-ruby@v1 with: - ruby-version: 2.7 + ruby-version: 4.0.5 bundler-cache: true - run: bundle exec rake pkg:check_version - run: bundle exec rake pkg:compare_latest_tag @@ -180,7 +180,7 @@ jobs: clean: true - uses: ruby/setup-ruby@v1 with: - ruby-version: 2.7 + ruby-version: 4.0.5 bundler-cache: true - name: Build Puppet module (PDK) run: bundle exec pdk build --force diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4e7059d..a197a76 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -227,35 +227,35 @@ variables: #----------------------------------------------------------------------- .pup_5_x: &pup_5_x - image: 'ruby:2.4' + image: 'ruby:4.0' variables: PUPPET_VERSION: '~> 5.0' BEAKER_PUPPET_COLLECTION: 'puppet5' MATRIX_RUBY_VERSION: '2.4' .pup_5_pe: &pup_5_pe - image: 'ruby:2.4' + image: 'ruby:4.0' variables: PUPPET_VERSION: '5.5.22' BEAKER_PUPPET_COLLECTION: 'puppet5' MATRIX_RUBY_VERSION: '2.4' .pup_6_x: &pup_6_x - image: 'ruby:2.5' + image: 'ruby:4.0' variables: PUPPET_VERSION: '~> 6.0' BEAKER_PUPPET_COLLECTION: 'puppet6' MATRIX_RUBY_VERSION: '2.5' .pup_6_pe: &pup_6_pe - image: 'ruby:2.5' + image: 'ruby:4.0' variables: PUPPET_VERSION: '6.18.0' BEAKER_PUPPET_COLLECTION: 'puppet6' MATRIX_RUBY_VERSION: '2.5' .pup_7_x: &pup_7_x - image: 'ruby:2.7' + image: 'ruby:4.0' variables: PUPPET_VERSION: '~> 7.0' BEAKER_PUPPET_COLLECTION: 'puppet7'