From 58c826f1f672de6f79056ad57206d27f08dc92c7 Mon Sep 17 00:00:00 2001
From: chansooo <kcs05008@gmail.com>
Date: Sun, 9 Jun 2024 13:30:33 +0900
Subject: [PATCH] =?UTF-8?q?infra:=20bootstrap=20=EB=AA=85=EB=A0=B9?=
 =?UTF-8?q?=EC=96=B4=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/pullRequest.yml |  4 ----
 Makefile                          | 14 ++------------
 Matchfile                         |  3 +--
 Scripts/bootstrap.sh              | 27 +++++++++++++++++++++++++++
 4 files changed, 30 insertions(+), 18 deletions(-)
 create mode 100644 Scripts/bootstrap.sh

diff --git a/.github/workflows/pullRequest.yml b/.github/workflows/pullRequest.yml
index 1d55203..1e497ed 100644
--- a/.github/workflows/pullRequest.yml
+++ b/.github/workflows/pullRequest.yml
@@ -11,10 +11,6 @@ jobs:
     runs-on: macos-13
     steps:
     - uses: actions/checkout@v3
-    
-    # - uses: maxim-lobanov/setup-xcode@v1
-    #   with:
-    #     xcode-version: '15.4'
 
     - name: Access Available
       run: chmod +x Scripts/onboarding.sh
diff --git a/Makefile b/Makefile
index ba34f95..7142155 100644
--- a/Makefile
+++ b/Makefile
@@ -2,17 +2,7 @@ USER_NAME = $(shell python3 Scripts/author_name.py)
 CURRENT_DATE = $(shell pipenv run python Scripts/current_date.py)
 
 bootstrap:
-	@curl https://mise.run | sh
-	@echo 'eval "$(~/.local/bin/mise activate zsh)"' >> ~/.zshrc
-	@echo 'export PATH="$HOME/.local/share/mise/shims:$PATH"' >> ~/.zprofile
-	@source ~/.zshrc
-	@arch -arm64 brew install pipenv
-	@arch -arm64 brew install fastlane
-	@fastlane match development --readonly
-	@fastlane match appstore --readonly
-	@mise install
-	@tuist install
-	@tuist generate
+	@./Scripts/bootstrap.sh
 
 # e.g. make core name=모듈이름
 core:
@@ -34,4 +24,4 @@ feature:
 	 --author "$(USER_NAME)" \
 	 --current-date "$(CURRENT_DATE)"
 	 
-	@tuist edit
\ No newline at end of file
+	@tuist edit
diff --git a/Matchfile b/Matchfile
index 8c43829..087bbaf 100644
--- a/Matchfile
+++ b/Matchfile
@@ -4,8 +4,7 @@ storage_mode("git")
 
 type("development") # The default type, can be: appstore, adhoc, enterprise or development
 
-# app_identifier(["tools.fastlane.app", "tools.fastlane.app2"])
-# username("user@fastlane.tools") # Your Apple Developer Portal username
+app_identifier(["ppac.farmeme.App"])
 
 # For all available options run `fastlane match --help`
 # Remove the # in the beginning of the line to enable the other options
diff --git a/Scripts/bootstrap.sh b/Scripts/bootstrap.sh
new file mode 100644
index 0000000..3242cb3
--- /dev/null
+++ b/Scripts/bootstrap.sh
@@ -0,0 +1,27 @@
+#!/bin/zsh
+
+set -e
+
+# mise 설치
+curl https://mise.run | sh
+
+# 환경설정 추가
+echo 'eval "$(~/.local/bin/mise activate zsh)"' >> ~/.zshrc
+echo 'export PATH="$HOME/.local/share/mise/shims:$PATH"' >> ~/.zprofile
+
+# zsh 다시 시작
+exec zsh
+
+# 필요한 도구 설치
+arch -arm64 brew install pipenv fastlane
+
+# fastlane 설정
+fastlane match development --readonly
+fastlane match appstore --readonly
+
+# mise, tuist 설치
+mise install
+tuist install
+
+# tuist generate 실행
+tuist generate