Merge pull request #725 from hexagontk/develop

Implement multiple :site versions
hexagontk · Sep 15, 2024 · 0ae2490 · 0ae2490
2 parents bc61b98 + cf53210
commit 0ae2490
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -35,8 +35,6 @@ on:
 jobs:
   site:
     runs-on: ubuntu-latest
-    permissions:
-      contents: write
     defaults:
       run: { shell: bash }
     steps:
@@ -59,9 +57,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