Refactor : 테스트 ci , 배포 ci 분리 (#212)

* Refactor : 테스트 ci , 배포 ci 분리 * Fix : 빌드 캐시 비활성화 * Fix : 로그 출력 추가 * Feat : gradle package, wrapper 캐시 추가 * Fix : 개발서버 포트 변경
TripInfoWeb · Sep 30, 2024 · a2df118 · a2df118
1 parent 1a5dfb8
commit a2df118
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 10 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -3,8 +3,6 @@ name: Docker Image CI
 on:
   push:
     branches: [ "main", "develop" ]
-  pull_request:
-    branches: [ "main", "develop" ]
 
 jobs:
   build:
@@ -27,21 +25,18 @@ jobs:
           echo "${{ secrets.APPLICATION_DEV }}"  > ./src/main/resources/application-dev.yml
           echo "${{ secrets.APPLICATION_PROD }}"  > ./src/main/resources/application-prod.yml
           echo "${{ secrets.APPLICATION_LOCAL }}"  > ./src/main/resources/application-local.yml
-          echo "${{ secrets.APPLICATION_TEST }}"  > ./src/main/resources/application-test.yml
-
 
       - name: gradlew 실행 권한 부여
         run: chmod +x ./gradlew
 
-      - name: 테스트 및 빌드하기 (main 브랜치)
+      - name: 빌드하기 (main 브랜치)
         if: github.ref == 'refs/heads/main'
-        run: ./gradlew clean build -PspringProfile=prod --warning-mode all --scan
+        run: ./gradlew clean build -x test -PspringProfile=prod --warning-mode all --scan
 
-      - name: 테스트 및 빌드하기 (develop 브랜치)
+      - name: 빌드하기 (develop 브랜치)
         if: github.ref == 'refs/heads/develop'
         run: |
-          ./gradlew clean test -PspringProfile=test
-          ./gradlew build -x test -PspringProfile=dev --warning-mode all --scan
+          ./gradlew clean build -x test -PspringProfile=dev --warning-mode all --scan
 
       - name: 빌드된 파일 이름 변경
         run: mv ./build/libs/*SNAPSHOT.jar ./project.jar
@@ -85,6 +80,6 @@ jobs:
             mkdir /home/ubuntu/solitour-server/current
             mv /home/ubuntu/solitour-server/tobe/project.jar /home/ubuntu/solitour-server/current/project.jar
             cd /home/ubuntu/solitour-server/current
-            sudo fuser -k -n tcp 8080 || true
+            sudo fuser -k -n tcp 8081 || true
             nohup java -jar -Dspring.profiles.active=dev project.jar > ./output.log 2>&1 &
             rm -rf /home/ubuntu/solitour-server/tobe
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -0,0 +1,48 @@
+name: Docker Image CI
+
+on:
+  pull_request:
+    branches: [ "main", "develop" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Github Repository 에 올린 파일들을 볼러오기
+        uses: actions/checkout@v4
+
+      - name: JDK 17 버전 설치
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 17
+
+      - name: application.yml 파일 만들기
+        run: |
+          mkdir -p ./src/main/resources
+          echo "${{ secrets.APPLICATION_YML }}"  > ./src/main/resources/application.yml
+          echo "${{ secrets.APPLICATION_COMMON }}"  > ./src/main/resources/application-common.yml
+          echo "${{ secrets.APPLICATION_TEST }}"  > ./src/main/resources/application-test.yml
+
+
+      - name: gradlew 실행 권한 부여
+        run: chmod +x ./gradlew
+
+      - name: Gradle packages 캐시
+        uses: actions/cache@v3
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle
+
+      - name: Gradle wrapper 캐시
+        uses: actions/cache@v3
+        with:
+          path: ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
+
+      - name: 테스트
+        run : ./gradlew clean test -PspringProfile=test --info
+
+