From 4437cf51e2fb053fdec055b4f7225b56cf8b6369 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 22:03:12 +0000 Subject: [PATCH 1/9] Bump game-ci/unity-builder from 3.1.0 to 4.0.1 Bumps [game-ci/unity-builder](https://github.com/game-ci/unity-builder) from 3.1.0 to 4.0.1. - [Release notes](https://github.com/game-ci/unity-builder/releases) - [Commits](https://github.com/game-ci/unity-builder/compare/v3.1.0...v4.0.1) --- updated-dependencies: - dependency-name: game-ci/unity-builder dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/unity.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/unity.yml b/.github/workflows/unity.yml index a4054bf..e0be1da 100644 --- a/.github/workflows/unity.yml +++ b/.github/workflows/unity.yml @@ -26,7 +26,7 @@ jobs: uses: actions/checkout@v4 - name: Unity Builder - uses: game-ci/unity-builder@v3.1.0 + uses: game-ci/unity-builder@v4.0.1 env: UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} with: @@ -54,7 +54,7 @@ jobs: uses: actions/checkout@v4 - name: Unity Builder - uses: game-ci/unity-builder@v3.1.0 + uses: game-ci/unity-builder@v4.0.1 env: UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }} From d8a79d7acddafd361e02b8f81829b494aa6c231f Mon Sep 17 00:00:00 2001 From: szymmirr Date: Tue, 21 Nov 2023 02:49:05 +0100 Subject: [PATCH 2/9] Separate WSAPlayer and tvOS builders --- .github/workflows/unity.yml | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/.github/workflows/unity.yml b/.github/workflows/unity.yml index e0be1da..bfe028c 100644 --- a/.github/workflows/unity.yml +++ b/.github/workflows/unity.yml @@ -39,14 +39,42 @@ jobs: name: Frog-${{ matrix.targetPlatform }} path: build/${{ matrix.targetPlatform }} - build-on-windows: + build-on-windows-latest: + name: Build ${{ matrix.targetPlatform }} + runs-on: windows-latest + strategy: + matrix: + targetPlatform: + - tvOS + unityVersion: + - 2019.4.5f1 + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Unity Builder + uses: game-ci/unity-builder@v4.0.1 + env: + UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} + UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }} + UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }} + with: + targetPlatform: ${{ matrix.targetPlatform }} + unityVersion: ${{ matrix.unityVersion }} + + - name: Upload artifact + uses: actions/upload-artifact@v3 + with: + name: Frog-${{ matrix.targetPlatform }} + path: build/${{ matrix.targetPlatform }} + + build-on-windows-2019: name: Build ${{ matrix.targetPlatform }} runs-on: windows-2019 strategy: matrix: targetPlatform: - WSAPlayer - - tvOS unityVersion: - 2019.4.5f1 steps: @@ -64,7 +92,7 @@ jobs: unityVersion: ${{ matrix.unityVersion }} - name: Upload artifact - uses: actions/upload-artifact@v3.1.3 + uses: actions/upload-artifact@v3 with: name: Frog-${{ matrix.targetPlatform }} path: build/${{ matrix.targetPlatform }} From cd3c6e4a1f7923a2c6eb402cc478445bc32c9b00 Mon Sep 17 00:00:00 2001 From: szymmirr Date: Tue, 21 Nov 2023 02:53:15 +0100 Subject: [PATCH 3/9] Drop windows-2019 --- .github/workflows/unity.yml | 34 +++------------------------------- 1 file changed, 3 insertions(+), 31 deletions(-) diff --git a/.github/workflows/unity.yml b/.github/workflows/unity.yml index bfe028c..ea886aa 100644 --- a/.github/workflows/unity.yml +++ b/.github/workflows/unity.yml @@ -33,48 +33,20 @@ jobs: targetPlatform: ${{ matrix.targetPlatform }} unityVersion: ${{ matrix.unityVersion }} - - name: Upload artifact - uses: actions/upload-artifact@v3.1.3 - with: - name: Frog-${{ matrix.targetPlatform }} - path: build/${{ matrix.targetPlatform }} - - build-on-windows-latest: - name: Build ${{ matrix.targetPlatform }} - runs-on: windows-latest - strategy: - matrix: - targetPlatform: - - tvOS - unityVersion: - - 2019.4.5f1 - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Unity Builder - uses: game-ci/unity-builder@v4.0.1 - env: - UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} - UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }} - UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }} - with: - targetPlatform: ${{ matrix.targetPlatform }} - unityVersion: ${{ matrix.unityVersion }} - - name: Upload artifact uses: actions/upload-artifact@v3 with: name: Frog-${{ matrix.targetPlatform }} path: build/${{ matrix.targetPlatform }} - build-on-windows-2019: + build-on-windows: name: Build ${{ matrix.targetPlatform }} - runs-on: windows-2019 + runs-on: windows-latest strategy: matrix: targetPlatform: - WSAPlayer + - tvOS unityVersion: - 2019.4.5f1 steps: From 59815fbe4ca8e07c4061795f0797cf05850dcf47 Mon Sep 17 00:00:00 2001 From: szymmirr Date: Tue, 21 Nov 2023 03:01:54 +0100 Subject: [PATCH 4/9] Update unity.yml --- .github/workflows/unity.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/unity.yml b/.github/workflows/unity.yml index ea886aa..db61f27 100644 --- a/.github/workflows/unity.yml +++ b/.github/workflows/unity.yml @@ -29,6 +29,8 @@ jobs: uses: game-ci/unity-builder@v4.0.1 env: UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} + UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }} + UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }} with: targetPlatform: ${{ matrix.targetPlatform }} unityVersion: ${{ matrix.unityVersion }} From 97bdc4da2e5542b2cadcbd27fe44018e33e3a267 Mon Sep 17 00:00:00 2001 From: szymmirr Date: Tue, 21 Nov 2023 03:13:50 +0100 Subject: [PATCH 5/9] Build tvOS on ubuntu --- .github/workflows/unity.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unity.yml b/.github/workflows/unity.yml index db61f27..e37cb10 100644 --- a/.github/workflows/unity.yml +++ b/.github/workflows/unity.yml @@ -19,6 +19,7 @@ jobs: - iOS - StandaloneOSX - StandaloneLinux64 + - tvOS unityVersion: - 2019.4.5f1 steps: @@ -48,7 +49,6 @@ jobs: matrix: targetPlatform: - WSAPlayer - - tvOS unityVersion: - 2019.4.5f1 steps: From fe11bc89cbec5aaa4237813dcebaf9c7c1bf9b66 Mon Sep 17 00:00:00 2001 From: szymmirr Date: Tue, 21 Nov 2023 03:14:55 +0100 Subject: [PATCH 6/9] Build tvOS on windows --- .github/workflows/unity.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unity.yml b/.github/workflows/unity.yml index e37cb10..db61f27 100644 --- a/.github/workflows/unity.yml +++ b/.github/workflows/unity.yml @@ -19,7 +19,6 @@ jobs: - iOS - StandaloneOSX - StandaloneLinux64 - - tvOS unityVersion: - 2019.4.5f1 steps: @@ -49,6 +48,7 @@ jobs: matrix: targetPlatform: - WSAPlayer + - tvOS unityVersion: - 2019.4.5f1 steps: From b614e2981ee2dcb7b2e48d8e201b19690bfe2725 Mon Sep 17 00:00:00 2001 From: szymmirr Date: Tue, 21 Nov 2023 03:16:22 +0100 Subject: [PATCH 7/9] Add caching --- .github/workflows/unity.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/unity.yml b/.github/workflows/unity.yml index db61f27..5730a80 100644 --- a/.github/workflows/unity.yml +++ b/.github/workflows/unity.yml @@ -25,6 +25,13 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 + - uses: actions/cache@v3 + with: + path: Library + key: Library-${{ hashFiles('Assets/**', 'Packages/**', 'ProjectSettings/**') }} + restore-keys: | + Library- + - name: Unity Builder uses: game-ci/unity-builder@v4.0.1 env: @@ -55,6 +62,13 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 + - uses: actions/cache@v3 + with: + path: Library + key: Library-${{ hashFiles('Assets/**', 'Packages/**', 'ProjectSettings/**') }} + restore-keys: | + Library- + - name: Unity Builder uses: game-ci/unity-builder@v4.0.1 env: From a27bb5b207346ddc42ffdd249802821ab38efb50 Mon Sep 17 00:00:00 2001 From: szymmirr Date: Tue, 21 Nov 2023 03:23:28 +0100 Subject: [PATCH 8/9] Build on windows-2022 --- .github/workflows/unity.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unity.yml b/.github/workflows/unity.yml index 5730a80..5dad41f 100644 --- a/.github/workflows/unity.yml +++ b/.github/workflows/unity.yml @@ -50,7 +50,7 @@ jobs: build-on-windows: name: Build ${{ matrix.targetPlatform }} - runs-on: windows-latest + runs-on: windows-2022 strategy: matrix: targetPlatform: From d4fdbe8a89464acd84fbf7d63b7d4926d5b825f4 Mon Sep 17 00:00:00 2001 From: szymmirr Date: Tue, 21 Nov 2023 03:31:29 +0100 Subject: [PATCH 9/9] Remove caching --- .github/workflows/unity.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.github/workflows/unity.yml b/.github/workflows/unity.yml index 5dad41f..76c1276 100644 --- a/.github/workflows/unity.yml +++ b/.github/workflows/unity.yml @@ -25,13 +25,6 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - uses: actions/cache@v3 - with: - path: Library - key: Library-${{ hashFiles('Assets/**', 'Packages/**', 'ProjectSettings/**') }} - restore-keys: | - Library- - - name: Unity Builder uses: game-ci/unity-builder@v4.0.1 env: @@ -62,13 +55,6 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - uses: actions/cache@v3 - with: - path: Library - key: Library-${{ hashFiles('Assets/**', 'Packages/**', 'ProjectSettings/**') }} - restore-keys: | - Library- - - name: Unity Builder uses: game-ci/unity-builder@v4.0.1 env: