From 0646f905dc44914a49095a10ee76eb4a94432329 Mon Sep 17 00:00:00 2001 From: Sanggyu Lee <8325289+gyusang@users.noreply.github.com> Date: Wed, 11 Dec 2024 17:02:05 +0900 Subject: [PATCH 1/6] Move tests to Tests --- Assets/Scripts/Tests.meta | 8 ++++++++ Assets/Scripts/{ => Tests}/PlayerBagControllerTest.cs | 0 .../Scripts/{ => Tests}/PlayerBagControllerTest.cs.meta | 0 Assets/Scripts/{ => Tests}/PlayerBagTest.cs | 0 Assets/Scripts/{ => Tests}/PlayerBagTest.cs.meta | 0 Assets/Scripts/{ => Tests}/TrashColorTest.cs | 0 Assets/Scripts/{ => Tests}/TrashColorTest.cs.meta | 0 7 files changed, 8 insertions(+) create mode 100644 Assets/Scripts/Tests.meta rename Assets/Scripts/{ => Tests}/PlayerBagControllerTest.cs (100%) rename Assets/Scripts/{ => Tests}/PlayerBagControllerTest.cs.meta (100%) rename Assets/Scripts/{ => Tests}/PlayerBagTest.cs (100%) rename Assets/Scripts/{ => Tests}/PlayerBagTest.cs.meta (100%) rename Assets/Scripts/{ => Tests}/TrashColorTest.cs (100%) rename Assets/Scripts/{ => Tests}/TrashColorTest.cs.meta (100%) diff --git a/Assets/Scripts/Tests.meta b/Assets/Scripts/Tests.meta new file mode 100644 index 0000000..5bec2d8 --- /dev/null +++ b/Assets/Scripts/Tests.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 623d156140ed74bfc8c4dbfc61b1b10c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/PlayerBagControllerTest.cs b/Assets/Scripts/Tests/PlayerBagControllerTest.cs similarity index 100% rename from Assets/Scripts/PlayerBagControllerTest.cs rename to Assets/Scripts/Tests/PlayerBagControllerTest.cs diff --git a/Assets/Scripts/PlayerBagControllerTest.cs.meta b/Assets/Scripts/Tests/PlayerBagControllerTest.cs.meta similarity index 100% rename from Assets/Scripts/PlayerBagControllerTest.cs.meta rename to Assets/Scripts/Tests/PlayerBagControllerTest.cs.meta diff --git a/Assets/Scripts/PlayerBagTest.cs b/Assets/Scripts/Tests/PlayerBagTest.cs similarity index 100% rename from Assets/Scripts/PlayerBagTest.cs rename to Assets/Scripts/Tests/PlayerBagTest.cs diff --git a/Assets/Scripts/PlayerBagTest.cs.meta b/Assets/Scripts/Tests/PlayerBagTest.cs.meta similarity index 100% rename from Assets/Scripts/PlayerBagTest.cs.meta rename to Assets/Scripts/Tests/PlayerBagTest.cs.meta diff --git a/Assets/Scripts/TrashColorTest.cs b/Assets/Scripts/Tests/TrashColorTest.cs similarity index 100% rename from Assets/Scripts/TrashColorTest.cs rename to Assets/Scripts/Tests/TrashColorTest.cs diff --git a/Assets/Scripts/TrashColorTest.cs.meta b/Assets/Scripts/Tests/TrashColorTest.cs.meta similarity index 100% rename from Assets/Scripts/TrashColorTest.cs.meta rename to Assets/Scripts/Tests/TrashColorTest.cs.meta From 8f83da0847ec649740eb3f97fd6f72d57ba6d4d2 Mon Sep 17 00:00:00 2001 From: Sanggyu Lee <8325289+gyusang@users.noreply.github.com> Date: Wed, 11 Dec 2024 17:02:25 +0900 Subject: [PATCH 2/6] Add WebGL to platforms --- Assets/Scripts/EditmodeTests.asmdef | 1 + 1 file changed, 1 insertion(+) diff --git a/Assets/Scripts/EditmodeTests.asmdef b/Assets/Scripts/EditmodeTests.asmdef index 1ec13a2..bd10523 100644 --- a/Assets/Scripts/EditmodeTests.asmdef +++ b/Assets/Scripts/EditmodeTests.asmdef @@ -10,6 +10,7 @@ "includePlatforms": [ "Editor", "macOSStandalone", + "WebGL", "WindowsStandalone64" ], "excludePlatforms": [], From a339fccd8949e728c0b593f6a2e48027d49f5fcf Mon Sep 17 00:00:00 2001 From: Sanggyu Lee <8325289+gyusang@users.noreply.github.com> Date: Wed, 11 Dec 2024 17:07:06 +0900 Subject: [PATCH 3/6] Fix CD --- .github/workflows/cd.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 9b983d1..01ba82d 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -4,6 +4,7 @@ on: push: branches: - main + - fix/build-error workflow_dispatch: permissions: @@ -41,6 +42,11 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4 + + - name: Remove test code + run: + rm -rf Assets/Scripts/Tests + rm Assets/Scripts/*.asmdef{,.meta} - name: Build Unity Project uses: game-ci/unity-builder@v4 From 21ef4598e552fc524b3fa47edf86bf6db8552c7f Mon Sep 17 00:00:00 2001 From: super-linter Date: Wed, 11 Dec 2024 08:11:51 +0000 Subject: [PATCH 4/6] chore: fix linting issues --- .github/workflows/cd.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 01ba82d..9eb9ae6 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -42,10 +42,9 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4 - + - name: Remove test code - run: - rm -rf Assets/Scripts/Tests + run: rm -rf Assets/Scripts/Tests rm Assets/Scripts/*.asmdef{,.meta} - name: Build Unity Project From b3aad337632297dc6cabe3df3a73dbb7787e98b5 Mon Sep 17 00:00:00 2001 From: Sanggyu Lee <8325289+gyusang@users.noreply.github.com> Date: Wed, 11 Dec 2024 17:25:40 +0900 Subject: [PATCH 5/6] Allow Dirty Build --- .github/workflows/cd.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 9eb9ae6..51a4fbe 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -52,6 +52,7 @@ jobs: with: unityVersion: 2021.3.42f1 targetPlatform: WebGL + allowDirtyBuild: true env: UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }} UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }} From 56ba57b41b29d458ff15ca1a59767512818da6dc Mon Sep 17 00:00:00 2001 From: Sanggyu Lee <8325289+gyusang@users.noreply.github.com> Date: Wed, 11 Dec 2024 17:42:37 +0900 Subject: [PATCH 6/6] Remove current branch --- .github/workflows/cd.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 51a4fbe..fafab29 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -4,7 +4,6 @@ on: push: branches: - main - - fix/build-error workflow_dispatch: permissions: