Snapshot builds on branches fail enonic/xp-distro#178

enonic · Aug 3, 2021 · 01a49ee · 01a49ee
1 parent fb0ea96
commit 01a49ee
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -14,17 +14,12 @@ jobs:
     outputs:
       publish: ${{ steps.publish_vars.outputs.release != 'true' && (env.ACTUAL_GITHUB_REF == 'refs/heads/master' || startsWith(env.ACTUAL_GITHUB_REF, 'refs/heads/7.')) }}
       repo: ${{ steps.publish_vars.outputs.repo }}
-      ref: ${{ env.ACTUAL_GITHUB_REF }}
 
-    steps:
-      - name: Extract actual github.ref
-        run: echo "ACTUAL_GITHUB_REF=${CLIENT_PAYLOAD_REF:-$GITHUB_REF}" >> $GITHUB_ENV
-        env:
-          CLIENT_PAYLOAD_REF: ${{ github.event.client_payload.ref }}
 
+    steps:
       - uses: actions/checkout@v2
         with:
-          ref: ${{ env.ACTUAL_GITHUB_REF }}
+          ref: ${{ github.event.client_payload.ref || github.ref }}
 
       - name: Get publishing variables
         id: publish_vars
@@ -40,7 +35,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
         with:
-          ref: ${{ needs.publish_vars.outputs.ref }}
+          ref: ${{ github.event.client_payload.ref || github.ref }}
 
       - name: Set up JDK 11
         uses: actions/setup-java@v2