From cc95af7a6579ea8ee5e67283b13c1747c5dc3e90 Mon Sep 17 00:00:00 2001 From: Paul Pacheco Date: Thu, 2 Apr 2020 21:28:31 -0500 Subject: [PATCH] ci: fix and speed up ci build (#1649) Use new version of unity-runner which supports sonarqube --- .github/workflows/main.yml | 14 +++++++------- ProjectSettings/XRSettings.asset | 10 ++++++++++ 2 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 ProjectSettings/XRSettings.asset diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 301bce0c5..819e4afe3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,7 @@ jobs: uses: actions/checkout@v2 - name: Request manual activation file - uses: MirrorNG/unity-runner@master + uses: MirrorNG/unity-runner@2.0.0 id: getManualLicenseFile with: entrypoint: /request_activation.sh @@ -51,24 +51,24 @@ jobs: target: Packages/manifest.json - name: Activate license - uses: MirrorNG/unity-runner@master + uses: MirrorNG/unity-runner@2.0.0 with: entrypoint: /activate.sh - name: Generate Solution - uses: MirrorNG/unity-runner@master + uses: MirrorNG/unity-runner@2.0.0 with: # Arguments to pass to unity args: -buildTarget StandaloneWindows64 -customBuildName MirrorNG -customBuildPath ./build/StandaloneWindows64 -projectPath . -executeMethod UnityEditor.SyncVS.SyncSolution -quit # Configure test runner - name: Run editor Tests - uses: MirrorNG/unity-runner@master + uses: MirrorNG/unity-runner@2.0.0 with: args: -runTests -testPlatform editmode -testResults Tests/editmode-results.xml -enableCodeCoverage -coverageResultsPath Tests - name: Run play Tests - uses: MirrorNG/unity-runner@master + uses: MirrorNG/unity-runner@2.0.0 with: args: -runTests -testPlatform playmode -testResults Tests/playmode-results.xml -enableCodeCoverage -coverageResultsPath Tests @@ -82,9 +82,9 @@ jobs: - name: SonarQube analysis if: always() - uses: MirrorNG/unity-sonarscanner@1.0.1 + uses: MirrorNG/unity-runner@2.0.0 with: - buildCommand: /opt/Unity/Editor/Data/NetCore/Sdk-2.2.107/dotnet build workspace.sln + entrypoint: /sonar-scanner.sh projectKey: vis2k_Mirror projectName: Mirror sonarOrganisation: vis2k diff --git a/ProjectSettings/XRSettings.asset b/ProjectSettings/XRSettings.asset new file mode 100644 index 000000000..482590c19 --- /dev/null +++ b/ProjectSettings/XRSettings.asset @@ -0,0 +1,10 @@ +{ + "m_SettingKeys": [ + "VR Device Disabled", + "VR Device User Alert" + ], + "m_SettingValues": [ + "False", + "False" + ] +} \ No newline at end of file