From 88371d08b976f96db4a4cd0093c6130b7ed1222f Mon Sep 17 00:00:00 2001 From: Ikiru Yoshizaki <3856350+guitarrapc@users.noreply.github.com> Date: Mon, 8 Feb 2021 11:26:31 +0900 Subject: [PATCH 1/5] chore: new docker image to build --- .github/workflows/build-debug.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-debug.yml b/.github/workflows/build-debug.yml index d3cb807..cfb4c4b 100644 --- a/.github/workflows/build-debug.yml +++ b/.github/workflows/build-debug.yml @@ -37,8 +37,8 @@ jobs: license: UNITY_2020_1 runs-on: ubuntu-latest container: - # with linux-il2cpp. image from https://hub.docker.com/r/gableroux/unity3d/tags - image: gableroux/unity3d:${{ matrix.unity }}-linux-il2cpp + # with linux-il2cpp. image from https://hub.docker.com/r/unityci/editor/tags + image: unityci/editor:${{ matrix.unity }}-linux-il2cpp-0 steps: # Ubuntu 18.04 git is too old, use ppa latest git. - run: | From 690f3a2eaddc21b0d0f16940fd1b7b6b70d6d2c5 Mon Sep 17 00:00:00 2001 From: Ikiru Yoshizaki <3856350+guitarrapc@users.noreply.github.com> Date: Mon, 8 Feb 2021 11:29:39 +0900 Subject: [PATCH 2/5] chore: move 2020.1 beta to ga image --- .github/workflows/build-debug.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-debug.yml b/.github/workflows/build-debug.yml index cfb4c4b..e3e6fa3 100644 --- a/.github/workflows/build-debug.yml +++ b/.github/workflows/build-debug.yml @@ -29,11 +29,11 @@ jobs: if: "!(contains(github.event.head_commit.message, '[skip ci]') || contains(github.event.head_commit.message, '[ci skip]')) && ((github.event_name == 'push' && github.repository_owner == 'Cysharp') || startsWith(github.event.pull_request.head.label, 'Cysharp:'))" strategy: matrix: - unity: ["2019.3.9f1", "2020.1.0b5"] + unity: ["2019.3.9f1", "2020.1.12f1"] include: - unity: 2019.3.9f1 license: UNITY_2019_3 - - unity: 2020.1.0b5 + - unity: 2020.1.12f1 license: UNITY_2020_1 runs-on: ubuntu-latest container: From 7535c84581a320eff3597593bba0ffde175dfd9a Mon Sep 17 00:00:00 2001 From: Ikiru Yoshizaki <3856350+guitarrapc@users.noreply.github.com> Date: Mon, 8 Feb 2021 11:47:14 +0900 Subject: [PATCH 3/5] chore: use unity-editor --- .github/workflows/build-debug.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-debug.yml b/.github/workflows/build-debug.yml index e3e6fa3..2d7b87f 100644 --- a/.github/workflows/build-debug.yml +++ b/.github/workflows/build-debug.yml @@ -49,18 +49,18 @@ jobs: env: UNITY_LICENSE: ${{ secrets[matrix.license] }} - name: Activate Unity, always returns a success. But if a subsequent run fails, the activation may have failed(if succeeded, shows `Next license update check is after` and not shows other message(like GUID != GUID). If fails not). In that case, upload the artifact's .alf file to https://license.unity3d.com/manual to get the .ulf file and set it to secrets. - run: /opt/Unity/Editor/Unity -quit -batchmode -nographics -silent-crashes -logFile -manualLicenseFile .Unity.ulf || exit 0 + run: unity-editor -quit -batchmode -nographics -silent-crashes -logFile -manualLicenseFile .Unity.ulf || exit 0 # Execute scripts: RuntimeUnitTestToolkit - name: Build UnitTest(Linux64, mono) - run: /opt/Unity/Editor/Unity -quit -batchmode -nographics -silent-crashes -logFile -projectPath . -executeMethod UnitTestBuilder.BuildUnitTest /headless /ScriptBackend mono /BuildTarget StandaloneLinux64 + run: unity-editor -quit -batchmode -nographics -silent-crashes -logFile -projectPath . -executeMethod UnitTestBuilder.BuildUnitTest /headless /ScriptBackend mono /BuildTarget StandaloneLinux64 working-directory: src/UniTask - name: Execute UnitTest run: ./src/UniTask/bin/UnitTest/StandaloneLinux64_Mono2x/test # Execute scripts: Export Package - name: Export unitypackage - run: /opt/Unity/Editor/Unity -quit -batchmode -nographics -silent-crashes -logFile -projectPath . -executeMethod PackageExporter.Export + run: unity-editor -quit -batchmode -nographics -silent-crashes -logFile -projectPath . -executeMethod PackageExporter.Export working-directory: src/UniTask - name: check all .meta is commited From 97680e57a8e1c7dbfd4f023010f2aa240df46fee Mon Sep 17 00:00:00 2001 From: Ikiru Yoshizaki <3856350+guitarrapc@users.noreply.github.com> Date: Mon, 8 Feb 2021 15:54:07 +0900 Subject: [PATCH 4/5] chore: new unity build with unityci/editor --- .github/workflows/build-debug.yml | 46 ++++++++++++++++------------- .github/workflows/build-release.yml | 28 +++++++----------- 2 files changed, 35 insertions(+), 39 deletions(-) diff --git a/.github/workflows/build-debug.yml b/.github/workflows/build-debug.yml index 2d7b87f..1ae1016 100644 --- a/.github/workflows/build-debug.yml +++ b/.github/workflows/build-debug.yml @@ -29,39 +29,43 @@ jobs: if: "!(contains(github.event.head_commit.message, '[skip ci]') || contains(github.event.head_commit.message, '[ci skip]')) && ((github.event_name == 'push' && github.repository_owner == 'Cysharp') || startsWith(github.event.pull_request.head.label, 'Cysharp:'))" strategy: matrix: - unity: ["2019.3.9f1", "2020.1.12f1"] + unity: ["2019.3.9f1", "2019.4.13f1", "2020.1.12f1"] include: - unity: 2019.3.9f1 - license: UNITY_2019_3 + license: UNITY_LICENSE_2019 + - unity: 2019.4.13f1 + license: UNITY_LICENSE_2019 - unity: 2020.1.12f1 - license: UNITY_2020_1 + license: UNITY_LICENSE_2020 runs-on: ubuntu-latest - container: - # with linux-il2cpp. image from https://hub.docker.com/r/unityci/editor/tags - image: unityci/editor:${{ matrix.unity }}-linux-il2cpp-0 steps: - # Ubuntu 18.04 git is too old, use ppa latest git. - - run: | - apt-get update && apt-get install --no-install-recommends -y software-properties-common && add-apt-repository -y ppa:git-core/ppa - apt-get update && apt-get install --no-install-recommends -y git - uses: actions/checkout@v2 - - run: echo -n "$UNITY_LICENSE" >> .Unity.ulf - env: - UNITY_LICENSE: ${{ secrets[matrix.license] }} - - name: Activate Unity, always returns a success. But if a subsequent run fails, the activation may have failed(if succeeded, shows `Next license update check is after` and not shows other message(like GUID != GUID). If fails not). In that case, upload the artifact's .alf file to https://license.unity3d.com/manual to get the .ulf file and set it to secrets. - run: unity-editor -quit -batchmode -nographics -silent-crashes -logFile -manualLicenseFile .Unity.ulf || exit 0 - # Execute scripts: RuntimeUnitTestToolkit - name: Build UnitTest(Linux64, mono) - run: unity-editor -quit -batchmode -nographics -silent-crashes -logFile -projectPath . -executeMethod UnitTestBuilder.BuildUnitTest /headless /ScriptBackend mono /BuildTarget StandaloneLinux64 - working-directory: src/UniTask + uses: webbertakken/unity-builder@v2.0-alpha-6 + env: + UNITY_LICENSE: ${{ secrets[matrix.license] }} + with: + projectPath: src/UniTask + unityVersion: ${{ matrix.unity }} + targetPlatform: StandaloneLinux64 + buildMethod: UnitTestBuilder.BuildUnitTest + customParameters: /headless /ScriptBackend mono + versioning: None - name: Execute UnitTest run: ./src/UniTask/bin/UnitTest/StandaloneLinux64_Mono2x/test # Execute scripts: Export Package - name: Export unitypackage - run: unity-editor -quit -batchmode -nographics -silent-crashes -logFile -projectPath . -executeMethod PackageExporter.Export - working-directory: src/UniTask + uses: webbertakken/unity-builder@v2.0-alpha-6 + env: + UNITY_LICENSE: ${{ secrets[matrix.license] }} + with: + projectPath: src/UniTask + unityVersion: ${{ matrix.unity }} + targetPlatform: StandaloneLinux64 + buildMethod: PackageExporter.Export + versioning: None - name: check all .meta is commited run: | @@ -76,5 +80,5 @@ jobs: # Store artifacts. - uses: actions/upload-artifact@v2 with: - name: UniTask.unitypackage.zip + name: UniTask.unitypackage-${{ matrix.unity }}.zip path: ./src/UniTask/*.unitypackage diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 80fd111..2881881 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -94,30 +94,22 @@ jobs: unity: ["2019.3.9f1"] include: - unity: 2019.3.9f1 - license: UNITY_2019_3 + license: UNITY_LICENSE_2019 runs-on: ubuntu-latest timeout-minutes: 15 - container: - # with linux-il2cpp. image from https://hub.docker.com/r/gableroux/unity3d/tags - image: gableroux/unity3d:${{ matrix.unity }}-linux-il2cpp steps: - # Ubuntu 18.04 git is too old, use ppa latest git. - - run: | - apt-get update && apt-get install --no-install-recommends -y software-properties-common && add-apt-repository -y ppa:git-core/ppa - apt-get update && apt-get install --no-install-recommends -y git - uses: actions/checkout@v2 - with: - ref: ${{ needs.update-packagejson.outputs.sha }} - # activate Unity from manual license file(ulf) - - run: echo -n "$UNITY_LICENSE" >> .Unity.ulf - env: - UNITY_LICENSE: ${{ secrets[matrix.license] }} - - run: /opt/Unity/Editor/Unity -quit -batchmode -nographics -silent-crashes -logFile -manualLicenseFile .Unity.ulf || exit 0 - # Execute scripts: Export Package - name: Export unitypackage - run: /opt/Unity/Editor/Unity -quit -batchmode -nographics -silent-crashes -logFile -projectPath . -executeMethod PackageExporter.Export - working-directory: src/UniTask + uses: webbertakken/unity-builder@v2.0-alpha-6 + env: + UNITY_LICENSE: ${{ secrets[matrix.license] }} + with: + projectPath: src/UniTask + unityVersion: ${{ matrix.unity }} + targetPlatform: StandaloneLinux64 + buildMethod: PackageExporter.Export + versioning: None - name: check all .meta is commited run: | From 309d661bcc5d0178ccb43fced80f3eef596f6b45 Mon Sep 17 00:00:00 2001 From: Ikiru Yoshizaki <3856350+guitarrapc@users.noreply.github.com> Date: Mon, 8 Feb 2021 16:08:43 +0900 Subject: [PATCH 5/5] fix: actions name update to game-ci/unity-builder --- .github/workflows/build-debug.yml | 4 ++-- .github/workflows/build-release.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-debug.yml b/.github/workflows/build-debug.yml index 1ae1016..f9a44f3 100644 --- a/.github/workflows/build-debug.yml +++ b/.github/workflows/build-debug.yml @@ -42,7 +42,7 @@ jobs: - uses: actions/checkout@v2 # Execute scripts: RuntimeUnitTestToolkit - name: Build UnitTest(Linux64, mono) - uses: webbertakken/unity-builder@v2.0-alpha-6 + uses: game-ci/unity-builder@v2.0-alpha-6 env: UNITY_LICENSE: ${{ secrets[matrix.license] }} with: @@ -57,7 +57,7 @@ jobs: # Execute scripts: Export Package - name: Export unitypackage - uses: webbertakken/unity-builder@v2.0-alpha-6 + uses: game-ci/unity-builder@v2.0-alpha-6 env: UNITY_LICENSE: ${{ secrets[matrix.license] }} with: diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 2881881..ed1eb27 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -101,7 +101,7 @@ jobs: - uses: actions/checkout@v2 # Execute scripts: Export Package - name: Export unitypackage - uses: webbertakken/unity-builder@v2.0-alpha-6 + uses: game-ci/unity-builder@v2.0-alpha-6 env: UNITY_LICENSE: ${{ secrets[matrix.license] }} with: