Merge pull request #2 from ksgnextuple/development

Development

.github/workflows/build_deploy.yml

@@ -2,7 +2,7 @@ name: CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ development ]
   workflow_dispatch:
 
 jobs:
@@ -20,11 +20,14 @@ jobs:
     - uses: actions/setup-java@v1
       with:
         java-version: 11
-    - name: Build Snapshot
+    - name: Build and Analyze
+      env:
+        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
       run: |
         cd initial
         export CODEARTIFACT_AUTH_TOKEN=`aws codeartifact get-authorization-token --domain test --domain-owner ${{ secrets.AWS_ACCOUNT_ID }} --query authorizationToken --output text`
-        bash ./gradlew -Pbuild_target=SNAPSHOT clean build
+        bash ./gradlew -Pbuild_target=SNAPSHOT clean build jacocoTestReport spotlessApply spotbugsMain
+        bash ./gradlew -Pbuild_target=SNAPSHOT sonarqube showSonarQubeLink --info
     - name: Login to ECR
       id: login-ecr
       uses: aws-actions/amazon-ecr-login@v1
@@ -40,7 +43,7 @@ jobs:
         docker build -t $ECR_REGISTRY/$SERVICE_NAME:$SERVICE_CODE.${{ github.sha }} .
 #        docker push $ECR_REGISTRY/$SERVICE_NAME:$SERVICE_CODE.${{ github.sha }}
 
-  DeployToDev:
+  Deploy-To-Dev:
     runs-on: ubuntu-latest
     needs: Build
     concurrency: deploy

.github/workflows/pr-flow.yml

@@ -3,7 +3,7 @@ name: PR-BUILD
 on:
   workflow_call:
   pull_request:
-    branches: [ master ]
+    branches: [ development ]
 
 jobs:
   PR-CHECK:
@@ -17,5 +17,4 @@ jobs:
       run: |
         cd initial
         bash ./gradlew -Pbuild_target=SNAPSHOT clean build jacocoTestReport spotlessApply spotbugsMain
-        bash ./gradlew -Pbuild_target=SNAPSHOT dependencyCheckAggregate --info
         bash ./gradlew -Pbuild_target=SNAPSHOT sonarqube showSonarQubeLink --info

.github/workflows/release-flow.yml

@@ -0,0 +1,12 @@
+on:
+  push:
+    branches:
+      - master
+jobs:
+  release-on-push:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: rymndhng/release-on-push-action@master
+        with:
+          bump_version_scheme: norelease

initial/build.gradle

@@ -131,6 +131,12 @@ jacocoTestReport {
 //	}
 //}
 
+task showSonarQubeLink {
+	doLast {
+		print("Checkout SonarQube report at ${getProperty("systemProp.sonar.host.url")}/dashboard?id=${getProperty("systemProp.sonar.projectKey")}\n")
+	}
+}
+
 
 artifactoryPublish.skip = true
 

initial/gradle.properties

@@ -1,3 +1,6 @@
 artifactory_contextUrl=https://test-137546367210.d.codeartifact.us-east-1.amazonaws.com/maven/spring-services/
 org.gradle.daemon=true
-org.gradle.parallel=true
+org.gradle.parallel=true
+systemProp.sonar.host.url=http://20.127.249.132
+systemProp.sonar.projectKey=rest-uservice
+systemProp.sonar.buildbreaker.skip=false