From 6ca9e6dd302a8c873d273f2175eeac64bf931ddb Mon Sep 17 00:00:00 2001 From: jaguililla Date: Sun, 15 Sep 2024 23:59:39 +0200 Subject: [PATCH 1/2] Implement multiple :site versions --- .github/workflows/pull_request.yml | 2 -- .github/workflows/release.yml | 4 ++++ .github/workflows/release_branch.yml | 4 ++++ .github/workflows/site.yml | 4 +--- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 31389fa681..5f9925989c 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -21,8 +21,6 @@ jobs: tasks: jmh build_site: - permissions: - contents: write uses: hexagontk/hexagon/.github/workflows/site.yml@develop test_publishing: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7148746292..48150d3cc3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,5 +38,9 @@ jobs: build_site: uses: hexagontk/hexagon/.github/workflows/site.yml@develop needs: publish + permissions: + contents: write + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: options: -P pushSite=true diff --git a/.github/workflows/release_branch.yml b/.github/workflows/release_branch.yml index feb96d3258..6e333b66b5 100644 --- a/.github/workflows/release_branch.yml +++ b/.github/workflows/release_branch.yml @@ -37,5 +37,9 @@ jobs: push_site: uses: hexagontk/hexagon/.github/workflows/site.yml@develop needs: publish + permissions: + contents: write + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: options: -P pushSite=true diff --git a/.github/workflows/site.yml b/.github/workflows/site.yml index 2e225d904e..6f726b5e78 100644 --- a/.github/workflows/site.yml +++ b/.github/workflows/site.yml @@ -59,9 +59,7 @@ jobs: java-version: ${{ inputs.java }} cache: gradle - - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | + - run: | export GIT_COMMITTER_NAME="${GITHUB_ACTOR}" export GIT_COMMITTER_EMAIL="project@hexagontk.com" ./gradlew --stacktrace build From cf532106f6d92e1ccb514686412814cd04e859f5 Mon Sep 17 00:00:00 2001 From: jaguililla Date: Mon, 16 Sep 2024 00:04:01 +0200 Subject: [PATCH 2/2] Implement multiple :site versions --- .github/workflows/site.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/site.yml b/.github/workflows/site.yml index 6f726b5e78..0cac09bf4a 100644 --- a/.github/workflows/site.yml +++ b/.github/workflows/site.yml @@ -35,8 +35,6 @@ on: jobs: site: runs-on: ubuntu-latest - permissions: - contents: write defaults: run: { shell: bash } steps: