From 4e57db9fdb7b255e7595b75252c9b87652bd2b4a Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Mon, 20 Jan 2025 14:05:22 +0100 Subject: [PATCH 1/2] Add Ruby 3.4 support --- .github/workflows/release.yml | 4 ++-- .github/workflows/test.yml | 3 ++- puppet-blacksmith.gemspec | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8b79d99..a738bf1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,10 +11,10 @@ jobs: if: github.repository_owner == 'voxpupuli' steps: - uses: actions/checkout@v4 - - name: Install Ruby 3.3 + - name: Install Ruby 3.4 uses: ruby/setup-ruby@v1 with: - ruby-version: '3.3' + ruby-version: '3.4' env: BUNDLE_WITHOUT: release - name: Build gem diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e5cf8ec..132fb12 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,7 +17,7 @@ jobs: - name: Install Ruby ${{ matrix.ruby }} uses: ruby/setup-ruby@v1 with: - ruby-version: "3.3" + ruby-version: "3.4" bundler-cache: true - name: Run Rubocop run: bundle exec rake rubocop @@ -34,6 +34,7 @@ jobs: - ruby: "3.2" coverage: "yes" - ruby: "3.3" + - ruby: "3.4" env: COVERAGE: ${{ matrix.coverage }} name: RSpec - Ruby ${{ matrix.ruby }} diff --git a/puppet-blacksmith.gemspec b/puppet-blacksmith.gemspec index dfdf935..88f7b43 100644 --- a/puppet-blacksmith.gemspec +++ b/puppet-blacksmith.gemspec @@ -16,6 +16,7 @@ Gem::Specification.new do |s| s.required_ruby_version = '>= 2.7.0' + s.add_runtime_dependency 'base64', '~> 0.2.0' s.add_runtime_dependency 'puppet-modulebuilder', '~> 2.0', '>= 2.0.2' s.add_runtime_dependency 'rest-client', '~>2.0' s.add_development_dependency 'aruba', '~> 2.1' From f23f1cdc066cdf23b4ca9590b2b74f62a3c01090 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Mon, 20 Jan 2025 14:22:21 +0100 Subject: [PATCH 2/2] fix tests --- features/git.feature | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/features/git.feature b/features/git.feature index 8317662..a92eb70 100644 --- a/features/git.feature +++ b/features/git.feature @@ -27,9 +27,7 @@ Feature: git { "name": "maestrodev-test", "version": "1.0.2", - "dependencies": [ - - ] + "dependencies": [] } """ When I run `git tag` @@ -67,9 +65,7 @@ Feature: git { "name": "maestrodev-test", "version": "1.0.2", - "dependencies": [ - - ] + "dependencies": [] } """ When I run `git tag` @@ -108,9 +104,7 @@ Feature: git { "name": "maestrodev-test", "version": "1.0.2", - "dependencies": [ - - ] + "dependencies": [] } """ When I run `git tag`