From c9feec69cfc3fba80183d5716a653aeac6575588 Mon Sep 17 00:00:00 2001 From: Roar Skinderviken Date: Sun, 7 Apr 2024 20:39:37 +0200 Subject: [PATCH] Added shadowJar target to GA-scripts --- .github/workflows/on_pre_release.yml | 6 +++--- .github/workflows/on_release.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/on_pre_release.yml b/.github/workflows/on_pre_release.yml index 178ac9722..f438f9635 100644 --- a/.github/workflows/on_pre_release.yml +++ b/.github/workflows/on_pre_release.yml @@ -27,7 +27,7 @@ jobs: key: "${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}" - name: Build with Gradle - run: ./gradlew build -Pversion=${{github.ref_name}} + run: ./gradlew -Pversion=${{github.ref_name}} build shadowJar env: GRADLE_OPTS: -Dorg.gradle.logging.level=info @@ -35,5 +35,5 @@ jobs: uses: softprops/action-gh-release@v2 with: files: | - ./konsoll/build/libs/kostra-kontrollprogram-${{github.ref_name}}.jar - ./web/build/libs/kostra-kontrollprogram-web-${{github.ref_name}}.jar \ No newline at end of file + ./konsoll/build/libs/kostra-kontrollprogram-${{github.ref_name}}-all.jar + ./web/build/libs/kostra-kontrollprogram-web-${{github.ref_name}}-all.jar \ No newline at end of file diff --git a/.github/workflows/on_release.yml b/.github/workflows/on_release.yml index 640317c30..9e2af3510 100644 --- a/.github/workflows/on_release.yml +++ b/.github/workflows/on_release.yml @@ -26,7 +26,7 @@ jobs: key: "${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}" - name: Build with Gradle - run: ./gradlew build -Pversion=${{github.ref_name}} + run: ./gradlew -Pversion=${{github.ref_name}} build shadowJar env: GRADLE_OPTS: -Dorg.gradle.logging.level=info @@ -34,5 +34,5 @@ jobs: uses: softprops/action-gh-release@v2 with: files: | - ./konsoll/build/libs/kostra-kontrollprogram-${{github.ref_name}}.jar - ./web/build/libs/kostra-kontrollprogram-web-${{github.ref_name}}.jar + ./konsoll/build/libs/kostra-kontrollprogram-${{github.ref_name}}-all.jar + ./web/build/libs/kostra-kontrollprogram-web-${{github.ref_name}}-all.jar