Merge branch 'dev_android' of https://github.com/woowacourse-teams/20…

…23-naaga into feat/#466-custom_button
woowacourse-teams · Nov 6, 2023 · c6aa29b · c6aa29b
2 parents c2d0c79 + e27f0d0
commit c6aa29b
Show file tree

Hide file tree

Showing 197 changed files with 5,092 additions and 1,644 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.github/workflows/backend_dev_merge_workflow.yml b/.github/workflows/backend_dev_merge_workflow.yml
@@ -5,22 +5,54 @@ on:
       - dev_backend
 
 jobs:
-  deploy:
-    runs-on: naaga
+  github_actions_setting:
+    runs-on: ubuntu-latest
+
     steps:
-      - name: change permission
-        run: |
-          sudo chown -R ubuntu:ubuntu /home/ubuntu/actions-runner/naaga/2023-naaga/2023-naaga
-      - name: checkout
+      - name: 📂 프로젝트 파일 가져오는 중... 📂
         uses: actions/checkout@v3
         with:
           submodules: true
           ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
-      - name: remove
+
+      - name: ☕️ 깃허브 액션에 JDK 17 적용시키는 중... ☕️
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'corretto'
+
+      - name: 🐘 Gradle 세팅 중... 🐘
+        uses: gradle/[email protected]
+
+      - name: ⚙️ Gradle 로 JAR 파일 테스트 및 빌드 중... ⚙️
+        run: |
+          cd backend
+          ./gradlew clean bootJar -Dspring.profiles.active=test
+
+      - name: 🐳 도커 세팅 중... 🐳
+        uses: docker/[email protected]
+
+      - name: 🐳 도커 허브에 로그인 중... 🐳
+        uses: docker/login-action@v1 
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_ACCESSTOKEN }}
+
+      - name: 🐳 도커 이미지 빌드 중... 🐳
         run: |
-          sudo rm -rf /home/ubuntu/2023-naaga
-      - name: deploy
+          cd backend
+          docker build --platform linux/arm64/v8 -t ${{ secrets.DOCKERHUB_REPOSITORY }}/${{ secrets.DOCKERHUB_APPNAME }} -f Dockerfile-dev .
+
+      - name: 🐳 도커 허브에 Push 중... 🐳
+        run: docker push ${{ secrets.DOCKERHUB_REPOSITORY }}/${{ secrets.DOCKERHUB_APPNAME }}
+
+  naaga_dev_ec2_deploy:
+    needs: github_actions_setting
+    runs-on: naaga
+
+    steps:
+      - name: 🙏 쉘 스크립트 실행 중 ... 🙏
         run: |
-          sudo cp -r /home/ubuntu/actions-runner/naaga/2023-naaga/2023-naaga /home/ubuntu
           cd /home/ubuntu
-          sudo ./deploy.sh
+          sudo ./deploy_new.sh
+
diff --git a/.github/workflows/backend_prod_merge_workflow.yml b/.github/workflows/backend_prod_merge_workflow.yml
@@ -6,56 +6,55 @@ on:
       - main
     paths:
       - backend/**
-
+      
 jobs:
-  deploy:
-    runs-on: naaga
+  github_actions_setting:
+    runs-on: ubuntu-latest
+
     steps:
-      - name: change permission
-        run: |
-          sudo chown -R ubuntu:ubuntu /home/ubuntu/actions-runner/naaga/2023-naaga/2023-naaga
-      
-      - name: checkout
+      - name: 📂 프로젝트 파일 가져오는 중... 📂
         uses: actions/checkout@v3
         with:
           submodules: true
           ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
-
-      - name: project remove
-        run: |
-          sudo rm -rf /home/ubuntu/prod/2023-naaga
-      
-      - name: project copy
-        run: |
-          sudo cp -r /home/ubuntu/actions-runner/naaga/2023-naaga/2023-naaga /home/ubuntu/prod
 
-      - name: build
+      - name: ☕️ 깃허브 액션에 JDK 17 적용시키는 중... ☕️
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'corretto'
+
+      - name: 🐘 Gradle 세팅 중... 🐘
+        uses: gradle/[email protected]
+
+      - name: ⚙️ Gradle 로 JAR 파일 테스트 및 빌드 중... ⚙️
         run: |
-          cd /home/ubuntu/prod/2023-naaga/backend
-          sudo chmod +x ./gradlew
-          sudo ./gradlew clean bootJar
-     
-      - name: transfer & run
+          cd backend
+          ./gradlew clean bootJar -Dspring.profiles.active=test
+
+      - name: 🐳 도커 세팅 중... 🐳
+        uses: docker/[email protected]
+
+      - name: 🐳 도커 허브에 로그인 중... 🐳
+        uses: docker/login-action@v1 
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_ACCESSTOKEN }}
+
+      - name: 🐳 도커 이미지 빌드 중... 🐳
         run: |
-          cd /home/ubuntu/prod
-          chmod +x ./deploy_prod.sh
-          sudo ./deploy_prod.sh
+          cd backend
+          docker build --platform linux/arm64/v8 -t ${{ secrets.DOCKERHUB_REPOSITORY }}/${{ secrets.DOCKERHUB_APPNAME }} -f Dockerfile-prod .
 
-  sync-dev_backend:
-    needs: deploy
+      - name: 🐳 도커 허브에 Push 중... 🐳
+        run: docker push ${{ secrets.DOCKERHUB_REPOSITORY }}/${{ secrets.DOCKERHUB_APPNAME }}
 
-    runs-on: ubuntu-latest
+  naaga_prod_ec2_deploy:
+    needs: github_actions_setting
+    runs-on: naaga
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          ref: main
-
-      - name: merge main -> dev_backend
-        uses: devmasx/merge-branch@master
-        with:
-          type: now
-          from_branch: main
-          target_branch: dev_backend
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+      - name: 🙏 쉘 스크립트 실행 중 ... 🙏
+        run: |
+          cd /home/ubuntu/prod
+          sudo ./deploy_prod.sh
diff --git a/.github/workflows/backend_rel_merge_workflow.yml b/.github/workflows/backend_rel_merge_workflow.yml
@@ -8,53 +8,53 @@ on:
       - backend/**
 
 jobs:
-  deploy:
-    runs-on: naaga
+  github_actions_setting:
+    runs-on: ubuntu-latest
+
     steps:
-      - name: change permission
-        run: |
-          sudo chown -R ubuntu:ubuntu /home/ubuntu/actions-runner/naaga/2023-naaga/2023-naaga
-      
-      - name: checkout
+      - name: 📂 프로젝트 파일 가져오는 중... 📂
         uses: actions/checkout@v3
         with:
           submodules: true
           ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
-
-      - name: project remove
-        run: |
-          sudo rm -rf /home/ubuntu/prod/2023-naaga
-      
-      - name: project copy
-        run: |
-          sudo cp -r /home/ubuntu/actions-runner/naaga/2023-naaga/2023-naaga /home/ubuntu/prod
 
-      - name: build
+      - name: ☕️ 깃허브 액션에 JDK 17 적용시키는 중... ☕️
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'corretto'
+
+      - name: 🐘 Gradle 세팅 중... 🐘
+        uses: gradle/[email protected]
+
+      - name: ⚙️ Gradle 로 JAR 파일 테스트 및 빌드 중... ⚙️
         run: |
-          cd /home/ubuntu/prod/2023-naaga/backend
-          sudo chmod +x ./gradlew
-          sudo ./gradlew clean bootJar
-     
-      - name: transfer & run
+          cd backend
+          ./gradlew clean bootJar -Dspring.profiles.active=test
+
+      - name: 🐳 도커 세팅 중... 🐳
+        uses: docker/[email protected]
+
+      - name: 🐳 도커 허브에 로그인 중... 🐳
+        uses: docker/login-action@v1 
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_ACCESSTOKEN }}
+
+      - name: 🐳 도커 이미지 빌드 중... 🐳
         run: |
-          cd /home/ubuntu/prod
-          chmod +x ./deploy_prod.sh
-          sudo ./deploy_prod.sh
+          cd backend
+          docker build --platform linux/arm64/v8 -t ${{ secrets.DOCKERHUB_REPOSITORY }}/${{ secrets.DOCKERHUB_APPNAME }} -f Dockerfile-prod .
 
-  sync-dev_backend:
-    needs: deploy
+      - name: 🐳 도커 허브에 Push 중... 🐳
+        run: docker push ${{ secrets.DOCKERHUB_REPOSITORY }}/${{ secrets.DOCKERHUB_APPNAME }}
 
-    runs-on: ubuntu-latest
+  naaga_prod_ec2_deploy:
+    needs: github_actions_setting
+    runs-on: naaga
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          ref: main
-
-      - name: merge release -> dev_backend
-        uses: devmasx/merge-branch@master
-        with:
-          type: now
-          target_branch: dev_backend
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+      - name: 🙏 쉘 스크립트 실행 중 ... 🙏
+        run: |
+          cd /home/ubuntu/prod
+          sudo ./deploy_prod.sh
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/README.md b/README.md
@@ -0,0 +1,16 @@
+![제목](etc/images/header.png)
+
+## 💌 나아가로부터의 초대장이 도착했습니다
+
+반복되는 인스타 피드를 보고, 게임을 하며 보내는 일상이 지루하지 않으시나요?
+공부와 일에 치여 실내에서 보내는 시간이 많을 텐데요. 작은 화면 속을 벗어나 현실 세계의 경험을 해보고 싶지 않으신가요?
+
+그런 당신을 ‘나아가’로 초대합니다.
+
+## 🚶🏻 추리와 발걸음의 만남
+나아가는 현실 세계를 누비며 진행되는 추리 게임입니다. 게임을 시작하면, 당신 주변 어딘가의 사진이 제공됩니다. 사진이 알쏭달쏭하여 그곳이 어딘지 알아맞히기 어렵겠지만, 우선 발걸음을 옮겨보세요.
+
+
+<a href="https://play.google.com/store/apps/details?id=com.now.naaga&pcampaignid=web_share"><img src="etc/images/google play store.png"/></a>
+
+![상세 페이지](etc/images/service%20intro.png)