From 223c1d7190ad0662c78c04152850a95c048a3709 Mon Sep 17 00:00:00 2001 From: dan Date: Tue, 30 Jan 2024 20:30:41 -0500 Subject: [PATCH 1/7] update java v --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 38c99af..fa40f74 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,12 +11,12 @@ jobs: options: --user root steps: - name: Checkout ${{ github.event.repository.name }} - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Maven uses: stCarolas/setup-maven@v4.5 with: maven-version: 3.8.2 - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: java-version: '21' distribution: 'temurin' From fb2370232acb0b97c87a95157e269afe1b2ac30b Mon Sep 17 00:00:00 2001 From: dan Date: Tue, 30 Jan 2024 20:40:55 -0500 Subject: [PATCH 2/7] update java v --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fa40f74..c0cf467 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ jobs: jpo-security-svcs: runs-on: ubuntu-latest container: - image: maven:3.8-eclipse-temurin-21-alpine + image: openjdk:21-jdk-slim-buster options: --user root steps: - name: Checkout ${{ github.event.repository.name }} From 14eaa98214293dcf86fcca06c391aa1edebcf088 Mon Sep 17 00:00:00 2001 From: dan Date: Tue, 30 Jan 2024 23:03:46 -0500 Subject: [PATCH 3/7] update ci --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c0cf467..d9111e5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -74,7 +74,7 @@ jobs: sonar.java.binaries=home/runner/work/jpo-security-svcs/jpo-security-svcs/target sonar.projectBaseDir=$GITHUB_WORKSPACE sonar.projectKey=usdot-jpo-ode_jpo-security-svcs - sonar.organization=usdot-jpo-ode-1 + sonar.organization=usdot-jpo-ode jpo-security-svcs.sonar.projectBaseDir = home/runner/work/jpo-security-svcs/jpo-security-svcs jpo-security-svcs.sonar.sources = src tmca-tester.sonar.projectBaseDir=$GITHUB_WORKSPACE /tmca-tester From 9f68cffece241edf8ad6d7b13ac04c5a8ff673e5 Mon Sep 17 00:00:00 2001 From: dan Date: Tue, 30 Jan 2024 23:08:12 -0500 Subject: [PATCH 4/7] update ci --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d9111e5..f8cf0e2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -63,7 +63,7 @@ jobs: run: | find "$GITHUB_WORKSPACE" -name "jacoco.xml" - name: Setup SonarScanner - uses: warchant/setup-sonar-scanner@v4 + uses: warchant/setup-sonar-scanner@v7 with: version: 4.8.0.2856 - name: Generate sonar properties file From 0b469bfd701bb23adf8d1373caa9cbd29c8a1a01 Mon Sep 17 00:00:00 2001 From: dan Date: Wed, 31 Jan 2024 09:35:57 -0500 Subject: [PATCH 5/7] update ci --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f8cf0e2..25bdf01 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,7 +65,7 @@ jobs: - name: Setup SonarScanner uses: warchant/setup-sonar-scanner@v7 with: - version: 4.8.0.2856 + version: 5.0.1.3006 - name: Generate sonar properties file run: | cat < /tmp/sonar-scanner.properties From aa0580f6c266181b72027c366e6dfb2062ca6549 Mon Sep 17 00:00:00 2001 From: dan Date: Wed, 31 Jan 2024 10:27:27 -0500 Subject: [PATCH 6/7] update action workflow --- .github/workflows/ci.yml | 4 +++- .github/workflows/docker.yml | 6 +----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 25bdf01..fa9d2e8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,7 +1,9 @@ name: CI -on: +on: pull_request: + types: [opened, reopened, synchronize] push: + branches: [develop, master] jobs: jpo-security-svcs: diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 6eb81d8..38cb830 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -1,12 +1,8 @@ name: Docker build on: - push: - branches-ignore: - - "develop" - - "master" - - "release/*" pull_request: + types: [opened, synchronize, reopened] jobs: jpo-security-svcs: From a54662f5e2f95b15f480dec050a22ce2a7cc10e0 Mon Sep 17 00:00:00 2001 From: dan Date: Wed, 31 Jan 2024 11:58:20 -0500 Subject: [PATCH 7/7] attempt to fix java v --- .github/workflows/ci.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fa9d2e8..d864bf6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,11 +17,7 @@ jobs: - name: Set up Maven uses: stCarolas/setup-maven@v4.5 with: - maven-version: 3.8.2 - - uses: actions/setup-java@v4 - with: - java-version: '21' - distribution: 'temurin' + maven-version: 3.8.2 - name: Build run: | cd $GITHUB_WORKSPACE