From a23ebb4181c0e4c103971ebe56999c212f005924 Mon Sep 17 00:00:00 2001 From: Michael Hashizume Date: Mon, 13 Feb 2023 14:00:47 -0800 Subject: [PATCH 1/2] (maint) Changes Docker image for auto release The PDK Docker image does not contain any build tools, which causes the installation of gems that use native extensions to fail. This commit changes the Docker image used in the Auto Release GitHub Action from the PDK image to the Puppet dev-tools image, which contains packages like `make` necessary for building native extensions. --- .github/workflows/auto_release.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/auto_release.yml b/.github/workflows/auto_release.yml index f3ee602..3799f04 100644 --- a/.github/workflows/auto_release.yml +++ b/.github/workflows/auto_release.yml @@ -33,10 +33,12 @@ jobs: fetch-depth: 0 persist-credentials: false + # We use the dev tools image here because the PDK image does not have the + # build tools necessary to compile native extensions. - name: "PDK Release prep" - uses: docker://puppet/pdk:2.6.1.0 + uses: docker://puppet/puppet-dev-tools:4.x with: - args: 'release prep --force' + args: 'pdk release prep --force --debug' env: CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From ca5186ee54a05393183af73dac4a6208a8b0127e Mon Sep 17 00:00:00 2001 From: Michael Hashizume Date: Mon, 13 Feb 2023 14:02:40 -0800 Subject: [PATCH 2/2] (maint) Pins changelog and concurrent-ruby gems Modeling after the learnings of the support team in commit https://github.com/puppetlabs/puppetlabs-puppet_metrics_collector/pull/186/commits/78dd8583d1fcdcc796dbf0eedbabcfe020f41084 This commit pins the github_changelog_generator gem to its latest version to make it work, and the concurrent-ruby to an older version to compensate for the version of PDK shipped in the dev-tools container image. --- .sync.yml | 4 +++- Gemfile | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.sync.yml b/.sync.yml index a0f3978..fa92d5c 100644 --- a/.sync.yml +++ b/.sync.yml @@ -21,7 +21,9 @@ Gemfile: from_env: BEAKER_PUPPET_VERSION version: '~> 1.22' - gem: github_changelog_generator - version: '=1.15.2' + version: '= 1.16.4' + - gem: concurrent-ruby + version: '= 1.1.10' # We can unpin async when we move to Ruby 3 - gem: async version: '~> 1' diff --git a/Gemfile b/Gemfile index b1261c6..6a6c641 100644 --- a/Gemfile +++ b/Gemfile @@ -40,7 +40,8 @@ group :development do gem "beaker-hostgenerator" gem "beaker-rspec" gem "beaker-puppet", *location_for(ENV['BEAKER_PUPPET_VERSION'] || '~> 1.22') - gem "github_changelog_generator", require: false + gem "github_changelog_generator", '= 1.16.4', require: false + gem "concurrent-ruby", '= 1.1.10', require: false gem "async", '~> 1', require: false gem "beaker-module_install_helper", require: false gem "beaker-puppet_install_helper", require: false