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
54 changes: 30 additions & 24 deletions .github/workflows/cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
29 changes: 26 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 0 additions & 13 deletions src/test/java/com/Alchive/backend/BackendApplicationTests.java

This file was deleted.

Loading