From 2f36de51d5354d25ae7291a3542db827d71c9ad3 Mon Sep 17 00:00:00 2001 From: anhefti Date: Thu, 23 Sep 2021 11:07:11 +0200 Subject: [PATCH 1/3] fixed version with build number --- .github/workflows/buildReporting.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/buildReporting.yml b/.github/workflows/buildReporting.yml index a05e8867..489c1694 100644 --- a/.github/workflows/buildReporting.yml +++ b/.github/workflows/buildReporting.yml @@ -85,7 +85,7 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Build with Maven - run: mvn clean install -Dmaven.test.skip=true -Dsebserver-version="${{ env.TAG_NAME }}" + run: mvn clean install -Dmaven.test.skip=true -Dsebserver-version="${{ env.TAG_NAME }} (${{ env.SHA }})" env: sebserver-version: ${{ env.TAG_NAME }} (${{ env.SHA }}) - From 0da45a087a00e3dc4cce339b9495c5e292660fa4 Mon Sep 17 00:00:00 2001 From: anhefti Date: Thu, 23 Sep 2021 11:18:00 +0200 Subject: [PATCH 2/3] fix docker build --- .github/workflows/buildReporting.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/buildReporting.yml b/.github/workflows/buildReporting.yml index 489c1694..d08c4e4c 100644 --- a/.github/workflows/buildReporting.yml +++ b/.github/workflows/buildReporting.yml @@ -90,7 +90,7 @@ jobs: sebserver-version: ${{ env.TAG_NAME }} (${{ env.SHA }}) - name: Simplify package name - run: mv target/seb-server-${{ env.TAG_NAME }}.jar target/seb-server.jar + run: mv target/seb-server-${{ env.TAG_NAME }} (${{ env.SHA }}).jar target/seb-server.jar - uses: actions/upload-artifact@v2 with: From dae6ff1df658ed8c7b58fdd5eecf4edcd179c80c Mon Sep 17 00:00:00 2001 From: anhefti Date: Thu, 23 Sep 2021 11:24:31 +0200 Subject: [PATCH 3/3] fixed docker build --- .github/workflows/buildReporting.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/buildReporting.yml b/.github/workflows/buildReporting.yml index d08c4e4c..700dfb38 100644 --- a/.github/workflows/buildReporting.yml +++ b/.github/workflows/buildReporting.yml @@ -85,12 +85,12 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Build with Maven - run: mvn clean install -Dmaven.test.skip=true -Dsebserver-version="${{ env.TAG_NAME }} (${{ env.SHA }})" + run: mvn clean install -Dmaven.test.skip=true -Dsebserver-version="${{ env.TAG_NAME }}-${{ env.SHA }}" env: - sebserver-version: ${{ env.TAG_NAME }} (${{ env.SHA }}) + sebserver-version: ${{ env.TAG_NAME }}-${{ env.SHA }} - name: Simplify package name - run: mv target/seb-server-${{ env.TAG_NAME }} (${{ env.SHA }}).jar target/seb-server.jar + run: mv target/seb-server-${{ env.TAG_NAME }}-${{ env.SHA }}.jar target/seb-server.jar - uses: actions/upload-artifact@v2 with: