From 20eeed16366143809a46b1a89c6c9ddc14a613dc Mon Sep 17 00:00:00 2001 From: Ansel Robateau Date: Wed, 11 Dec 2024 14:14:28 -0600 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=F0=9F=90=9B=20remove=20debug=20step?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/tag-tickets-with-release.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tag-tickets-with-release.yml b/.github/workflows/tag-tickets-with-release.yml index b84cfad..7165104 100644 --- a/.github/workflows/tag-tickets-with-release.yml +++ b/.github/workflows/tag-tickets-with-release.yml @@ -41,6 +41,14 @@ jobs: - name: create prompt id: create_prompt run: | + RELEASE_BRANCH=release/v$(${{ github.workspace }}/tooling/scripts/git_predict_next_version.sh) + # if the release branch exists set TARGET_BRANCH to the release branch else set it to origin/main + if git ls-remote --heads origin $RELEASE_BRANCH | grep -q $RELEASE_BRANCH; then + TARGET_BRANCH="origin/$RELEASE_BRANCH" + else + TARGET_BRANCH="${{ inputs.target-branch }}" + fi + COMMON_BRANCH=$(git merge-base $TARGET_BRANCH HEAD) COMMON_BRANCH=$(git merge-base HEAD ${TARGET_BRANCH}) DIFF="$(git log --pretty=format:'%s' ${COMMON_BRANCH}..HEAD)" LLM_PROMPT_PREFIX="Create a fun release description in 100 characters or less in one line without identifiers for the following data: @@ -58,10 +66,6 @@ jobs: with: gemini-api-key: ${{ secrets.llm-api-token }} prompt: ${{ steps.create_prompt.outputs.LLM_PROMPT }} - - name: Debug - run: echo "$MESSAGE" - env: - MESSAGE: ${{ steps.llm_action.outputs.response }} - uses: VirdocsSoftware/github-actions/.github/actions/tag-jira-release@main with: description: ${{ steps.llm_action.outputs.response }} From 6979c3d253579a2fd8a8ec5d73e17f91e5f377b0 Mon Sep 17 00:00:00 2001 From: Ansel Robateau Date: Wed, 11 Dec 2024 14:16:03 -0600 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=F0=9F=90=9B=20remove=20redundant=20?= =?UTF-8?q?line?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/tag-tickets-with-release.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/tag-tickets-with-release.yml b/.github/workflows/tag-tickets-with-release.yml index 7165104..e54fcce 100644 --- a/.github/workflows/tag-tickets-with-release.yml +++ b/.github/workflows/tag-tickets-with-release.yml @@ -49,7 +49,6 @@ jobs: TARGET_BRANCH="${{ inputs.target-branch }}" fi COMMON_BRANCH=$(git merge-base $TARGET_BRANCH HEAD) - COMMON_BRANCH=$(git merge-base HEAD ${TARGET_BRANCH}) DIFF="$(git log --pretty=format:'%s' ${COMMON_BRANCH}..HEAD)" LLM_PROMPT_PREFIX="Create a fun release description in 100 characters or less in one line without identifiers for the following data: " From ab9849ee3f8c95d8bd9ad56a13378e412b4cd47b Mon Sep 17 00:00:00 2001 From: Ansel Robateau Date: Wed, 11 Dec 2024 14:17:25 -0600 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=F0=9F=90=9B=20revert=20change?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/tag-tickets-with-release.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/tag-tickets-with-release.yml b/.github/workflows/tag-tickets-with-release.yml index e54fcce..02de1f9 100644 --- a/.github/workflows/tag-tickets-with-release.yml +++ b/.github/workflows/tag-tickets-with-release.yml @@ -41,14 +41,7 @@ jobs: - name: create prompt id: create_prompt run: | - RELEASE_BRANCH=release/v$(${{ github.workspace }}/tooling/scripts/git_predict_next_version.sh) - # if the release branch exists set TARGET_BRANCH to the release branch else set it to origin/main - if git ls-remote --heads origin $RELEASE_BRANCH | grep -q $RELEASE_BRANCH; then - TARGET_BRANCH="origin/$RELEASE_BRANCH" - else - TARGET_BRANCH="${{ inputs.target-branch }}" - fi - COMMON_BRANCH=$(git merge-base $TARGET_BRANCH HEAD) + COMMON_BRANCH=$(git merge-base HEAD ${TARGET_BRANCH}) DIFF="$(git log --pretty=format:'%s' ${COMMON_BRANCH}..HEAD)" LLM_PROMPT_PREFIX="Create a fun release description in 100 characters or less in one line without identifiers for the following data: "