From d24ea00f56a85816c704125a39f37e88c05ce372 Mon Sep 17 00:00:00 2001 From: Emily Rockman Date: Wed, 4 Jun 2025 16:18:49 -0500 Subject: [PATCH 1/5] Create test-auto-merge.yml --- .github/workflows/test-auto-merge.yml | 116 ++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 .github/workflows/test-auto-merge.yml diff --git a/.github/workflows/test-auto-merge.yml b/.github/workflows/test-auto-merge.yml new file mode 100644 index 00000000..776bef96 --- /dev/null +++ b/.github/workflows/test-auto-merge.yml @@ -0,0 +1,116 @@ +# **what?** +# Generate changelog.md files for the CLI, LSP, and dbt-fusion. + +# **why?** +# Generate changelog.md files for the CLI, LSP, and dbt-fusion. + +# **when?** +# Called by other workflows or manually. + + +name: "Generate Changelog.md" + +on: + workflow_dispatch: + inputs: + version: + description: "Version to generate changelog for" + type: string + required: true + dry_run: + description: "Whether to run the workflow in dry run mode" + type: boolean + required: false + default: false + branch: + description: "Branch to create the changelog PR on" + type: string + required: true + + workflow_call: + inputs: + version: + description: "Version to generate changelog for" + type: string + required: true + dry_run: + description: "Whether to run the workflow in dry run mode" + type: boolean + required: false + default: false + branch: + description: "Branch to create the changelog PR on" + type: string + required: true + +permissions: + contents: write + checks: write + +defaults: + run: + shell: bash --noprofile --norc -euo pipefail {0} + +env: + NOTIFICATION_PREFIX: "[Changelog Generation]" + +jobs: + generate-changelog: + runs-on: ubuntu-latest + steps: + - name: "Checkout ${{ github.repository }}" + uses: actions/checkout@v4 + + - name: "Add Homebrew To PATH" + run: | + echo "/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin" >> $GITHUB_PATH + + - name: "Install Homebrew Packages" + run: | + brew tap miniscruff/changie https://github.com/miniscruff/changie + brew install changie + + - name: "Generate Changelog" + run: | + changie batch ${{ inputs.version }} + changie merge + + - name: Create Pull Request + id: create_pull_request + uses: peter-evans/create-pull-request@v7 + with: + token: ${{ secrets.MY_PAT_TOKEN }} #this shouldn't be github token so it triggers on pull request workflows + commit-message: "chore: update changelog for ${{ inputs.version }}" + title: "Update changelog for ${{ inputs.version }}" + body: | + This PR updates the changelog for ${{ inputs.version }}. + + This is an automated PR created by the release workflow. + branch: ${{ inputs.branch }} + base: main + + - name: "PR Notification" + run: | + title="Changelog PR Created" + message="Changelog PR created for ${{ inputs.version }} at ${{ steps.create_pull_request.outputs.pull-request-url }}" + echo "::notice title=${{ env.NOTIFICATION_PREFIX }}: $title::$message" + + - name: "Give CI a chance to start" + if: ${{ inputs.dry_run == false }} + run: | + sleep 120 + + - name: "Monitor CI for completion" + if: ${{ inputs.dry_run == false }} + shell: bash + env: + GH_TOKEN: ${{ secrets.FA_ASSISTANT_CI_WORKFLOW_PAT_TOKEN }} + run: | + gh pr checks ${{ steps.create_pull_request.outputs.pull-request-number }} --watch --fail-fast + + - name: "Auto merge fs version bump PR" + if: ${{ inputs.dry_run == false }} + env: + GH_TOKEN: ${{ secrets.FA_ASSISTANT_CI_WORKFLOW_PAT_TOKEN }} + run: | + gh pr merge "${{ steps.create_pull_request.outputs.pull-request-number }}" --squash --admin --repo ${{ github.repository }} From 2d0b8ff2641452278fb81b45a46efe4d4b1a0cbb Mon Sep 17 00:00:00 2001 From: Emily Rockman Date: Wed, 4 Jun 2025 16:23:40 -0500 Subject: [PATCH 2/5] stop workflow run --- .github/workflows/testing-path-changes.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/testing-path-changes.yml b/.github/workflows/testing-path-changes.yml index 4df5d361..6f5996d3 100644 --- a/.github/workflows/testing-path-changes.yml +++ b/.github/workflows/testing-path-changes.yml @@ -11,7 +11,8 @@ name: Check Component Changes on: - pull_request: + # pull_request: + workflow_dispatch: permissions: read-all From a3b2b4ba830a08ed1a294181effaee10616a8dcf Mon Sep 17 00:00:00 2001 From: Emily Rockman Date: Wed, 4 Jun 2025 16:26:13 -0500 Subject: [PATCH 3/5] fix token --- .github/workflows/test-auto-merge.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-auto-merge.yml b/.github/workflows/test-auto-merge.yml index 776bef96..89f781a4 100644 --- a/.github/workflows/test-auto-merge.yml +++ b/.github/workflows/test-auto-merge.yml @@ -104,13 +104,13 @@ jobs: if: ${{ inputs.dry_run == false }} shell: bash env: - GH_TOKEN: ${{ secrets.FA_ASSISTANT_CI_WORKFLOW_PAT_TOKEN }} + GH_TOKEN: ${{ secrets.MY_PAT_TOKEN }} run: | gh pr checks ${{ steps.create_pull_request.outputs.pull-request-number }} --watch --fail-fast - name: "Auto merge fs version bump PR" if: ${{ inputs.dry_run == false }} env: - GH_TOKEN: ${{ secrets.FA_ASSISTANT_CI_WORKFLOW_PAT_TOKEN }} + GH_TOKEN: ${{ secrets.MY_PAT_TOKEN }} run: | gh pr merge "${{ steps.create_pull_request.outputs.pull-request-number }}" --squash --admin --repo ${{ github.repository }} From 4ef7915b629b7c2ee4143537e05f35fb45fce73f Mon Sep 17 00:00:00 2001 From: Emily Rockman Date: Wed, 4 Jun 2025 16:27:21 -0500 Subject: [PATCH 4/5] use existing token --- .github/workflows/test-auto-merge.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-auto-merge.yml b/.github/workflows/test-auto-merge.yml index 89f781a4..9dfc9467 100644 --- a/.github/workflows/test-auto-merge.yml +++ b/.github/workflows/test-auto-merge.yml @@ -79,7 +79,7 @@ jobs: id: create_pull_request uses: peter-evans/create-pull-request@v7 with: - token: ${{ secrets.MY_PAT_TOKEN }} #this shouldn't be github token so it triggers on pull request workflows + token: ${{ secrets.FISHTOWN_BOT_PAT }} #this shouldn't be github token so it triggers on pull request workflows commit-message: "chore: update changelog for ${{ inputs.version }}" title: "Update changelog for ${{ inputs.version }}" body: | @@ -104,13 +104,13 @@ jobs: if: ${{ inputs.dry_run == false }} shell: bash env: - GH_TOKEN: ${{ secrets.MY_PAT_TOKEN }} + GH_TOKEN: ${{ secrets.FISHTOWN_BOT_PAT }} run: | gh pr checks ${{ steps.create_pull_request.outputs.pull-request-number }} --watch --fail-fast - name: "Auto merge fs version bump PR" if: ${{ inputs.dry_run == false }} env: - GH_TOKEN: ${{ secrets.MY_PAT_TOKEN }} + GH_TOKEN: ${{ secrets.FISHTOWN_BOT_PAT }} run: | gh pr merge "${{ steps.create_pull_request.outputs.pull-request-number }}" --squash --admin --repo ${{ github.repository }} From d6ba0e85b03c5b3f79369d212d1ac88d95e6c889 Mon Sep 17 00:00:00 2001 From: Emily Rockman Date: Wed, 4 Jun 2025 16:29:36 -0500 Subject: [PATCH 5/5] fix changelog --- .changes/unreleased/Breaking Changes-20250604-162923.yaml | 6 ++++++ .changes/unreleased/Bug-20220710-200314.yaml | 8 -------- .changes/unreleased/Changed-20220506-161949.yaml | 7 ------- .changes/unreleased/Dependency-20220830-190314.yaml | 7 ------- .changes/unreleased/Dependency-20220830-193220.yaml | 7 ------- .changes/unreleased/Dependency-20220831-012830.yaml | 7 ------- .changes/unreleased/Dependency-20220831-013132.yaml | 7 ------- .changes/unreleased/Dependency-20220831-013138.yaml | 7 ------- .changes/unreleased/Dependency-20220831-014159.yaml | 7 ------- .changes/unreleased/Dependency-20220831-014336.yaml | 7 ------- .changes/unreleased/Dependency-20220831-032125.yaml | 7 ------- .changes/unreleased/Dependency-20220831-152708.yaml | 7 ------- .changes/unreleased/Dependency-20220831-152751.yaml | 7 ------- .changes/unreleased/Dependency-20220831-180142.yaml | 7 ------- .changes/unreleased/Dependency-20220906-135103.yaml | 7 ------- 15 files changed, 6 insertions(+), 99 deletions(-) create mode 100644 .changes/unreleased/Breaking Changes-20250604-162923.yaml delete mode 100644 .changes/unreleased/Bug-20220710-200314.yaml delete mode 100644 .changes/unreleased/Changed-20220506-161949.yaml delete mode 100644 .changes/unreleased/Dependency-20220830-190314.yaml delete mode 100644 .changes/unreleased/Dependency-20220830-193220.yaml delete mode 100644 .changes/unreleased/Dependency-20220831-012830.yaml delete mode 100644 .changes/unreleased/Dependency-20220831-013132.yaml delete mode 100644 .changes/unreleased/Dependency-20220831-013138.yaml delete mode 100644 .changes/unreleased/Dependency-20220831-014159.yaml delete mode 100644 .changes/unreleased/Dependency-20220831-014336.yaml delete mode 100644 .changes/unreleased/Dependency-20220831-032125.yaml delete mode 100644 .changes/unreleased/Dependency-20220831-152708.yaml delete mode 100644 .changes/unreleased/Dependency-20220831-152751.yaml delete mode 100644 .changes/unreleased/Dependency-20220831-180142.yaml delete mode 100644 .changes/unreleased/Dependency-20220906-135103.yaml diff --git a/.changes/unreleased/Breaking Changes-20250604-162923.yaml b/.changes/unreleased/Breaking Changes-20250604-162923.yaml new file mode 100644 index 00000000..ed4513e7 --- /dev/null +++ b/.changes/unreleased/Breaking Changes-20250604-162923.yaml @@ -0,0 +1,6 @@ +kind: Breaking Changes +body: test +time: 2025-06-04T16:29:23.291377-05:00 +custom: + Author: emmyoop + Issue: "1" diff --git a/.changes/unreleased/Bug-20220710-200314.yaml b/.changes/unreleased/Bug-20220710-200314.yaml deleted file mode 100644 index c4e6eda5..00000000 --- a/.changes/unreleased/Bug-20220710-200314.yaml +++ /dev/null @@ -1,8 +0,0 @@ -kind: Bug -body: "Test changie action" -time: 2022-07-10T20:03:14.00000Z -custom: - Field 1: Some String - Field 2: 1 - Field 3: a - diff --git a/.changes/unreleased/Changed-20220506-161949.yaml b/.changes/unreleased/Changed-20220506-161949.yaml deleted file mode 100644 index b1d41cd0..00000000 --- a/.changes/unreleased/Changed-20220506-161949.yaml +++ /dev/null @@ -1,7 +0,0 @@ -kind: Changed -body: Something is different. -time: 2022-05-06T16:19:49.354613-05:00 -custom: - Field 1: This is why - Field 2: "5" - Field 3: a diff --git a/.changes/unreleased/Dependency-20220830-190314.yaml b/.changes/unreleased/Dependency-20220830-190314.yaml deleted file mode 100644 index 566ee73a..00000000 --- a/.changes/unreleased/Dependency-20220830-190314.yaml +++ /dev/null @@ -1,7 +0,0 @@ -kind: Dependency -body: "Update new_file.py" -time: 2022-08-30T19:03:14.00000Z -custom: - Author: emmyoop - Issue: 4904 - PR: 21 diff --git a/.changes/unreleased/Dependency-20220830-193220.yaml b/.changes/unreleased/Dependency-20220830-193220.yaml deleted file mode 100644 index f1f6e224..00000000 --- a/.changes/unreleased/Dependency-20220830-193220.yaml +++ /dev/null @@ -1,7 +0,0 @@ -kind: Dependency -body: "Update new_file.py" -time: 2022-08-30T19:32:20.00000Z -custom: - Author: emmyoop - Issue: 4904 - PR: 21 diff --git a/.changes/unreleased/Dependency-20220831-012830.yaml b/.changes/unreleased/Dependency-20220831-012830.yaml deleted file mode 100644 index b574788c..00000000 --- a/.changes/unreleased/Dependency-20220831-012830.yaml +++ /dev/null @@ -1,7 +0,0 @@ -kind: Dependency -body: "Emmyoop patch 1" -time: 2022-08-31T01:28:30.00000Z -custom: - Author: emmyoop - Issue: 4904 - PR: 22 diff --git a/.changes/unreleased/Dependency-20220831-013132.yaml b/.changes/unreleased/Dependency-20220831-013132.yaml deleted file mode 100644 index f9ea5ca4..00000000 --- a/.changes/unreleased/Dependency-20220831-013132.yaml +++ /dev/null @@ -1,7 +0,0 @@ -kind: Dependency -body: "dummy" -time: 2022-08-31T01:31:32.00000Z -custom: - Author: emmyoop - Issue: 4904 - PR: 23 diff --git a/.changes/unreleased/Dependency-20220831-013138.yaml b/.changes/unreleased/Dependency-20220831-013138.yaml deleted file mode 100644 index 1cc3cbe4..00000000 --- a/.changes/unreleased/Dependency-20220831-013138.yaml +++ /dev/null @@ -1,7 +0,0 @@ -kind: Dependency -body: "dummy" -time: 2022-08-31T01:31:38.00000Z -custom: - Author: emmyoop - Issue: 4904 - PR: 23 diff --git a/.changes/unreleased/Dependency-20220831-014159.yaml b/.changes/unreleased/Dependency-20220831-014159.yaml deleted file mode 100644 index 63cebc54..00000000 --- a/.changes/unreleased/Dependency-20220831-014159.yaml +++ /dev/null @@ -1,7 +0,0 @@ -kind: Dependency -body: "dummy" -time: 2022-08-31T01:41:59.00000Z -custom: - Author: emmyoop - Issue: 4904 - PR: 23 diff --git a/.changes/unreleased/Dependency-20220831-014336.yaml b/.changes/unreleased/Dependency-20220831-014336.yaml deleted file mode 100644 index a8a7d68b..00000000 --- a/.changes/unreleased/Dependency-20220831-014336.yaml +++ /dev/null @@ -1,7 +0,0 @@ -kind: Dependency -body: "dummy" -time: 2022-08-31T01:43:36.00000Z -custom: - Author: emmyoop - Issue: 4904 - PR: 24 diff --git a/.changes/unreleased/Dependency-20220831-032125.yaml b/.changes/unreleased/Dependency-20220831-032125.yaml deleted file mode 100644 index 2f3dd589..00000000 --- a/.changes/unreleased/Dependency-20220831-032125.yaml +++ /dev/null @@ -1,7 +0,0 @@ -kind: Dependency -body: "Emmyoop patch 5" -time: 2022-08-31T03:21:25.00000Z -custom: - Author: emmyoop - Issue: 4904 - PR: 36 diff --git a/.changes/unreleased/Dependency-20220831-152708.yaml b/.changes/unreleased/Dependency-20220831-152708.yaml deleted file mode 100644 index d49dcd03..00000000 --- a/.changes/unreleased/Dependency-20220831-152708.yaml +++ /dev/null @@ -1,7 +0,0 @@ -kind: "Dependency" -body: "change" -time: $(date +%Y-%m-%dT%H:%M:%S.00000Z) -custom: - Author: emmyoop - Issue: 4904 - PR: 40 diff --git a/.changes/unreleased/Dependency-20220831-152751.yaml b/.changes/unreleased/Dependency-20220831-152751.yaml deleted file mode 100644 index d49dcd03..00000000 --- a/.changes/unreleased/Dependency-20220831-152751.yaml +++ /dev/null @@ -1,7 +0,0 @@ -kind: "Dependency" -body: "change" -time: $(date +%Y-%m-%dT%H:%M:%S.00000Z) -custom: - Author: emmyoop - Issue: 4904 - PR: 40 diff --git a/.changes/unreleased/Dependency-20220831-180142.yaml b/.changes/unreleased/Dependency-20220831-180142.yaml deleted file mode 100644 index 18e577e8..00000000 --- a/.changes/unreleased/Dependency-20220831-180142.yaml +++ /dev/null @@ -1,7 +0,0 @@ -kind: "Dependency" -body: "change" -time: $(date +%Y-%m-%dT%H:%M:%S.00000Z) -custom: - Author: emmyoop - Issue: 4904 - PR: 41 diff --git a/.changes/unreleased/Dependency-20220906-135103.yaml b/.changes/unreleased/Dependency-20220906-135103.yaml deleted file mode 100644 index d27b57a7..00000000 --- a/.changes/unreleased/Dependency-20220906-135103.yaml +++ /dev/null @@ -1,7 +0,0 @@ -kind: "Dependency" -body: "change" -time: 2022-09-06T13:51:03.00000Z -custom: - Author: emmyoop - Issue: - PR: 46