From 720ee0c896374324ed7e7c90eb6fdf498844b689 Mon Sep 17 00:00:00 2001 From: Webber Date: Sat, 13 Jun 2020 15:45:03 +0200 Subject: [PATCH 1/5] Acquire activation files --- .github/workflows/activation.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .github/workflows/activation.yml diff --git a/.github/workflows/activation.yml b/.github/workflows/activation.yml new file mode 100644 index 00000000..444206c3 --- /dev/null +++ b/.github/workflows/activation.yml @@ -0,0 +1,27 @@ +name: Acquire activation file +on: [push] +jobs: + activation: + name: Request manual activation file (${{ matrix.unityVersion }}) 🔑 + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + unityVersion: + - 2019.2.11f1 + - 2019.3.15f1 + + steps: + # Request manual activation file + - name: Request manual activation file + id: getManualLicenseFile + uses: webbertakken/unity-request-manual-activation-file@v1.1 + with: + unityVersion: ${{ matrix.unityVersion }} + + # Upload artifact (Unity_v20XX.X.XXXX.alf) + - name: Expose as artifact + uses: actions/upload-artifact@v1 + with: + name: ${{ steps.getManualLicenseFile.outputs.filePath }} + path: ${{ steps.getManualLicenseFile.outputs.filePath }} From 98a56c4169fae85291784ec035bc62194c4f4af6 Mon Sep 17 00:00:00 2001 From: Webber Date: Sat, 13 Jun 2020 15:53:13 +0200 Subject: [PATCH 2/5] Add 2019.3.15 workflow --- .github/workflows/main.yml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e96f6c37..4f167de8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,7 +5,8 @@ on: push: { branches: [master] } env: - UNITY_LICENSE: "\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \nJHdOBFmBNq2H8BrGFzir/StLoYo=aENLHd37a51RtP2/g7YU0Pexf5mx0/ENXYGtrPzqwZ8NQt2AsSdxGnl0CUB45/GuNXfJVDt2HWot\ncNYZB2OylVBn1WHQbKZlPmm8gEAMz0MYbr4Isb5i5buryBrZlmbEOjnRI+pEg1CBwlgMo6xdtjjE\n/d7cC293QIUO91kdzRXftYou1dNaUyuPL9ZH65vdB2pDXGRNxgUVD+GnnqZA7b5L2HXqNQclcWAK\n5Yd1BeF3VzR1iLw9G/SmH5oOhnpXSmqbL4qk7LVP2/mgXpFk5kP4X8VC3z47obNhBIGq40dwWyEe\nUYk5/nRAOkZawDT+tcu96e06gPC9Cxk5PdbRbA==" + UNITY_LICENSE_2019_2_11f1: "\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \nJHdOBFmBNq2H8BrGFzir/StLoYo=aENLHd37a51RtP2/g7YU0Pexf5mx0/ENXYGtrPzqwZ8NQt2AsSdxGnl0CUB45/GuNXfJVDt2HWot\ncNYZB2OylVBn1WHQbKZlPmm8gEAMz0MYbr4Isb5i5buryBrZlmbEOjnRI+pEg1CBwlgMo6xdtjjE\n/d7cC293QIUO91kdzRXftYou1dNaUyuPL9ZH65vdB2pDXGRNxgUVD+GnnqZA7b5L2HXqNQclcWAK\n5Yd1BeF3VzR1iLw9G/SmH5oOhnpXSmqbL4qk7LVP2/mgXpFk5kP4X8VC3z47obNhBIGq40dwWyEe\nUYk5/nRAOkZawDT+tcu96e06gPC9Cxk5PdbRbA==" + UNITY_LICENSE_2019_3_15f1: "\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \nbpzWx3PZ0lqWDo1m9aLQuZ4cweo=QcDm4/qAXZuUMQbUVk63vO6u66Bp8PnqqWQcZZOcym/rGUZLj1sr66EquF3X3w1L7aqiwMGtbY2b\nkPttcalFeaBkc5NsJMrexWjuBCxQvhbmVFQnTjvC6vNS+k1wrkz7If1oPkz/XaDtCfUs8oxc9iPe\nPzzUJIVYLZoDtpPq2XbgVn9/TiVb3Zu6ldKgvtNRYUjrB3KywtvL9OcIFll3htRcBZPG43kxryJc\nDD2TL5Nw1JuX6MejBBuYTZsZNpGX9Pjop9+uFUZ4GI9h8a5g6wJUfXzsGw7j4gkvDkC9MvyWiksi\n2hNXw1QNeB6JfQsd4sAuhYh/CqTm2gCz9i9ZpA==" CODECOV_TOKEN: '2f2eb890-30e2-4724-83eb-7633832cf0de' jobs: @@ -34,7 +35,12 @@ jobs: - test-project unityVersion: - 2019.2.11f1 - # - 2019.3.0f1 # requires different license file/method + - 2019.3.15f1 + include: + - unityVersion: 2019.2.11f1 + license: ${UNITY_LICENSE_2019_2_11f1} + - unityVersion: 2019.3.15f1 + license: ${UNITY_LICENSE_2019_3_15f1} targetPlatform: - StandaloneOSX # Build a macOS standalone (Intel 64-bit). - StandaloneWindows # Build a Windows standalone. @@ -61,6 +67,8 @@ jobs: Library-${{ matrix.projectPath }}- Library- - uses: ./ + env: + UNITY_LICENSE: ${{ matrix.license }} with: projectPath: ${{ matrix.projectPath }} unityVersion: ${{ matrix.unityVersion }} @@ -68,5 +76,5 @@ jobs: customParameters: -profile SomeProfile -someBoolean -someValue exampleValue - uses: actions/upload-artifact@v1 with: - name: Build + name: Build (${{ matrix.unityVersion }}) path: build From 7749b8862d27c08cc6ce71944f7a3cfa367f4b89 Mon Sep 17 00:00:00 2001 From: Webber Date: Sat, 13 Jun 2020 16:41:11 +0200 Subject: [PATCH 3/5] Add matrix support for multi license --- .github/workflows/activation.yml | 2 ++ .github/workflows/main.yml | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/activation.yml b/.github/workflows/activation.yml index 444206c3..c2c4a5fc 100644 --- a/.github/workflows/activation.yml +++ b/.github/workflows/activation.yml @@ -1,5 +1,7 @@ name: Acquire activation file + on: [push] + jobs: activation: name: Request manual activation file (${{ matrix.unityVersion }}) 🔑 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4f167de8..859b4a4d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,8 +5,6 @@ on: push: { branches: [master] } env: - UNITY_LICENSE_2019_2_11f1: "\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \nJHdOBFmBNq2H8BrGFzir/StLoYo=aENLHd37a51RtP2/g7YU0Pexf5mx0/ENXYGtrPzqwZ8NQt2AsSdxGnl0CUB45/GuNXfJVDt2HWot\ncNYZB2OylVBn1WHQbKZlPmm8gEAMz0MYbr4Isb5i5buryBrZlmbEOjnRI+pEg1CBwlgMo6xdtjjE\n/d7cC293QIUO91kdzRXftYou1dNaUyuPL9ZH65vdB2pDXGRNxgUVD+GnnqZA7b5L2HXqNQclcWAK\n5Yd1BeF3VzR1iLw9G/SmH5oOhnpXSmqbL4qk7LVP2/mgXpFk5kP4X8VC3z47obNhBIGq40dwWyEe\nUYk5/nRAOkZawDT+tcu96e06gPC9Cxk5PdbRbA==" - UNITY_LICENSE_2019_3_15f1: "\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \nbpzWx3PZ0lqWDo1m9aLQuZ4cweo=QcDm4/qAXZuUMQbUVk63vO6u66Bp8PnqqWQcZZOcym/rGUZLj1sr66EquF3X3w1L7aqiwMGtbY2b\nkPttcalFeaBkc5NsJMrexWjuBCxQvhbmVFQnTjvC6vNS+k1wrkz7If1oPkz/XaDtCfUs8oxc9iPe\nPzzUJIVYLZoDtpPq2XbgVn9/TiVb3Zu6ldKgvtNRYUjrB3KywtvL9OcIFll3htRcBZPG43kxryJc\nDD2TL5Nw1JuX6MejBBuYTZsZNpGX9Pjop9+uFUZ4GI9h8a5g6wJUfXzsGw7j4gkvDkC9MvyWiksi\n2hNXw1QNeB6JfQsd4sAuhYh/CqTm2gCz9i9ZpA==" CODECOV_TOKEN: '2f2eb890-30e2-4724-83eb-7633832cf0de' jobs: @@ -37,10 +35,13 @@ jobs: - 2019.2.11f1 - 2019.3.15f1 include: + # Please be polite; don't copy my personal licenses. + # These are here because they are needed to allowing pull requests from forks to unity-builder. + # You should be using ${{ secrets.UNITY_LICENSE_2019_3_15 }} here. - unityVersion: 2019.2.11f1 - license: ${UNITY_LICENSE_2019_2_11f1} + license: "\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \nJHdOBFmBNq2H8BrGFzir/StLoYo=aENLHd37a51RtP2/g7YU0Pexf5mx0/ENXYGtrPzqwZ8NQt2AsSdxGnl0CUB45/GuNXfJVDt2HWot\ncNYZB2OylVBn1WHQbKZlPmm8gEAMz0MYbr4Isb5i5buryBrZlmbEOjnRI+pEg1CBwlgMo6xdtjjE\n/d7cC293QIUO91kdzRXftYou1dNaUyuPL9ZH65vdB2pDXGRNxgUVD+GnnqZA7b5L2HXqNQclcWAK\n5Yd1BeF3VzR1iLw9G/SmH5oOhnpXSmqbL4qk7LVP2/mgXpFk5kP4X8VC3z47obNhBIGq40dwWyEe\nUYk5/nRAOkZawDT+tcu96e06gPC9Cxk5PdbRbA==" - unityVersion: 2019.3.15f1 - license: ${UNITY_LICENSE_2019_3_15f1} + license: "\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \nbpzWx3PZ0lqWDo1m9aLQuZ4cweo=QcDm4/qAXZuUMQbUVk63vO6u66Bp8PnqqWQcZZOcym/rGUZLj1sr66EquF3X3w1L7aqiwMGtbY2b\nkPttcalFeaBkc5NsJMrexWjuBCxQvhbmVFQnTjvC6vNS+k1wrkz7If1oPkz/XaDtCfUs8oxc9iPe\nPzzUJIVYLZoDtpPq2XbgVn9/TiVb3Zu6ldKgvtNRYUjrB3KywtvL9OcIFll3htRcBZPG43kxryJc\nDD2TL5Nw1JuX6MejBBuYTZsZNpGX9Pjop9+uFUZ4GI9h8a5g6wJUfXzsGw7j4gkvDkC9MvyWiksi\n2hNXw1QNeB6JfQsd4sAuhYh/CqTm2gCz9i9ZpA==" targetPlatform: - StandaloneOSX # Build a macOS standalone (Intel 64-bit). - StandaloneWindows # Build a Windows standalone. From 5efb4868adc3efa653661d802a0b6ae68c64c9b4 Mon Sep 17 00:00:00 2001 From: Webber Date: Sat, 13 Jun 2020 16:45:52 +0200 Subject: [PATCH 4/5] Comment out activation --- .github/workflows/activation.yml | 58 ++++++++++++++++---------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/.github/workflows/activation.yml b/.github/workflows/activation.yml index c2c4a5fc..b226d9f4 100644 --- a/.github/workflows/activation.yml +++ b/.github/workflows/activation.yml @@ -1,29 +1,29 @@ -name: Acquire activation file - -on: [push] - -jobs: - activation: - name: Request manual activation file (${{ matrix.unityVersion }}) 🔑 - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - unityVersion: - - 2019.2.11f1 - - 2019.3.15f1 - - steps: - # Request manual activation file - - name: Request manual activation file - id: getManualLicenseFile - uses: webbertakken/unity-request-manual-activation-file@v1.1 - with: - unityVersion: ${{ matrix.unityVersion }} - - # Upload artifact (Unity_v20XX.X.XXXX.alf) - - name: Expose as artifact - uses: actions/upload-artifact@v1 - with: - name: ${{ steps.getManualLicenseFile.outputs.filePath }} - path: ${{ steps.getManualLicenseFile.outputs.filePath }} +#name: Acquire activation file +# +#on: [push] +# +#jobs: +# activation: +# name: Request manual activation file (${{ matrix.unityVersion }}) 🔑 +# runs-on: ubuntu-latest +# strategy: +# fail-fast: false +# matrix: +# unityVersion: +# - 2019.2.11f1 +# - 2019.3.15f1 +# +# steps: +# # Request manual activation file +# - name: Request manual activation file +# id: getManualLicenseFile +# uses: webbertakken/unity-request-manual-activation-file@v1.1 +# with: +# unityVersion: ${{ matrix.unityVersion }} +# +# # Upload artifact (Unity_v20XX.X.XXXX.alf) +# - name: Expose as artifact +# uses: actions/upload-artifact@v1 +# with: +# name: ${{ steps.getManualLicenseFile.outputs.filePath }} +# path: ${{ steps.getManualLicenseFile.outputs.filePath }} From 938926799f6b9870faae3755a77aed5587640f49 Mon Sep 17 00:00:00 2001 From: Webber Date: Sat, 13 Jun 2020 16:57:56 +0200 Subject: [PATCH 5/5] Remove WebGL for faster CI --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 859b4a4d..2615e675 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -49,7 +49,7 @@ jobs: - StandaloneLinux64 # Build a Linux 64-bit standalone. - iOS # Build an iOS player. # - Android # Build an Android .apk standalone app. - - WebGL # WebGL. + # - WebGL # WebGL. # - WSAPlayer # Build an Windows Store Apps player. # - PS4 # Build a PS4 Standalone. # - XboxOne # Build a Xbox One Standalone.