From f8bd2b7266bd9cdb01817233a106fdbb2cb2906f Mon Sep 17 00:00:00 2001 From: Webber Date: Wed, 4 Dec 2019 21:11:11 +0100 Subject: [PATCH] Remove all licensing code --- .github/workflows/main.yml | 5 ----- README.md | 2 -- entrypoint.sh | 24 ------------------------ 3 files changed, 31 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cc28f26..1f16c9a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,7 +15,6 @@ jobs: id: allTests uses: ./ env: - UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} TEST_MODE: all UNITY_PROJECT_PATH: unity-project-with-correct-tests # Test implicit ARTIFACTS_PATH, by not setting it @@ -40,7 +39,6 @@ jobs: id: editMode uses: ./ env: - UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} TEST_MODE: editmode UNITY_PROJECT_PATH: unity-project-with-correct-tests ARTIFACTS_PATH: artifacts/editmode @@ -65,7 +63,6 @@ jobs: id: playMode uses: ./ env: - UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} TEST_MODE: playmode UNITY_PROJECT_PATH: unity-project-with-correct-tests ARTIFACTS_PATH: artifacts/editmode @@ -89,7 +86,6 @@ jobs: - name: Tests in editmode 📝 uses: ./ env: - UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} TEST_MODE: editmode UNITY_PROJECT_PATH: unity-project-with-correct-tests ARTIFACTS_PATH: artifacts/editmode @@ -98,7 +94,6 @@ jobs: - name: Tests in playmode 📺 uses: ./ env: - UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} TEST_MODE: playmode UNITY_PROJECT_PATH: unity-project-with-correct-tests ARTIFACTS_PATH: artifacts/playmode diff --git a/README.md b/README.md index d17cbeb..1d493c2 100644 --- a/README.md +++ b/README.md @@ -45,8 +45,6 @@ Configure the test runner as follows: id: myTestStep uses: webbertakken/unity-test-runner@v1 env: - UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} - # Choose: "all", "playmode", "editmode" TEST_MODE: all diff --git a/entrypoint.sh b/entrypoint.sh index 4414e37..df40e27 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,7 +1,6 @@ #!/usr/bin/env bash # Set the license file path -LICENSE_FILE_PATH=UnityLicenseFile.ulf UNITY_PROJECT_PATH=$GITHUB_WORKSPACE/$UNITY_PROJECT_PATH # Set the artifacts path @@ -27,29 +26,6 @@ case $TEST_MODE in ;; esac -# Copy license file from Github variables -echo "$UNITY_LICENSE" | tr -d '\r' > $LICENSE_FILE_PATH -echo "$UNITY_LICENSE" | tr -d '\r' > /root/.local/share/unity3d/Unity/Unity_lic.ulf -# TODO - test if this line has any effect -echo "$UNITY_LICENSE" | tr -d '\r' > /root/.local/share/unity3d/Unity/Unity_v2019.x.ulf - -## -## Activate license -## -echo "Requesting activation" -xvfb-run --auto-servernum --server-args='-screen 0 640x480x24' \ - /opt/Unity/Editor/Unity \ - -batchmode \ - -nographics \ - -logFile /dev/stdout \ - -quit \ - -manualLicenseFile $LICENSE_FILE_PATH -# This is expected to always exit with code 1 (both success and failure). -# Convert to exit code 0 by echoing the current exit code. -echo $? -# Exit code is now 0 - - # The following tests are 2019 mode (requires Unity 2019.2.11f1 or later) # Reference: https://docs.unity3d.com/2019.3/Documentation/Manual/CommandLineArguments.html