From 182fdd444bf226efacfe464fbc5b95be6138a4f4 Mon Sep 17 00:00:00 2001 From: Michael Hashizume Date: Wed, 14 Feb 2024 15:30:44 -0800 Subject: [PATCH 1/3] Revert "Move to Puppet release GitHub Actions" This reverts commit fee8b613e780a3a9576d45ff75de81ac626f74b6. --- .github/workflows/auto_release_prep.yml | 12 ---- .github/workflows/release.yml | 94 +++++-------------------- 2 files changed, 16 insertions(+), 90 deletions(-) delete mode 100644 .github/workflows/auto_release_prep.yml diff --git a/.github/workflows/auto_release_prep.yml b/.github/workflows/auto_release_prep.yml deleted file mode 100644 index 68ab61d..0000000 --- a/.github/workflows/auto_release_prep.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: Automated release prep - -on: - workflow_dispatch: - -jobs: - auto_release_prep: - uses: puppetlabs/release-engineering-repo-standards/.github/workflows/auto_release_prep.yml@v1 - secrets: inherit - with: - project-type: ruby - version-file-path: lib/beaker-puppet/version.rb diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e2be9d1..e730453 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,94 +1,32 @@ -name: Release Gem +name: Release -on: workflow_dispatch +on: + push: + tags: + - '*' jobs: release: runs-on: ubuntu-latest - if: github.repository == 'puppetlabs/beaker-puppet' + if: github.repository_owner == 'voxpupuli' steps: - uses: actions/checkout@v4 - - - name: Get Current Version - uses: actions/github-script@v7 - id: cv - with: - script: | - const { data: response } = await github.rest.repos.getLatestRelease({ - owner: context.repo.owner, - repo: context.repo.repo, - }) - console.log(`The latest release is ${response.tag_name}`) - return response.tag_name - result-encoding: string - - - name: Get Next Version - id: nv - run: | - version=$(awk '/VERSION/ {print $3}' lib/beaker-puppet/version.rb | tr --delete \') - echo "version=$version" >> $GITHUB_OUTPUT - echo "Found version $version from lib/beaker-puppet/version.rb" - - - name: Generate Changelog - uses: docker://githubchangeloggenerator/github-changelog-generator:1.16.2 - with: - args: >- - --future-release ${{ steps.nv.outputs.version }} - env: - CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Validate Changelog - run : | - set -e - if [[ -n $(git status --porcelain) ]]; then - echo "Here is the current git status:" - git status - echo - echo "The following changes were detected:" - git --no-pager diff - echo "Uncommitted PRs found in the changelog. Please submit a release prep PR of changes after running `./update-changelog`" - exit 1 - fi - - - name: Generate Release Notes - uses: docker://githubchangeloggenerator/github-changelog-generator:1.16.2 - with: - args: >- - --since-tag ${{ steps.cv.outputs.result }} - --future-release ${{ steps.nv.outputs.version }} - --output release-notes.md - env: - CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Tag Release - uses: ncipollo/release-action@v1 - with: - tag: ${{ steps.nv.outputs.version }} - token: ${{ secrets.GITHUB_TOKEN }} - bodyfile: release-notes.md - draft: false - prerelease: false - - name: Install Ruby 3.0 uses: ruby/setup-ruby@v1 with: - ruby-version: '3.0' - + ruby-version: '3.0' + env: + BUNDLE_WITHOUT: release - name: Build gem run: gem build --strict --verbose *.gemspec - - - name: Configure credentials - run: | - mkdir -p $HOME/.gem - touch $HOME/.gem/credentials - chmod 0600 $HOME/.gem/credentials - printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials - printf -- ":github: Bearer ${{ secrets.GITHUB_TOKEN }}\n" > $HOME/.gem/credentials - env: - GEM_HOST_API_KEY: '${{ secrets.RUBYGEMS_AUTH_TOKEN }}' - - name: Publish gem to rubygems.org run: gem push *.gem - + env: + GEM_HOST_API_KEY: '${{ secrets.RUBYGEMS_AUTH_TOKEN }}' + - name: Setup GitHub packages access + run: | + mkdir -p ~/.gem + echo ":github: Bearer ${{ secrets.GITHUB_TOKEN }}" >> ~/.gem/credentials + chmod 0600 ~/.gem/credentials - name: Publish gem to GitHub packages run: gem push --key github --host https://rubygems.pkg.github.com/voxpupuli *.gem From 993f9a86870e99af8482f3dcccc2b5e883c6130f Mon Sep 17 00:00:00 2001 From: Michael Hashizume Date: Wed, 14 Feb 2024 15:32:41 -0800 Subject: [PATCH 2/3] Update repository owner to puppetlabs --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e730453..0e79f51 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ on: jobs: release: runs-on: ubuntu-latest - if: github.repository_owner == 'voxpupuli' + if: github.repository_owner == 'puppetlabs' steps: - uses: actions/checkout@v4 - name: Install Ruby 3.0 From 6383b4500545cfc97d7dda38bbfac82788e2014c Mon Sep 17 00:00:00 2001 From: Michael Hashizume Date: Wed, 14 Feb 2024 15:31:29 -0800 Subject: [PATCH 3/3] release 3.0.0 --- CHANGELOG.md | 19 +++++++++++++++++++ lib/beaker-puppet/version.rb | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a9d611c..d639f86 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,25 @@ All notable changes to this project will be documented in this file. +## [3.0.0](https://github.com/puppetlabs/beaker-puppet/tree/3.0.0) (2024-02-14) + +[Full Changelog](https://github.com/puppetlabs/beaker-puppet/compare/2.0.0...3.0.0) + +**Breaking changes:** + +- Beaker 5 compatibility [\#240](https://github.com/puppetlabs/beaker-puppet/pull/240) ([mhashizume](https://github.com/mhashizume)) + +**Implemented enhancements:** + +- Add the ability to install puppet-agent from a local dev build [\#239](https://github.com/puppetlabs/beaker-puppet/pull/239) ([joshcooper](https://github.com/joshcooper)) +- Add Amazon linux 2023 platform support [\#228](https://github.com/puppetlabs/beaker-puppet/pull/228) ([span786](https://github.com/span786)) + +**Fixed bugs:** + +- Ensure post-suite and destroy execute [\#238](https://github.com/puppetlabs/beaker-puppet/pull/238) ([joshcooper](https://github.com/joshcooper)) +- fix beaker exec when called from bundle exec [\#232](https://github.com/puppetlabs/beaker-puppet/pull/232) ([h0tw1r3](https://github.com/h0tw1r3)) +- Loosen expectations while attempting to delete puppet related files [\#225](https://github.com/puppetlabs/beaker-puppet/pull/225) ([tvpartytonight](https://github.com/tvpartytonight)) + ## [2.0.0](https://github.com/voxpupuli/beaker-puppet/tree/2.0.0) (2023-05-05) [Full Changelog](https://github.com/voxpupuli/beaker-puppet/compare/1.29.0...2.0.0) diff --git a/lib/beaker-puppet/version.rb b/lib/beaker-puppet/version.rb index 2ca7d1c..3096c79 100644 --- a/lib/beaker-puppet/version.rb +++ b/lib/beaker-puppet/version.rb @@ -1,3 +1,3 @@ module BeakerPuppet - VERSION = '2.0.0' + VERSION = '3.0.0' end