diff --git a/.github/workflows/gke-cd.yaml b/.github/workflows/gke-cd.yaml index 125bf3f3..98870c38 100644 --- a/.github/workflows/gke-cd.yaml +++ b/.github/workflows/gke-cd.yaml @@ -1,12 +1,8 @@ name: Continuous Deploy with GKE on: - workflow_run: - workflows: [CI with test coverage] - types: - - completed + pull_request: branches: - - develop - main defaults: @@ -14,9 +10,44 @@ defaults: working-directory: ./ jobs: - docker: + Test-Coverage-Result: + runs-on: ubuntu-22.04 + steps: + - uses: actions/checkout@v3 + - name: Set up Corretto openJDK 17 + uses: actions/setup-java@v3 # check specific version in https://github.com/actions/setup-java + with: + distribution: 'corretto' + java-version: '17' + + - name: Gradle caching + uses: actions/cache@v3 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + restore-keys: | + ${{ runner.os }}-gradle- + + - name: Grant execute permission for gradlew + run: chmod +x ./gradlew + + - name: Build and test project + run: ./gradlew clean test + + - name: Comment jacoco test coverage to pull request + id: jacoco + uses: madrapps/jacoco-report@v1.2 + with: + title: 📝 Test code-coverage reports + paths: ${{ github.workspace }}/bm-controller/build/reports/jacoco/test/jacocoTestReport.xml + token: ${{ secrets.GITHUB_TOKEN }} + min-coverage-overall: 60 + min-coverage-changed-files: 60 + pass-emoji: ✅ + Deploy-to-GKE: runs-on: ubuntu-latest - if: ${{ github.event.workflow_run.conclusion == 'success' }} steps: - name: Checkout uses: actions/checkout@v4 @@ -43,12 +74,6 @@ jobs: - name: Build and test project run: ./gradlew build -# - name: Set up QEMU -# uses: docker/setup-qemu-action@v3 -# -# - name: Set up Docker Buildx -# uses: docker/setup-buildx-action@v3 - - name: Build docker image and push run: bash ./script/img_push_multi_arch.sh -u ${{ secrets.DOCKERHUB_USERNAME }} -t ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/.github/workflows/gradle-ci.yaml b/.github/workflows/gradle-ci.yaml index 0465ef7a..feac9303 100644 --- a/.github/workflows/gradle-ci.yaml +++ b/.github/workflows/gradle-ci.yaml @@ -4,7 +4,6 @@ on: pull_request: branches: - "develop**" - - "main" jobs: Test-Coverage-Result: