Merge pull request #141 from Uttug-Seuja/refactor/CI

Refactor : git action CI
Uttug-Seuja · Mar 29, 2024 · 8193386 · 8193386
2 parents cc140ca + ea4ebaf
commit 8193386
Show file tree

Hide file tree

Showing 2 changed files with 133 additions and 82 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -0,0 +1,51 @@
+name: CI
+
+on:
+  pull_request:
+    branches: [ develop ]
+
+  workflow_dispatch:
+
+jobs:
+  continuous-integration:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: 17
+          distribution: 'corretto'
+
+      - name: Set FcmKey
+        run: |
+          mkdir -p src/main/resources
+          echo "${{ secrets.FIREBASE_SERVICE_KEY }}" | base64 --decode > src/main/resources/firebase_service_key.json
+          find src
+
+      - name: Set YML
+        run: |
+          mkdir -p src/main/resources
+          echo "${{ secrets.APPLICATION_YML }}" | base64 --decode > src/main/resources/application.yml
+          find src
+
+      - 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
+        shell: bash
+
+      - name: Run build
+        run: ./gradlew build -x test
+        shell: bash
+
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -1,82 +1,82 @@
-# workflow의 이름을 지정
-name: CICD
-
-on:
-  workflow_dispatch:
-  #main branch로 push할 때
-  push:
-    branches: [ upstream ]
-
-# 해당 yml 내에서 사용할 key - value
-env:
-  S3_BUCKET_NAME: ohsoonbucket
-  PROJECT_NAME: ohsoonTaxi
-
-jobs:
-  deploy:
-    name: CICD
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
-        with:
-          java-version: 17
-          distribution: 'zulu'
-      
-      - name: Set FcmKey
-        run: |
-          mkdir -p src/main/resources
-          echo "${{ secrets.FIREBASE_SERVICE_KEY }}" | base64 --decode > src/main/resources/firebase_service_key.json
-          find src
-
-      - name: Set YML
-        run: |
-          mkdir -p src/main/resources
-          echo "${{ secrets.APPLICATION_YML }}" | base64 --decode > src/main/resources/application.yml
-          find src
-
-      - 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
-        shell: bash
-
-      - name: Run build
-        run: ./gradlew build -x test
-        shell: bash
-
-      - name: Make zip file
-        run: zip -r ./$GITHUB_SHA.zip .
-        shell: bash
-
-      - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v2
-        with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region: ${{ secrets.AWS_REGION }}
-
-      - name: Upload to S3
-        run: aws s3 cp --region ap-northeast-2 ./$GITHUB_SHA.zip s3://$S3_BUCKET_NAME/$PROJECT_NAME/$GITHUB_SHA.zip
-
-      - name: Deploy
-        run: |
-          aws deploy create-deployment \
-          --application-name ohsoon-deploy \
-          --deployment-config-name CodeDeployDefault.AllAtOnce \
-          --deployment-group-name cicd-cd-group \
-          --file-exists-behavior OVERWRITE \
-          --s3-location bucket=ohsoonbucket,bundleType=zip,key=ohsoonTaxi/$GITHUB_SHA.zip \
-          --region ap-northeast-2 \
+## workflow의 이름을 지정
+#name: CICD
+#
+#on:
+#  workflow_dispatch:
+#  #main branch로 push할 때
+#  push:
+#    branches: [ upstream ]
+#
+## 해당 yml 내에서 사용할 key - value
+#env:
+#  S3_BUCKET_NAME: ohsoonbucket
+#  PROJECT_NAME: ohsoonTaxi
+#
+#jobs:
+#  deploy:
+#    name: CICD
+#    runs-on: ubuntu-latest
+#
+#    steps:
+#      - name: Checkout
+#        uses: actions/checkout@v3
+#
+#      - name: Set up JDK 17
+#        uses: actions/setup-java@v3
+#        with:
+#          java-version: 17
+#          distribution: 'zulu'
+#
+#      - name: Set FcmKey
+#        run: |
+#          mkdir -p src/main/resources
+#          echo "${{ secrets.FIREBASE_SERVICE_KEY }}" | base64 --decode > src/main/resources/firebase_service_key.json
+#          find src
+#
+#      - name: Set YML
+#        run: |
+#          mkdir -p src/main/resources
+#          echo "${{ secrets.APPLICATION_YML }}" | base64 --decode > src/main/resources/application.yml
+#          find src
+#
+#      - 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
+#        shell: bash
+#
+#      - name: Run build
+#        run: ./gradlew build -x test
+#        shell: bash
+#
+#      - name: Make zip file
+#        run: zip -r ./$GITHUB_SHA.zip .
+#        shell: bash
+#
+#      - name: Configure AWS credentials
+#        uses: aws-actions/configure-aws-credentials@v2
+#        with:
+#          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+#          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+#          aws-region: ${{ secrets.AWS_REGION }}
+#
+#      - name: Upload to S3
+#        run: aws s3 cp --region ap-northeast-2 ./$GITHUB_SHA.zip s3://$S3_BUCKET_NAME/$PROJECT_NAME/$GITHUB_SHA.zip
+#
+#      - name: Deploy
+#        run: |
+#          aws deploy create-deployment \
+#          --application-name ohsoon-deploy \
+#          --deployment-config-name CodeDeployDefault.AllAtOnce \
+#          --deployment-group-name cicd-cd-group \
+#          --file-exists-behavior OVERWRITE \
+#          --s3-location bucket=ohsoonbucket,bundleType=zip,key=ohsoonTaxi/$GITHUB_SHA.zip \
+#          --region ap-northeast-2 \