Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions .github/workflows/build_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: CI

on:
push:
branches: [ master ]
branches: [ development ]
workflow_dispatch:

jobs:
Expand All @@ -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
Expand All @@ -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
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/pr-flow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: PR-BUILD
on:
workflow_call:
pull_request:
branches: [ master ]
branches: [ development ]

jobs:
PR-CHECK:
Expand All @@ -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
12 changes: 12 additions & 0 deletions .github/workflows/release-flow.yml
Original file line number Diff line number Diff line change
@@ -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
6 changes: 6 additions & 0 deletions initial/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 4 additions & 1 deletion initial/gradle.properties
Original file line number Diff line number Diff line change
@@ -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
51 changes: 0 additions & 51 deletions manifests/deployment.yaml

This file was deleted.

13 changes: 0 additions & 13 deletions manifests/service.yaml

This file was deleted.