diff --git a/.github/workflows/release-changelog.yaml b/.github/workflows/release-changelog.yaml index 1de0bd8..049f062 100644 --- a/.github/workflows/release-changelog.yaml +++ b/.github/workflows/release-changelog.yaml @@ -21,9 +21,6 @@ jobs: - name: Setup Task uses: arduino/setup-task@v2 - - name: Check or create branch - run: task check_changelog_branch - - name: Generate changelog uses: orhun/git-cliff-action@v3 with: diff --git a/.github/workflows/update-changelog.yaml b/.github/workflows/update-changelog.yaml index 486789f..b52a303 100644 --- a/.github/workflows/update-changelog.yaml +++ b/.github/workflows/update-changelog.yaml @@ -25,9 +25,6 @@ jobs: - name: Setup Task uses: arduino/setup-task@v2 - - name: Check or create branch - run: task check_changelog_branch - - name: Generate changelog uses: orhun/git-cliff-action@v3 with: @@ -42,4 +39,4 @@ jobs: git config --global user.email 'github-actions@github.com' git add CHANGELOG.md git commit -m "Update CHANGELOG.md" - git push https://github.com/${{ github.repository }}.git HEAD:update-changelog + git push https://github.com/${{ github.repository }}.git HEAD:main diff --git a/Taskfile.yml b/Taskfile.yml index 655708d..a03d1b8 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -78,8 +78,3 @@ tasks: cmds: - | rm -rf ./result - check_changelog_branch: - desc: 'Check for a changelog branch' - cmds: - - | - if git ls-remote origin update-changelog | grep -sw "update-changelog" 2>&1>/dev/null; then git checkout origin/update-changelog ; else git checkout -b update-changelog ; fi