Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

setup ci automation #1

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 11 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 75 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
name: build
on:
push:
branches:
- 'master'
pull_request:
branches:
- '*'
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
inputs:
clean:
description: 'Clean the project before building'
required: false
default: false
type: 'boolean'
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
StephenHodgson marked this conversation as resolved.
Show resolved Hide resolved
jobs:
build:
env:
UNITY_PROJECT_PATH: '' # set by unity-setup action
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [windows-latest, buildalon-windows]
build-target: [WSAPlayer]
steps:
- uses: actions/checkout@v4
with:
clean: ${{ github.event.inputs.clean == 'true' }}
- uses: buildalon/unity-setup@v1
with:
version-file: ${{ github.workspace }}/ProjectSettings/ProjectVersion.txt
build-targets: ${{ matrix.build-target }}
- uses: buildalon/activate-unity-license@v1
with:
license: 'Personal'
username: ${{ secrets.UNITY_USERNAME }}
password: ${{ secrets.UNITY_PASSWORD }}
- uses: buildalon/unity-action@v1
name: '${{ matrix.build-target }}-Validate'
with:
build-target: ${{ matrix.build-target }}
log-name: '${{ matrix.build-target }}-Validate'
args: '-quit -nographics -batchmode -executeMethod Buildalon.Editor.BuildPipeline.UnityPlayerBuildTools.ValidateProject -importTMProEssentialsAsset'
- uses: buildalon/unity-action@v1
name: '${{ matrix.build-target }}-Build'
with:
build-target: ${{ matrix.build-target }}
log-name: '${{ matrix.build-target }}-Build'
args: '-quit -nographics -batchmode -executeMethod Buildalon.Editor.BuildPipeline.UnityPlayerBuildTools.StartCommandLineBuild -sceneList Assets/Scenes/SampleScene.unity -arch ARM64'
- uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.x'
- uses: microsoft/setup-msbuild@v2
- uses: buildalon/unity-uwp-builder@v1
id: uwp-build
with:
project-path: ${{ env.UNITY_PROJECT_PATH }}/Builds/WSAPlayer
package-type: 'sideload'
- name: print outputs
shell: bash
run: |
echo "Executable: ${{ steps.uwp-build.outputs.executable }}"
echo "Output Directory: ${{ steps.uwp-build.outputs.output-directory }}"
ls -R "${{ steps.uwp-build.outputs.output-directory }}"
- uses: actions/upload-artifact@v4
with:
retention-days: 1
name: ${{ matrix.os }}-${{ matrix.build-target }}.${{ github.run_number }}.${{ github.run_attempt }}
path: |
${{ github.workspace }}/**/*.log
${{ steps.uwp-build.outputs.output-directory }}
19 changes: 18 additions & 1 deletion Assets/XR/Settings/Open XR Package Settings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -1112,12 +1112,13 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9f0ebc320a151d3408ea1e9fce54d40e, type: 3}
m_Name: Open XR Package Settings
m_EditorClassIdentifier:
Keys: 01000000070000000e00000004000000
Keys: 01000000070000000e000000040000000d000000
Values:
- {fileID: -6972551045068313342}
- {fileID: -64324148185763206}
- {fileID: 4257799398954384198}
- {fileID: 644808492466642445}
- {fileID: 1959861752276517348}
--- !u!114 &69402297383476091
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1367,6 +1368,22 @@ MonoBehaviour:
company:
priority: 0
required: 0
--- !u!114 &1959861752276517348
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b5a1f07dc5afe854f9f12a4194aca3fb, type: 3}
m_Name: WebGL
m_EditorClassIdentifier:
features: []
m_renderMode: 1
m_depthSubmissionMode: 0
m_symmetricProjection: 0
--- !u!114 &2163979698669853125
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down
16 changes: 13 additions & 3 deletions Packages/manifest.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"dependencies": {
"com.microsoft.mixedreality.openxr": "file:MixedReality/com.microsoft.mixedreality.openxr-1.11.1.tgz",
"com.unity.collab-proxy": "2.4.4",
"com.unity.feature.development": "1.0.1",
"com.unity.inputsystem": "1.8.1",
Expand All @@ -14,6 +15,7 @@
"com.unity.xr.management": "4.4.0",
"com.unity.xr.meta-openxr": "1.0.1",
"com.unity.xr.openxr": "1.9.1",
"com.virtualmaker.buildalon": "1.0.4",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
"com.unity.modules.animation": "1.0.0",
Expand Down Expand Up @@ -44,7 +46,15 @@
"com.unity.modules.video": "1.0.0",
"com.unity.modules.vr": "1.0.0",
"com.unity.modules.wind": "1.0.0",
"com.unity.modules.xr": "1.0.0",
"com.microsoft.mixedreality.openxr": "file:MixedReality/com.microsoft.mixedreality.openxr-1.11.1.tgz"
}
"com.unity.modules.xr": "1.0.0"
},
"scopedRegistries": [
{
"name": "OpenUPM",
"url": "https://package.openupm.com",
"scopes": [
"com.virtualmaker"
]
}
]
}
49 changes: 0 additions & 49 deletions Packages/manifest.json.backup

This file was deleted.

37 changes: 22 additions & 15 deletions Packages/packages-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -221,14 +221,14 @@
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.editorcoroutines": "1.0.0",
"com.unity.ugui": "1.0.0",
"com.unity.modules.ui": "1.0.0",
"com.unity.inputsystem": "1.3.0",
"com.unity.mathematics": "1.2.5",
"com.unity.xr.core-utils": "2.2.1",
"com.unity.xr.management": "4.0.1",
"com.unity.ugui": "1.0.0",
"com.unity.mathematics": "1.2.5",
"com.unity.editorcoroutines": "1.0.0",
"com.unity.modules.particlesystem": "1.0.0",
"com.unity.modules.ui": "1.0.0",
"com.unity.modules.unityanalytics": "1.0.0",
"com.unity.modules.unitywebrequest": "1.0.0"
},
Expand All @@ -248,11 +248,11 @@
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.inputsystem": "1.3.0",
"com.unity.modules.xr": "1.0.0",
"com.unity.inputsystem": "1.3.0",
"com.unity.mathematics": "1.2.6",
"com.unity.xr.core-utils": "2.2.0",
"com.unity.xr.management": "4.0.1",
"com.unity.mathematics": "1.2.6"
"com.unity.xr.management": "4.0.1"
},
"url": "https://packages.unity.com"
},
Expand All @@ -261,14 +261,14 @@
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.ugui": "1.0.0",
"com.unity.modules.xr": "1.0.0",
"com.unity.inputsystem": "1.8.1",
"com.unity.mathematics": "1.2.6",
"com.unity.ugui": "1.0.0",
"com.unity.xr.core-utils": "2.2.3",
"com.unity.modules.audio": "1.0.0",
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.physics": "1.0.0",
"com.unity.modules.xr": "1.0.0"
"com.unity.xr.core-utils": "2.2.3",
"com.unity.modules.physics": "1.0.0"
},
"url": "https://packages.unity.com"
},
Expand All @@ -287,9 +287,9 @@
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.modules.subsystems": "1.0.0",
"com.unity.modules.vr": "1.0.0",
"com.unity.modules.xr": "1.0.0",
"com.unity.modules.subsystems": "1.0.0",
"com.unity.xr.legacyinputhelpers": "2.1.7"
},
"url": "https://packages.unity.com"
Expand All @@ -309,13 +309,20 @@
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.xr.management": "4.4.0",
"com.unity.xr.legacyinputhelpers": "2.1.2",
"com.unity.inputsystem": "1.6.3",
"com.unity.xr.core-utils": "2.1.1"
"com.unity.xr.core-utils": "2.1.1",
"com.unity.xr.management": "4.4.0",
"com.unity.xr.legacyinputhelpers": "2.1.2"
},
"url": "https://packages.unity.com"
},
"com.virtualmaker.buildalon": {
"version": "1.0.4",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://package.openupm.com"
},
"com.unity.modules.ai": {
"version": "1.0.0",
"depth": 0,
Expand Down
18 changes: 13 additions & 5 deletions ProjectSettings/PackageManagerSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ MonoBehaviour:
m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_EnablePreReleasePackages: 0
m_EnablePreReleasePackages: 1
m_AdvancedSettingsExpanded: 1
m_ScopedRegistriesSettingsExpanded: 1
m_SeeAllPackageVersions: 0
m_DismissPreviewPackagesInUse: 0
oneTimeWarningShown: 0
oneTimeWarningShown: 1
m_Registries:
- m_Id: main
m_Name:
Expand All @@ -26,11 +26,19 @@ MonoBehaviour:
m_IsDefault: 1
m_Capabilities: 7
m_ConfigSource: 0
m_UserSelectedRegistryName:
- m_Id: scoped:project:OpenUPM
m_Name: OpenUPM
m_Url: https://package.openupm.com
m_Scopes:
- com.virtualmaker
m_IsDefault: 0
m_Capabilities: 0
m_ConfigSource: 4
m_UserSelectedRegistryName: OpenUPM
m_UserAddingNewScopedRegistry: 0
m_RegistryInfoDraft:
m_Modified: 0
m_ErrorMessage:
m_UserModificationsInstanceId: -860
m_OriginalInstanceId: -862
m_UserModificationsInstanceId: -838
m_OriginalInstanceId: -840
m_LoadAssets: 0
11 changes: 8 additions & 3 deletions ProjectSettings/ProjectSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ PlayerSettings:
androidAutoRotationBehavior: 1
defaultIsNativeResolution: 1
macRetinaSupport: 1
runInBackground: 1
runInBackground: 0
captureSingleScreen: 0
muteOtherAudioSources: 0
Prepare IOS For Recording: 0
Expand Down Expand Up @@ -162,7 +162,8 @@ PlayerSettings:
androidMaxAspectRatio: 2.1
applicationIdentifier:
Android: com.unity.template.mixedreality
Standalone: com.unity.template.mr
Standalone: com.unity.template.mixedreality
Windows Store Apps: com.unity.template.mixedreality
buildNumber:
Standalone: 0
VisionOS: 0
Expand Down Expand Up @@ -882,7 +883,11 @@ PlayerSettings:
metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0}
metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, a: 1}
metroSplashScreenUseBackgroundColor: 0
platformCapabilities: {}
platformCapabilities:
WindowsStoreApps:
GazeInput: True
SpatialPerception: True
WebCam: True
metroTargetDeviceFamilies: {}
metroFTAName:
metroFTAFileTypes: []
Expand Down
Loading