From 08194591743384752c9c0925a8298740855df0d2 Mon Sep 17 00:00:00 2001 From: HongSJae Date: Fri, 29 Mar 2024 11:03:52 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=A7=A9=20::=20CI=20Script=20update?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ci_scripts/ci_install_tuist.sh | 27 --------------------------- ci_scripts/ci_post_clone.sh | 12 ++++++------ 2 files changed, 6 insertions(+), 33 deletions(-) delete mode 100755 ci_scripts/ci_install_tuist.sh diff --git a/ci_scripts/ci_install_tuist.sh b/ci_scripts/ci_install_tuist.sh deleted file mode 100755 index 8be66938..00000000 --- a/ci_scripts/ci_install_tuist.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -set -e - -shell_join() { - local arg - printf "%s" "$1" - shift - for arg in "$@"; do - printf " " - printf "%s" "${arg// /\ }" - done -} - -ohai() { - printf "${tty_blue}==>${tty_bold} %s${tty_reset}\n" "$(shell_join "$@")" -} - -# The line below extracts the version from the list of tags in the Tuist repository. -LATEST_VERSION=$(git ls-remote -t --sort=v:refname https://github.com/tuist/tuist.git | sed -ne '$s/.*tags\/\(.*\)/\1/p') -ohai "Downloading tuist..." -[ -f /tmp/tuist.zip ] && rm /tmp/tuist.zip -[ -f /tmp/tuist ] && rm /tmp/tuist -curl -LSsf --output tuist.zip https://github.com/tuist/tuist/releases/download/${LATEST_VERSION}/tuist.zip -ohai "Unzipping tuist..." -unzip -o tuist.zip -d tuist > /dev/null -ohai "tuist installed. Try running 'tuist'" diff --git a/ci_scripts/ci_post_clone.sh b/ci_scripts/ci_post_clone.sh index b9e8a172..40610abe 100644 --- a/ci_scripts/ci_post_clone.sh +++ b/ci_scripts/ci_post_clone.sh @@ -1,8 +1,8 @@ #!/bin/sh -sh ci_install_tuist.sh -cd ../ -git clone https://github.com/Team-return/JOBIS-v2-XCConfig.git -mv JOBIS-v2-XCConfig/XCConfig/ . -ci_scripts/tuist/tuist fetch -TUIST_CI=1 ci_scripts/tuist/tuist generate +cd .. + +brew install make +curl -Ls https://install.tuist.io | bash + +make ci_generate From 40586c83e5a509c2efd5e5d3a0177424028b775a Mon Sep 17 00:00:00 2001 From: "hsj._.06" Date: Fri, 29 Mar 2024 11:10:53 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=A7=A9=20::=20XCConfig=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ci_scripts/ci_post_clone.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ci_scripts/ci_post_clone.sh b/ci_scripts/ci_post_clone.sh index 40610abe..669d310a 100644 --- a/ci_scripts/ci_post_clone.sh +++ b/ci_scripts/ci_post_clone.sh @@ -2,6 +2,10 @@ cd .. +cd ../ +git clone https://github.com/Team-return/JOBIS-v2-XCConfig.git +mv JOBIS-v2-XCConfig/XCConfig/ . + brew install make curl -Ls https://install.tuist.io | bash From 16c7c378c6d8ecf88c2c574ec755182b9a66df91 Mon Sep 17 00:00:00 2001 From: "hsj._.06" Date: Fri, 29 Mar 2024 11:30:27 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=A7=A9=20::=20CI=20update?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ci_scripts/ci_post_clone.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ci_scripts/ci_post_clone.sh b/ci_scripts/ci_post_clone.sh index 669d310a..92b7b5a4 100644 --- a/ci_scripts/ci_post_clone.sh +++ b/ci_scripts/ci_post_clone.sh @@ -1,7 +1,4 @@ #!/bin/sh - -cd .. - cd ../ git clone https://github.com/Team-return/JOBIS-v2-XCConfig.git mv JOBIS-v2-XCConfig/XCConfig/ . @@ -9,4 +6,5 @@ mv JOBIS-v2-XCConfig/XCConfig/ . brew install make curl -Ls https://install.tuist.io | bash -make ci_generate +tuist fetch +TUIST_CI=1 tuist generate