re-enable combine on PRs

rzblue · Oct 3, 2024 · 0fb3c66 · 0fb3c66
1 parent f82e1c9
commit 0fb3c66
Showing 1 changed file with 5 additions and 21 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -201,9 +201,6 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Free Disk Space
-        if: |
-          github.repository == 'wpilibsuite/allwpilib' &&
-          (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))
         uses: jlumbroso/free-disk-space@main
         with:
           tool-cache: false
@@ -214,36 +211,26 @@ jobs:
           docker-images: false
           swap-storage: false
       - uses: actions/checkout@v4
-        if: |
-          github.repository == 'wpilibsuite/allwpilib' &&
-          (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))
         with:
           repository: wpilibsuite/build-tools
       - uses: actions/download-artifact@v4
-        if: |
-          github.repository == 'wpilibsuite/allwpilib' &&
-          (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))
         with:
           path: combiner/products/build/allOutputs
       - name: Flatten Artifacts
-        if: |
-          github.repository == 'wpilibsuite/allwpilib' &&
-          (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))
         run: rsync -a --delete combiner/products/build/allOutputs/*/* combiner/products/build/allOutputs/
       - name: Check version number exists
-        if: |
-          github.repository == 'wpilibsuite/allwpilib' &&
-          (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))
         run: |
           cat combiner/products/build/allOutputs/version.txt
           test -s combiner/products/build/allOutputs/version.txt
       - uses: actions/setup-java@v4
-        if: |
-          github.repository == 'wpilibsuite/allwpilib' &&
-          (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))
         with:
           distribution: 'temurin'
           java-version: 17
+      - name: Combine
+        if: |
+          !startsWith(github.ref, 'refs/tags/v') &&
+          github.ref != 'refs/heads/main'
+        run: cd combiner && ./gradlew publish -Pallwpilib
       - name: Combine (Main)
         if: |
           github.repository == 'wpilibsuite/allwpilib' &&
@@ -263,9 +250,6 @@ jobs:
           ARTIFACTORY_PUBLISH_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
           ARTIFACTORY_PUBLISH_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
       - uses: actions/upload-artifact@v4
-        if: |
-          github.repository == 'wpilibsuite/allwpilib' &&
-          (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))
         with:
           name: Maven
           path: ~/releases