From 2a2d224c16bd036ae39da12ef6415e194422319e Mon Sep 17 00:00:00 2001 From: Kurt Harriger Date: Sun, 19 May 2024 15:34:52 -0600 Subject: [PATCH] fix windows artifact and release notes --- .github/workflows/ci-build-release.yml | 2 +- .github/workflows/release-notes.yml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci-build-release.yml b/.github/workflows/ci-build-release.yml index 2895b35..9b5575a 100644 --- a/.github/workflows/ci-build-release.yml +++ b/.github/workflows/ci-build-release.yml @@ -39,7 +39,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: clj-mergetool-${{ matrix.os }}-${{ matrix.arch }} - path: target/clj-mergetool + path: target/clj-mergetool${{ matrix.os == 'windows-latest' && '.exe' || '' }} if-no-files-found: error release: diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml index 2d6be7a..c523f9a 100644 --- a/.github/workflows/release-notes.yml +++ b/.github/workflows/release-notes.yml @@ -3,6 +3,10 @@ name: Generate Release Commit on: workflow_dispatch: +permissions: + contents: write + pull-requests: write + jobs: release-version: runs-on: ubuntu-latest @@ -29,15 +33,11 @@ jobs: git config --global user.name 'clj-mergetool Release Bot' git config --global user.email 'kurtharriger@gmail.com' - - name: Run Release Version Task - run: clojure -T:build release-version - - name: Create Pull Request env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | git checkout -b release-notes-branch - git add . - git commit -m "Generate release notes" + clojure -T:build release-version git push origin release-notes-branch gh pr create --title "Release Notes Update" --body "This PR contains the updated release notes" --base main --head release-notes-branch