From b9efa6c219cab697b6370c007796668d9558b7cc Mon Sep 17 00:00:00 2001 From: Jack Koenig Date: Tue, 26 Nov 2024 11:42:33 -0800 Subject: [PATCH] Update CD permissions for uploading release artifacts (#4529) Also bump softprops/action-gh-release to v2.1.0. (cherry picked from commit 25d00af83080934e542d7f97c0f8d6472a1ab4d7) # Conflicts: # .github/workflows/release-notes.yml # .github/workflows/scala-cli-example.yml --- .github/workflows/release-notes.yml | 8 +++++++- .github/workflows/scala-cli-example.yml | 13 ++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml index 9535763777b..68faa825bf0 100644 --- a/.github/workflows/release-notes.yml +++ b/.github/workflows/release-notes.yml @@ -18,7 +18,13 @@ on: jobs: generate_release_notes: name: Generate Release Notes +<<<<<<< HEAD runs-on: ubuntu-latest +======= + runs-on: ubuntu-22.04 + permissions: + contents: write +>>>>>>> 25d00af83 (Update CD permissions for uploading release artifacts (#4529)) steps: - name: Checkout @@ -41,7 +47,7 @@ jobs: run: echo "$CHANGELOG" >> $GITHUB_STEP_SUMMARY - name: Upload Release Notes (on release) if: github.event_name == 'release' - uses: softprops/action-gh-release@v2.0.5 + uses: softprops/action-gh-release@v2.1.0 with: body: ${{ steps.release-notes.outputs.changelog }} - name: Error on uncategorized PRs diff --git a/.github/workflows/scala-cli-example.yml b/.github/workflows/scala-cli-example.yml index 6ef9185defa..815c60f9847 100644 --- a/.github/workflows/scala-cli-example.yml +++ b/.github/workflows/scala-cli-example.yml @@ -8,7 +8,18 @@ on: jobs: generate_scala_cli_example: name: Generate Scala CLI Example +<<<<<<< HEAD runs-on: ubuntu-latest +======= + uses: ./.github/workflows/build-scala-cli-example.yml + + publish_example: + name: Generate Chisel Scala CLI Example + needs: [generate_scala_cli_example] + runs-on: ubuntu-22.04 + permissions: + contents: write +>>>>>>> 25d00af83 (Update CD permissions for uploading release artifacts (#4529)) steps: - name: Checkout @@ -26,7 +37,7 @@ jobs: retention-days: 7 - name: Upload To Release Page if: github.event_name == 'release' - uses: softprops/action-gh-release@v2.0.5 + uses: softprops/action-gh-release@v2.1.0 with: files: chisel-example.scala