From d9f956588785e8b06dcd6c31937dacbdd20525ee Mon Sep 17 00:00:00 2001 From: Jake Spain Date: Mon, 15 Jan 2024 09:23:57 -0500 Subject: [PATCH 1/2] Remove dependabot_merge action --- .github/workflows/auto_release_prep.yml | 1 + .github/workflows/dependabot_merge.yml | 8 -------- 2 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 .github/workflows/dependabot_merge.yml diff --git a/.github/workflows/auto_release_prep.yml b/.github/workflows/auto_release_prep.yml index f0abaa6..6dd3413 100644 --- a/.github/workflows/auto_release_prep.yml +++ b/.github/workflows/auto_release_prep.yml @@ -8,4 +8,5 @@ jobs: uses: puppetlabs/release-engineering-repo-standards/.github/workflows/auto_release_prep.yml@v1 secrets: inherit with: + project-type: ruby version-file-path: lib/beaker-pe/version.rb diff --git a/.github/workflows/dependabot_merge.yml b/.github/workflows/dependabot_merge.yml deleted file mode 100644 index 75b9cea..0000000 --- a/.github/workflows/dependabot_merge.yml +++ /dev/null @@ -1,8 +0,0 @@ -name: Dependabot auto-merge - -on: pull_request - -jobs: - dependabot_merge: - uses: puppetlabs/release-engineering-repo-standards/.github/workflows/dependabot_merge.yml@v1 - secrets: inherit From 007cfda028eaf2f868d3ab075d637575fc6905dc Mon Sep 17 00:00:00 2001 From: Jake Spain Date: Fri, 19 Jan 2024 15:40:01 -0500 Subject: [PATCH 2/2] Remove interactive option from release prep script --- release-prep | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release-prep b/release-prep index ca335c7..233d499 100755 --- a/release-prep +++ b/release-prep @@ -1,12 +1,12 @@ #!/usr/bin/env bash # bundle install -docker run -it --rm \ +docker run -t --rm \ -v $(pwd):/app \ ruby:2.7-slim-bullseye \ /bin/bash -c 'apt-get update -qq && apt-get install -y --no-install-recommends build-essential git make && cd /app && gem install bundler && bundle install --jobs 3; echo "LOCK_FILE_UPDATE_EXIT_CODE=$?"' # Update Changelog -docker run -it --rm -e CHANGELOG_GITHUB_TOKEN -v $(pwd):/usr/local/src/your-app \ +docker run -t --rm -e CHANGELOG_GITHUB_TOKEN -v $(pwd):/usr/local/src/your-app \ githubchangeloggenerator/github-changelog-generator:1.16.2 \ github_changelog_generator --future-release $(grep STRING lib/beaker-pe/version.rb |rev |cut -d "'" -f2 |rev)