diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 042d7f74..019b92cb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,6 +19,9 @@ jobs: java-version: 17 distribution: corretto cache: gradle + - name: Git describe + id: ghd + uses: proudust/gh-describe@v1 - name: Setup Gradle uses: gradle/gradle-build-action@v2 - name: Build @@ -36,7 +39,7 @@ jobs: - name: Upload fatJar artifact uses: actions/upload-artifact@v3 with: - name: fatJar + name: fatJar-${{ steps.ghd.outputs.describe }} path: build/libs/listFix-*-all.jar windowsBuild: name: Build deployment on Windows @@ -56,12 +59,20 @@ jobs: cache: gradle - name: Setup Gradle uses: gradle/gradle-build-action@v2 + - name: Git describe + id: ghd + uses: proudust/gh-describe@v1 - name: Build run: ./gradlew :build - name: Build Windows installers run: ./gradlew :jpackage - - name: Upload Windows exe + - name: Upload Windows exe installer uses: actions/upload-artifact@v3 with: - name: listFix-windows-exe + name: listFix-windows-installer-exe-${{ steps.ghd.outputs.describe }} path: build/jpackage/listFix()-*.exe + - name: Upload Windows binaries + uses: actions/upload-artifact@v3 + with: + name: listFix-windows-binaries-${{ steps.ghd.outputs.describe }} + path: build/jpackage/listFix() diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 8c8e7069..7f6d8aa5 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -13,6 +13,7 @@ jobs: permissions: pull-requests: write steps: + # Only works on action triggered by pull_request - name: Comment PR linking artifact uses: thollander/actions-comment-pull-request@v2 with: