Merge pull request #9 from bcgov/fix/release

fix: releases

.github/workflows/merge-main.yml

@@ -14,44 +14,9 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  tests-java:
-    name: Integrated Tests
-    if: github.event_name != 'pull_request' || !github.event.pull_request.draft
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: bcgov-nr/[email protected]
-        name: Core Coverage
-        with:
-          commands: |
-            mvn -B verify -P all-tests checkstyle:checkstyle -Dcheckstyle.skip=false --file pom.xml
-          dir: core
-          java-cache: maven
-          java-distribution: temurin
-          java-version: "17"
-          sonar_args: >
-            -Dsonar.organization=bcgov-sonarcloud
-            -Dsonar.projectKey=bcgov_nr-forest-client-commons
-          sonar_project_token: ${{ secrets.SONAR_TOKEN_COMMONS }}
-
-      - uses: bcgov-nr/[email protected]
-        name: Spring Coverage
-        with:
-          commands: |
-            mvn -B verify -P all-tests checkstyle:checkstyle -Dcheckstyle.skip=false --file pom.xml
-          dir: spring
-          java-cache: maven
-          java-distribution: temurin
-          java-version: "17"
-          sonar_args: >
-            -Dsonar.organization=bcgov-sonarcloud
-            -Dsonar.projectKey=bcgov_nr-forest-client-commons
-          sonar_project_token: ${{ secrets.SONAR_TOKEN_COMMONS }}
-
   codeql:
     name: Semantic Code Analysis
     runs-on: ubuntu-22.04
-    needs:
-      - tests-java
     permissions:
       actions: read
       contents: read
@@ -63,7 +28,7 @@ jobs:
       - name: Initialize
         uses: github/codeql-action/init@v2
         with:
-          languages: javascript,java
+          languages: java
 
       # Autobuild failed for Java, so building manually
       - name: Set up JDK 17 and Caching maven dependencies
@@ -73,14 +38,12 @@ jobs:
           java-version: "17"
           cache: "maven"
 
-      - name: Build Core
+      - name: Build Core and Spring
         run: |
           cd core
           mvn clean package
-
-      - name: Build Spring
-        run: |
-          cd spring
+          mvn install
+          cd ../spring
           mvn clean package
 
       - name: Perform CodeQL Analysis

.github/workflows/pr-close.yml

@@ -6,12 +6,10 @@ on:
       - closed
 
 concurrency:
-  # PR open and close use the same group, allowing only one at a time
-  group: pr-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.number }}
   cancel-in-progress: true
 
 jobs:
-  # Clean up OpenShift when PR closed, no conditions
   cleanup-jars:
     name: Cleanup Dev Images
     runs-on: ubuntu-22.04
@@ -38,8 +36,6 @@ jobs:
 
       - name: Checkout pr
         uses: actions/checkout@v3
-        with:
-          ref: ${{ github.ref }}
 
       - name: Removing dev core
         uses: paulushcgcj/[email protected]
@@ -59,10 +55,7 @@ jobs:
           type: maven
           name: ca.bc.gov.nrs-commons.forest-client-spring
           version: ${{ steps.changelog.outputs.version }}.PR${{ github.event.number }}
-          user:
-            ${{ github.repository_owner }}
-
-            # If merged into main, then handle any image promotions
+          user: ${{ github.repository_owner }}
 
   image-promotions:
     name: Image Promotions