From 71d29abb40add7559110f0cb2abde77753807912 Mon Sep 17 00:00:00 2001 From: ctownshend Date: Mon, 5 Aug 2024 23:59:02 +1000 Subject: [PATCH 1/5] trigger build --- .github/workflows/maven.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index e5340fb..4b370a6 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -23,10 +23,10 @@ jobs: with: java-version: '11' distribution: 'zulu' - - name: Run Spotless check - run: mvn spotless:check + - name: Create WAR - run: mvn package + run: mvn clean package + - name: Sonatype Lifecycle Policy Evaluation uses: sonatype-nexus-community/iq-github-action@v2 with: From 6de2ca6053d863d07f4469ad676fc666c574d1c8 Mon Sep 17 00:00:00 2001 From: ctownshend Date: Tue, 6 Aug 2024 00:05:18 +1000 Subject: [PATCH 2/5] fix path --- .github/workflows/maven.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 4b370a6..b545712 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -8,9 +8,11 @@ jobs: build: runs-on: ubuntu-latest + defaults: + run: + working-directory: ./BenchmarkJava steps: - - name: Checkout Benchmark java uses: actions/checkout@master with: From 3e2cb212f9555c4894293d248f2295fe08e108b1 Mon Sep 17 00:00:00 2001 From: ctownshend Date: Tue, 6 Aug 2024 00:06:21 +1000 Subject: [PATCH 3/5] change folder --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index b545712..7dc7747 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest defaults: run: - working-directory: ./BenchmarkJava + working-directory: BenchmarkJava steps: - name: Checkout Benchmark java From 364362255df3ef5d09bf4e4d319d304466b99f01 Mon Sep 17 00:00:00 2001 From: ctownshend Date: Tue, 6 Aug 2024 00:11:26 +1000 Subject: [PATCH 4/5] fix paths --- .github/workflows/maven.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 7dc7747..7e89e28 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -8,16 +8,13 @@ jobs: build: runs-on: ubuntu-latest - defaults: - run: - working-directory: BenchmarkJava steps: - name: Checkout Benchmark java uses: actions/checkout@master with: repository: OWASP-Benchmark/BenchmarkJava - path: master + - name: Set up JDK 11 From 858e2d4fcec2fee1f0418b3e39981cb6c0618b04 Mon Sep 17 00:00:00 2001 From: ctownshend Date: Tue, 6 Aug 2024 00:18:12 +1000 Subject: [PATCH 5/5] use branchname as appname --- .github/workflows/maven.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 7e89e28..b830313 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -2,7 +2,8 @@ name: Java CI with Maven on: [push, pull_request] env: - SONATYPE_LIFECYCLE_APPLICATION_ID: $(echo "${{ github.repository }}" | cut -d '/' -f2) + SONATYPE_LIFECYCLE_APPLICATION_ID : ${{ github.head_ref || github.ref_name }} + # SONATYPE_LIFECYCLE_APPLICATION_ID: $(echo "${{ github.repository }}" | cut -d '/' -f2) jobs: build: