diff --git a/.github/scripts/generate_release_notes.py b/.github/scripts/generate_release_notes.py index f7d3066..50aeef3 100644 --- a/.github/scripts/generate_release_notes.py +++ b/.github/scripts/generate_release_notes.py @@ -57,7 +57,7 @@ def get_commits_since_last_tag(): return commit_logs def generate_release_notes(): - notes = "### ✨ Enhancements\n" + notes = "### ✨ Enhancements\\n" commit_logs = get_commits_since_last_tag() authorsSet = set() dependabotNotes = '' @@ -67,21 +67,21 @@ def generate_release_notes(): # Attempt to extract PR number from commit message pr_match = re.search(r'\(#(\d+)\)', message) pr_number = pr_match.group(1) if pr_match else '' - commitNote = f"* {message}\n" + commitNote = f"* {message}\\n" if dependabot in author: dependabotNotes += commitNote else: notes += commitNote authorsSet.add(author) else: - notes += "No changes were made since the last release.\n" + notes += "No changes were made since the last release.\\n" if dependabotNotes != "": - notes += "### 🔨 Dependencies\n" + notes += "### 🔨 Dependencies\\n" notes += dependabotNotes - notes += "\n\nThanks to " + getAuthorHandlesFromNames(authorsSet) - notes += "\n\nChange log " + repoUrl + "/compare/" + get_latest_tag() + "..." + calculate_next_tag() + notes += "\\n\\nThanks to " + getAuthorHandlesFromNames(authorsSet) + notes += "\\n\\nChange log " + repoUrl + "/compare/" + get_latest_tag() + "..." + calculate_next_tag() return notes if __name__ == "__main__": diff --git a/.github/workflows/create-tag-and-release.yml b/.github/workflows/create-tag-and-release.yml index a8525a3..d4e90e3 100644 --- a/.github/workflows/create-tag-and-release.yml +++ b/.github/workflows/create-tag-and-release.yml @@ -18,7 +18,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v5 with: - python-version: '3.x' + python-version: "3.x" - name: Install dependencies run: pip install PyYAML @@ -28,14 +28,14 @@ jobs: run: echo "tag=$(python .github/scripts/calculate_next_tag.py)" >> $GITHUB_OUTPUT shell: bash - - name: Generate release notes - id: generate-notes - run: | - NOTES=$(python .github/scripts/generate_release_notes.py) - NOTES="${NOTES//'%'/'%25'}" - NOTES="${NOTES//$'\n'/'%0A'}" - NOTES="${NOTES//$'\r'/'%0D'}" - echo "::set-output name=notes::$NOTES" + # - name: Generate release notes + # id: generate-notes + # run: | + # NOTES=$(python .github/scripts/generate_release_notes.py) + # NOTES="${NOTES//'%'/'%25'}" + # NOTES="${NOTES//$'\n'/'%0A'}" + # NOTES="${NOTES//$'\r'/'%0D'}" + # echo "::set-output name=notes::$NOTES" # - name: Generate release notes v1 # id: generate-notes-v1 @@ -66,12 +66,12 @@ jobs: # NOTES=$(python .github/scripts/generate_release_notes.py | base64) # echo "notes=$NOTES" >> $GITHUB_OUTPUT - # - name: Generate release notes - # id: generate-notes - # run: | - # echo "notes<> $GITHUB_OUTPUT - # python .github/scripts/generate_release_notes.py' - # echo "EOF" >> $GITHUB_OUTPUT + - name: Generate release notes + id: generate-notes + run: | + echo "notes<> $GITHUB_OUTPUT + python .github/scripts/generate_release_notes.py' + echo "EOF" >> $GITHUB_OUTPUT - name: Create the new tag run: | @@ -80,15 +80,14 @@ jobs: git tag ${{ steps.next-tag.outputs.tag }} git push origin ${{ steps.next-tag.outputs.tag }} - - name: Release uses: softprops/action-gh-release@v2 env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: draft: false prerelease: false - generate_release_notes: false + generate_release_notes: false make_latest: true tag_name: ${{ steps.next-tag.outputs.tag }} name: ${{ steps.next-tag.outputs.tag }}