diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml index c915cdd..e6e276e 100644 --- a/.github/workflows/cicd.yml +++ b/.github/workflows/cicd.yml @@ -31,36 +31,42 @@ jobs: # 환경 변수 설정 - name: Set environment values run: | - touch ./.env - echo "${{ secrets.ENV }}" > ./.env touch ./src/main/resources/env.properties echo "${{ secrets.ENV_PROPERTIES }}" > ./src/main/resources/env.properties - shell: bash + # 테스트 수행 + - name: Run Tests + run: ./gradlew test + # JaCoCo 배지 생성 + - name: Generate JaCoCo Badge + uses: cicirello/jacoco-badge-generator/@v2 + with: + generate-brances-badge: true + jacoco-csv-file: build/reports/jacoco/test/jacocoTestReport.csv # Gradle build - name: Build with Gradle uses: gradle/gradle-build-action@v2 with: arguments: clean build -x test - # Docker build - - name: Docker build - run: | - echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin - docker build -t ${{ secrets.DOCKERHUB_REPOSITORY }} . - docker tag ${{ secrets.DOCKERHUB_REPOSITORY }} ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPOSITORY }}:${GITHUB_SHA::7} - docker push ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPOSITORY }}:${GITHUB_SHA::7} - - # Deploy - - name: Deploy - uses: appleboy/ssh-action@master - with: - host: 35.216.106.69 - username: ${{ secrets.SSH_USERNAME }} - key: ${{ secrets.SSH_PRIVATE_KEY }} - envs: GITHUB_SHA - script: | - sudo echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin - sudo docker pull ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPOSITORY }}:${GITHUB_SHA::7} - sudo docker tag ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPOSITORY }}:${GITHUB_SHA::7} alchive_spring - sudo docker-compose up -d +# # Docker build +# - name: Docker build +# run: | +# echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin +# docker build -t ${{ secrets.DOCKERHUB_REPOSITORY }} . +# docker tag ${{ secrets.DOCKERHUB_REPOSITORY }} ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPOSITORY }}:${GITHUB_SHA::7} +# docker push ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPOSITORY }}:${GITHUB_SHA::7} +# +# # Deploy +# - name: Deploy +# uses: appleboy/ssh-action@master +# with: +# host: 35.216.106.69 +# username: ${{ secrets.SSH_USERNAME }} +# key: ${{ secrets.SSH_PRIVATE_KEY }} +# envs: GITHUB_SHA +# script: | +# sudo echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin +# sudo docker pull ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPOSITORY }}:${GITHUB_SHA::7} +# sudo docker tag ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPOSITORY }}:${GITHUB_SHA::7} alchive_spring +# sudo docker-compose up -d diff --git a/build.gradle b/build.gradle index dcdd3a1..5007991 100644 --- a/build.gradle +++ b/build.gradle @@ -4,6 +4,29 @@ plugins { id 'io.spring.dependency-management' version '1.1.4' id 'org.hibernate.orm' version '6.4.4.Final' id 'org.graalvm.buildtools.native' version '0.9.28' + id 'jacoco' +} + +jacoco { + toolVersion = "0.8.12" +} + +repositories { + mavenCentral() +} + +test { + useJUnitPlatform() + finalizedBy jacocoTestReport +} + +jacocoTestReport { + dependsOn test + reports { + xml.required = false + html.required = true + csv.required = true + } } group = 'com.Alchive' @@ -61,10 +84,10 @@ dependencies { // Discord API implementation 'net.dv8tion:JDA:5.0.0-beta.5' -} -tasks.named('test') { - useJUnitPlatform() +// // Test + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1' } hibernate { diff --git a/gradlew b/gradlew index 1aa94a4..04a595f 100755 --- a/gradlew +++ b/gradlew @@ -1,4 +1,4 @@ -#!/bin/sh +zsh:1: command not found: wq # # Copyright © 2015-2021 the original authors. diff --git a/src/test/java/com/Alchive/backend/BackendApplicationTests.java b/src/test/java/com/Alchive/backend/BackendApplicationTests.java deleted file mode 100644 index 012dc13..0000000 --- a/src/test/java/com/Alchive/backend/BackendApplicationTests.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.Alchive.backend; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class BackendApplicationTests { - - @Test - void contextLoads() { - } - -}