From b0db12ab232e1cda2eaffba4453b96baf7196130 Mon Sep 17 00:00:00 2001 From: J0onYEong Date: Tue, 25 Jun 2024 20:16:13 +0900 Subject: [PATCH 01/12] =?UTF-8?q?[IDLE-35]=20test=20workflow=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/merge_to_develop_on_pr.yml | 56 ++++++++++++++++++++ .gitignore | 1 + 2 files changed, 57 insertions(+) create mode 100644 .github/workflows/merge_to_develop_on_pr.yml diff --git a/.github/workflows/merge_to_develop_on_pr.yml b/.github/workflows/merge_to_develop_on_pr.yml new file mode 100644 index 00000000..8868b6e9 --- /dev/null +++ b/.github/workflows/merge_to_develop_on_pr.yml @@ -0,0 +1,56 @@ +name: PR to [develop] +on: + pull_request: + branches: [ develop ] + +#1. load mise +#2. cache tuist +#3. install tuist +#4. checkout tuist project repository +#5. fetch XCConfig from repository +#6. test tuist project + +jobs: + test: + runs-on: macos-latest + env: + TUIST_VERSION: 4.12.1 + steps: + + #1. load mise + - uses: jdx/mise-action@v2 + + #2. cache tuist + - name: cache tuist + id: cache-tuist + uses: actions/cache@v4 + with: + path: /usr/local/bin/tuist + key: ${{ runner.os }}-tuist@${{ env.TUIST_VERSION }} + + #3. install tuist + - name: install tuist + if: steps.cache-tuist.outputs.cache-hit != 'true' + run: | + mise install tuist@${{ env.TUIST_VERSION }} + + #4. checkout tuist project repository + - name: checkout project + uses: actions/checkout@v4 + + #5. fetch XCConfig from repository + - name: fetch xcconfig + uses: actions/checkout@v4 + with: + repository: ${{ secrets.XCCONFIG_REPO }} + token: ${{ secrets.XCCONFIG_REPO_TOKEN }} + path: '$GITHUB_WORKSPACE/project/XcodeConfiguration' + + #6. test tuist project + - name: Test project + run: + tuist test + + + + diff --git a/.gitignore b/.gitignore index b5b77e23..772af3e6 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ # Ignore all xcconfig files in all directories **/*.xcconfig +XcodeConfiguration/ # Ignore Derived **/Derived/ From f3316aa14c422407bdf59a8eb28960098e45945a Mon Sep 17 00:00:00 2001 From: Junyeong choi <106458638+J0onYEong@users.noreply.github.com> Date: Tue, 25 Jun 2024 20:23:16 +0900 Subject: [PATCH 02/12] =?UTF-8?q?[IDLE-35]=20=20test=20workflow=20tuist?= =?UTF-8?q?=EA=B8=B0=EB=B3=B8=EC=82=AC=EC=9A=A9=20=EB=B2=84=EC=A0=84=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/merge_to_develop_on_pr.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/merge_to_develop_on_pr.yml b/.github/workflows/merge_to_develop_on_pr.yml index 8868b6e9..64a9b93c 100644 --- a/.github/workflows/merge_to_develop_on_pr.yml +++ b/.github/workflows/merge_to_develop_on_pr.yml @@ -33,6 +33,7 @@ jobs: if: steps.cache-tuist.outputs.cache-hit != 'true' run: | mise install tuist@${{ env.TUIST_VERSION }} + mise use -g tuist@${{ env.TUIST_VERSION }} #4. checkout tuist project repository - name: checkout project @@ -46,6 +47,10 @@ jobs: token: ${{ secrets.XCCONFIG_REPO_TOKEN }} path: '$GITHUB_WORKSPACE/project/XcodeConfiguration' + - run: | + echo "Checking configurations are loaded..." + tree project/XcodeConfiguration + #6. test tuist project - name: Test project run: From bdfdf502c8e4cc44202fd8a374feb9b1241b305a Mon Sep 17 00:00:00 2001 From: Junyeong choi <106458638+J0onYEong@users.noreply.github.com> Date: Tue, 25 Jun 2024 20:31:27 +0900 Subject: [PATCH 03/12] =?UTF-8?q?[IDLE-35]=20=20test=20workflow=20tuist=20?= =?UTF-8?q?tree=ED=88=B4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/merge_to_develop_on_pr.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/merge_to_develop_on_pr.yml b/.github/workflows/merge_to_develop_on_pr.yml index 64a9b93c..1a2a86dd 100644 --- a/.github/workflows/merge_to_develop_on_pr.yml +++ b/.github/workflows/merge_to_develop_on_pr.yml @@ -27,13 +27,24 @@ jobs: with: path: /usr/local/bin/tuist key: ${{ runner.os }}-tuist@${{ env.TUIST_VERSION }} - + #3. install tuist - name: install tuist if: steps.cache-tuist.outputs.cache-hit != 'true' run: | mise install tuist@${{ env.TUIST_VERSION }} mise use -g tuist@${{ env.TUIST_VERSION }} + + - name: cache tree + id: cache-tree + uses: actions/cache@v4 + with: + path: /opt/homebrew/bin/tree + key: ${{ runner.os }}-tree + + - name: install tree + if: steps.cache-tree.outputs.cache-hit != 'true' + run: brew install tree #4. checkout tuist project repository - name: checkout project From 5e76e13781c67a817ea3c8613082c6b05f00bfe9 Mon Sep 17 00:00:00 2001 From: Junyeong choi <106458638+J0onYEong@users.noreply.github.com> Date: Tue, 25 Jun 2024 20:33:45 +0900 Subject: [PATCH 04/12] =?UTF-8?q?[IDLE-35]=20=20test=20workflow=20tree?= =?UTF-8?q?=EB=A7=A4=EA=B0=9C=EB=B3=80=EC=88=98=20=EA=B2=BD=EB=A1=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/merge_to_develop_on_pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge_to_develop_on_pr.yml b/.github/workflows/merge_to_develop_on_pr.yml index 1a2a86dd..8834b358 100644 --- a/.github/workflows/merge_to_develop_on_pr.yml +++ b/.github/workflows/merge_to_develop_on_pr.yml @@ -60,7 +60,7 @@ jobs: - run: | echo "Checking configurations are loaded..." - tree project/XcodeConfiguration + tree $GITHUB_WORKSPACE/project/XcodeConfiguration #6. test tuist project - name: Test project From 436705f305d86c3573a667747305350a4a300d47 Mon Sep 17 00:00:00 2001 From: Junyeong choi <106458638+J0onYEong@users.noreply.github.com> Date: Tue, 25 Jun 2024 20:41:24 +0900 Subject: [PATCH 05/12] =?UTF-8?q?[IDLE-35]=20=20test=20workflow=20workspac?= =?UTF-8?q?e=EA=B2=BD=EB=A1=9C=20=ED=99=98=EA=B2=BD=EB=B3=80=EC=88=98=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/merge_to_develop_on_pr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/merge_to_develop_on_pr.yml b/.github/workflows/merge_to_develop_on_pr.yml index 8834b358..850ad0f0 100644 --- a/.github/workflows/merge_to_develop_on_pr.yml +++ b/.github/workflows/merge_to_develop_on_pr.yml @@ -56,11 +56,11 @@ jobs: with: repository: ${{ secrets.XCCONFIG_REPO }} token: ${{ secrets.XCCONFIG_REPO_TOKEN }} - path: '$GITHUB_WORKSPACE/project/XcodeConfiguration' + path: '${{ github.workspace }}/project/XcodeConfiguration' - run: | echo "Checking configurations are loaded..." - tree $GITHUB_WORKSPACE/project/XcodeConfiguration + tree ${{ github.workspace }}/project/XcodeConfiguration #6. test tuist project - name: Test project From 1ae81503f39bea9a1cfc3066fd8c1d0ea39cdc99 Mon Sep 17 00:00:00 2001 From: Junyeong choi <106458638+J0onYEong@users.noreply.github.com> Date: Tue, 25 Jun 2024 20:43:10 +0900 Subject: [PATCH 06/12] =?UTF-8?q?[IDLE-35]=20=20test=20workflow=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=ED=95=A0=20=ED=94=84=EB=A1=9C?= =?UTF-8?q?=EC=A0=9D=ED=8A=B8=20=EA=B2=BD=EB=A1=9C=20=EC=A7=80=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/merge_to_develop_on_pr.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/merge_to_develop_on_pr.yml b/.github/workflows/merge_to_develop_on_pr.yml index 850ad0f0..14b588fd 100644 --- a/.github/workflows/merge_to_develop_on_pr.yml +++ b/.github/workflows/merge_to_develop_on_pr.yml @@ -65,6 +65,7 @@ jobs: #6. test tuist project - name: Test project run: + cd project tuist test From cb4f5d7561da0b0d3787c4382bb308e5758f43a9 Mon Sep 17 00:00:00 2001 From: Junyeong choi <106458638+J0onYEong@users.noreply.github.com> Date: Tue, 25 Jun 2024 20:44:21 +0900 Subject: [PATCH 07/12] =?UTF-8?q?[IDLE-35]=20=20test=20workflow=20?= =?UTF-8?q?=EB=AC=B8=EB=B2=95=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/merge_to_develop_on_pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge_to_develop_on_pr.yml b/.github/workflows/merge_to_develop_on_pr.yml index 14b588fd..bb903582 100644 --- a/.github/workflows/merge_to_develop_on_pr.yml +++ b/.github/workflows/merge_to_develop_on_pr.yml @@ -64,7 +64,7 @@ jobs: #6. test tuist project - name: Test project - run: + run: | cd project tuist test From a16d7cfc876359565119f2e3316bde871c49f8b3 Mon Sep 17 00:00:00 2001 From: Junyeong choi <106458638+J0onYEong@users.noreply.github.com> Date: Tue, 25 Jun 2024 20:47:32 +0900 Subject: [PATCH 08/12] =?UTF-8?q?[IDLE-35]=20=20test=20workflow=20tool?= =?UTF-8?q?=EC=84=A4=EC=B9=98=20=EA=B2=BD=EB=A1=9C=20=ED=8C=8C=EC=95=85?= =?UTF-8?q?=EC=9D=84=20=EC=9C=84=ED=95=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/merge_to_develop_on_pr.yml | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/merge_to_develop_on_pr.yml b/.github/workflows/merge_to_develop_on_pr.yml index bb903582..1dfcce99 100644 --- a/.github/workflows/merge_to_develop_on_pr.yml +++ b/.github/workflows/merge_to_develop_on_pr.yml @@ -35,16 +35,22 @@ jobs: mise install tuist@${{ env.TUIST_VERSION }} mise use -g tuist@${{ env.TUIST_VERSION }} - - name: cache tree - id: cache-tree - uses: actions/cache@v4 - with: - path: /opt/homebrew/bin/tree - key: ${{ runner.os }}-tree + # - name: cache tree + # id: cache-tree + # uses: actions/cache@v4 + # with: + # path: /opt/homebrew/bin/tree + # key: ${{ runner.os }}-tree - name: install tree - if: steps.cache-tree.outputs.cache-hit != 'true' + # if: steps.cache-tree.outputs.cache-hit != 'true' run: brew install tree + + - name: check paths + run: | + which tuist + which tree + #4. checkout tuist project repository - name: checkout project From 2f6b422074c8ed809eceb2494af21fdd108215e2 Mon Sep 17 00:00:00 2001 From: Junyeong choi <106458638+J0onYEong@users.noreply.github.com> Date: Tue, 25 Jun 2024 20:50:14 +0900 Subject: [PATCH 09/12] =?UTF-8?q?[IDLE-35]=20=20test=20workflow=20tuist=20?= =?UTF-8?q?install=20=EB=AA=85=EB=A0=B9=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/merge_to_develop_on_pr.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/merge_to_develop_on_pr.yml b/.github/workflows/merge_to_develop_on_pr.yml index 1dfcce99..91431593 100644 --- a/.github/workflows/merge_to_develop_on_pr.yml +++ b/.github/workflows/merge_to_develop_on_pr.yml @@ -25,7 +25,7 @@ jobs: id: cache-tuist uses: actions/cache@v4 with: - path: /usr/local/bin/tuist + path: /Users/runner/.local/share/mise/shims/tuist key: ${{ runner.os }}-tuist@${{ env.TUIST_VERSION }} #3. install tuist @@ -35,15 +35,15 @@ jobs: mise install tuist@${{ env.TUIST_VERSION }} mise use -g tuist@${{ env.TUIST_VERSION }} - # - name: cache tree - # id: cache-tree - # uses: actions/cache@v4 - # with: - # path: /opt/homebrew/bin/tree - # key: ${{ runner.os }}-tree + - name: cache tree + id: cache-tree + uses: actions/cache@v4 + with: + path: /opt/homebrew/bin/tree + key: ${{ runner.os }}-tree - name: install tree - # if: steps.cache-tree.outputs.cache-hit != 'true' + if: steps.cache-tree.outputs.cache-hit != 'true' run: brew install tree - name: check paths @@ -72,6 +72,7 @@ jobs: - name: Test project run: | cd project + tuist install tuist test From f269e5e44c7785c376a209f528fc8ab932b9fa50 Mon Sep 17 00:00:00 2001 From: Junyeong choi <106458638+J0onYEong@users.noreply.github.com> Date: Tue, 25 Jun 2024 20:56:20 +0900 Subject: [PATCH 10/12] =?UTF-8?q?[IDLE-35]=20=20test=20workflow=20PATH?= =?UTF-8?q?=EB=B3=80=EC=88=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/merge_to_develop_on_pr.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/merge_to_develop_on_pr.yml b/.github/workflows/merge_to_develop_on_pr.yml index 91431593..3eccb3e1 100644 --- a/.github/workflows/merge_to_develop_on_pr.yml +++ b/.github/workflows/merge_to_develop_on_pr.yml @@ -46,11 +46,14 @@ jobs: if: steps.cache-tree.outputs.cache-hit != 'true' run: brew install tree + - name: add brew to PATH + run: | + echo "/opt/homebrew/bin" >> ${{ github.path }} + - name: check paths run: | - which tuist - which tree - + echo "tuist in installed in $(which tuist)" + echo "tree in installed in $(which tree)" #4. checkout tuist project repository - name: checkout project From 1e0896e468b92802c44e6d3a08307583af8c5217 Mon Sep 17 00:00:00 2001 From: Junyeong choi <106458638+J0onYEong@users.noreply.github.com> Date: Tue, 25 Jun 2024 21:00:34 +0900 Subject: [PATCH 11/12] Update merge_to_develop_on_pr.yml --- .github/workflows/merge_to_develop_on_pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge_to_develop_on_pr.yml b/.github/workflows/merge_to_develop_on_pr.yml index 3eccb3e1..abc3b82e 100644 --- a/.github/workflows/merge_to_develop_on_pr.yml +++ b/.github/workflows/merge_to_develop_on_pr.yml @@ -48,7 +48,7 @@ jobs: - name: add brew to PATH run: | - echo "/opt/homebrew/bin" >> ${{ github.path }} + echo "/opt/homebrew/bin" >> $GITHUB_PATH - name: check paths run: | From bf20a6daa867196a656de5365c75b3616b533c85 Mon Sep 17 00:00:00 2001 From: Junyeong choi <106458638+J0onYEong@users.noreply.github.com> Date: Tue, 25 Jun 2024 21:05:20 +0900 Subject: [PATCH 12/12] =?UTF-8?q?[IDLE-35]=20=20test=20workflow=20tree=20c?= =?UTF-8?q?ache=EA=B8=B0=EB=8A=A5=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/merge_to_develop_on_pr.yml | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/.github/workflows/merge_to_develop_on_pr.yml b/.github/workflows/merge_to_develop_on_pr.yml index abc3b82e..fb587674 100644 --- a/.github/workflows/merge_to_develop_on_pr.yml +++ b/.github/workflows/merge_to_develop_on_pr.yml @@ -34,22 +34,10 @@ jobs: run: | mise install tuist@${{ env.TUIST_VERSION }} mise use -g tuist@${{ env.TUIST_VERSION }} - - - name: cache tree - id: cache-tree - uses: actions/cache@v4 - with: - path: /opt/homebrew/bin/tree - key: ${{ runner.os }}-tree - name: install tree - if: steps.cache-tree.outputs.cache-hit != 'true' run: brew install tree - - name: add brew to PATH - run: | - echo "/opt/homebrew/bin" >> $GITHUB_PATH - - name: check paths run: | echo "tuist in installed in $(which tuist)" @@ -66,8 +54,9 @@ jobs: repository: ${{ secrets.XCCONFIG_REPO }} token: ${{ secrets.XCCONFIG_REPO_TOKEN }} path: '${{ github.workspace }}/project/XcodeConfiguration' - - - run: | + + - name: check xcconfig files + run: | echo "Checking configurations are loaded..." tree ${{ github.workspace }}/project/XcodeConfiguration