8000 Self hosted pipelines by StephenHodgson · Pull Request #678 · XRTK/com.xrtk.core · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
This repository was archived by the owner on Aug 11, 2024. It is now read-only.

Self hosted pipelines #678

Merged
merged 42 commits into from
Nov 22, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
2e853f3
updated build and test steps
Nov 13, 2020
e9e242b
Apply suggestions from code review
StephenHodgson Nov 14, 2020
59034f0
Apply suggestions from code review
StephenHodgson Nov 14, 2020
77dd839
updated pipelines to use VM
StephenHodgson Nov 15, 2020
0482a57
make sure we clean our workspace
StephenHodgson Nov 15, 2020
0ec67a8
added project validation step
StephenHodgson Nov 15, 2020
6e7632d
removed package export and docs build from platform build loop
StephenHodgson Nov 15, 2020
67c995e
Fixed some typos
StephenHodgson Nov 15, 2020
328cfe1
Merge branch 'development' into dev/update-build-pipelines
StephenHodgson Nov 15, 2020
c12b932
fix quotes for exitor path
StephenHodgson Nov 15, 2020
4be3c93
Merge branch 'dev/update-build-pipelines' of https://github.com/XRTK/…
StephenHodgson Nov 15, 2020
5f7f59c
print the path just in case...
StephenHodgson Nov 15, 2020
a0ddb57
remove the parallel strategy
StephenHodgson Nov 15, 2020
5ca69f4
quotes are still not working
StephenHodgson Nov 15, 2020
4558788
try to get the output back to the console
StephenHodgson Nov 15, 2020
a6ae55f
not sure why it isn't installing correctly
StephenHodgson Nov 15, 2020
87284a1
kick the build
StephenHodgson Nov 16, 2020
3d314a1
revert seed asmdef changes
StephenHodgson Nov 16, 2020
7b834f4
fixed missing log directory variable
StephenHodgson Nov 16, 2020
6d8d9d6
skip project validation for now
StephenHodgson Nov 16, 2020
3ddb4ca
catch excpetions when trying to initialize speech services on unsuppo…
StephenHodgson Nov 16, 2020
e0c0911
a bit more polish to the speech providers
StephenHodgson Nov 16, 2020
7c34d78
better pattern matching for message
StephenHodgson Nov 16, 2020
d72e538
Merge branch 'development' into dev/update-build-pipelines
StephenHodgson Nov 19, 2020
587f734
Validate project
Nov 19, 2020
4e2546c
add -quit so we don't get stuck forever and use sync solution method …
Nov 19, 2020
e45c0e4
Merge branch 'development' into dev/update-build-pipelines
StephenHodgson Nov 19, 2020
970d316
removed agent specification
Nov 19, 2020
fcbe3b3
test new pool setup
StephenHodgson Nov 19, 2020
f7d3b2f
Add lumin build to core
StephenHodgson Nov 19, 2020
15b9263
don't sign the lumin package
StephenHodgson Nov 20, 2020
6ee526a
Merge branch 'development' into dev/update-build-pipelines
StephenHodgson Nov 20, 2020
eeffbfc
format the log file names to group them together
StephenHodgson Nov 20, 2020
c221344
fix typo
StephenHodgson Nov 20, 2020
5f35993
fixed test publishing
Nov 20, 2020
ab452ca
better search pattern for tests
Nov 20, 2020
11abb43
Removed clean workspace to test speed
StephenHodgson Nov 21, 2020
ae46dea
only clean workspace on release or preview release builds
StephenHodgson Nov 21, 2020
3d2bd71
centralized pipeline tasks into a single repo (#685)
StephenHodgson Nov 21, 2020
84cbd02
updated build targets
StephenHodgson Nov 21, 2020
f8d40ea
updated default built targets
StephenHodgson Nov 21, 2020
d0647fa
build all platforms
StephenHodgson Nov 21, 2020
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
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,21 @@ public WindowsDictationDataProvider(string name, uint priority, BaseMixedReality
#if UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_EDITOR_WIN
if (dictationRecognizer == null)
{
dictationRecognizer = new DictationRecognizer();
try
{
dictationRecognizer = new DictationRecognizer();
}
catch (UnityException e)
{
switch (e.Message)
{
case string message when message.Contains("Speech recognition is not supported on this machine."):
Debug.LogWarning($"Skipping {nameof(WindowsDictationDataProvider)} registration.\n{e.Message}");
break;
default:
throw;
}
}
}
#endif // UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_EDITOR_WIN
}
Expand All @@ -40,7 +54,7 @@ public WindowsDictationDataProvider(string name, uint priority, BaseMixedReality
/// <inheritdoc />
public override void Enable()
{
if (!Application.isPlaying) { return; }
if (!Application.isPlaying || dictationRecognizer == null) { return; }

inputSource = MixedRealityToolkit.InputSystem.RequestNewGenericInputSource(Name);
dictationResult = string.Empty;
Expand All @@ -56,7 +70,7 @@ public override void Update()
{
base.Update();

if (!Application.isPlaying) { return; }
if (!Application.isPlaying || dictationRecognizer == null) { return; }

if (!isTransitioning && IsListening && !Microphone.IsRecording(deviceName) && dictationRecognizer.Status == SpeechSystemStatus.Running)
{
Expand All @@ -76,7 +90,7 @@ public override async void Disable()
{
base.Disable();

if (!Application.isPlaying) { return; }
if (!Application.isPlaying || dictationRecognizer == null) { return; }

if (!isTransitioning && IsListening) { await StopRecordingAsync(); }

Expand All @@ -90,7 +104,8 @@ protected override void OnDispose(bool finalizing)
{
if (finalizing)
{
dictationRecognizer.Dispose();
dictationRecognizer?.Dispose();
dictationRecognizer = null;
}

base.OnDispose(finalizing);
Expand Down Expand Up @@ -149,7 +164,11 @@ public override async void StartRecording(GameObject listener = null, float init
/// <inheritdoc />
public override async Task StartRecordingAsync(GameObject listener = null, float initialSilenceTimeout = 5f, float autoSilenceTimeout = 20f, int recordingTime = 10, string micDeviceName = "")
{
if (IsListening || isTransitioning || MixedRealityToolkit.InputSystem == null || !Application.isPlaying)
if (IsListening ||
isTransitioning ||
!Application.isPlaying ||
dictationRecognizer == null ||
MixedRealityToolkit.InputSystem == null)
{
Debug.LogWarning("Unable to start recording");
return;
Expand Down Expand Up @@ -205,7 +224,10 @@ public override async void StopRecording()
/// <inheritdoc />
public override async Task<AudioClip> StopRecordingAsync()
{
if (!IsListening || isTransitioning || !Application.isPlaying)
if (!IsListening ||
isTransitioning ||
!Application.isPlaying ||
dictationRecognizer == null)
{
Debug.LogWarning("Unable to stop recording");
return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,21 @@ public WindowsSpeechDataProvider(string name, uint priority, BaseMixedRealityCon

if (keywordRecognizer == null)
{
keywordRecognizer = new KeywordRecognizer(newKeywords, (ConfidenceLevel)RecognitionConfidenceLevel);
try
{
keywordRecognizer = new KeywordRecognizer(newKeywords, (ConfidenceLevel)RecognitionConfidenceLevel);
}
catch (UnityException e)
{
switch (e.Message)
{
case string message when message.Contains("Speech recognition is not supported on this machine."):
Debug.LogWarning($"Skipping {nameof(WindowsSpeechDataProvider)} registration.\n{e.Message}");
break;
default:
throw;
}
}
}
#endif // UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_EDITOR_WIN
}
Expand All @@ -73,7 +87,7 @@ public override void Enable()
{
base.Enable();

if (!Application.isPlaying || Commands.Length == 0) { return; }
if (!Application.isPlaying || Commands.Length == 0 || keywordRecognizer == null) { return; }

InputSource = MixedRealityToolkit.InputSystem?.RequestNewGenericInputSource("Windows Speech Input Source");

Expand All @@ -90,7 +104,7 @@ public override void Update()
{
base.Update();

if (!keywordRecognizer.IsRunning) { return; }
if (keywordRecognizer == null || !keywordRecognizer.IsRunning) { return; }

for (int i = 0; i < Commands.Length; i++)
{
Expand All @@ -106,7 +120,7 @@ public override void Disable()
{
base.Disable();

if (!Application.isPlaying || Commands.Length == 0) { return; }
if (!Application.isPlaying || Commands.Length == 0 || keywordRecognizer == null) { return; }

StopRecognition();

Expand All @@ -117,7 +131,8 @@ protected override void OnDispose(bool finalizing)
{
if (finalizing)
{
keywordRecognizer.Dispose();
keywordRecognizer?.Dispose();
keywordRecognizer = null;
}

base.OnDispose(finalizing);
Expand All @@ -140,7 +155,7 @@ protected override void OnDispose(bool finalizing)
private static KeywordRecognizer keywordRecognizer;

/// <inheritdoc />
public override bool IsRecognitionActive => keywordRecognizer.IsRunning;
public override bool IsRecognitionActive => keywordRecognizer != null && keywordRecognizer.IsRunning;

/// <summary>
/// The <see cref="RecognitionConfidenceLevel"/> that the <see cref="KeywordRecognizer"/> is using.
Expand All @@ -150,7 +165,7 @@ protected override void OnDispose(bool finalizing)
/// <inheritdoc />
public override void StartRecognition()
{
if (!keywordRecognizer.IsRunning)
if (keywordRecognizer != null && !keywordRecognizer.IsRunning)
{
keywordRecognizer.Start();
}
Expand All @@ -159,7 +174,7 @@ public override void StartRecognition()
/// <inheritdoc />
public override void StopRecognition()
{
if (keywordRecognizer.IsRunning)
if (keywordRecognizer != null && keywordRecognizer.IsRunning)
{
keywordRecognizer.Stop();
}
Expand Down
2 changes: 1 addition & 1 deletion XRTK-Core/ProjectSettings/ProjectSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -799,7 +799,7 @@ PlayerSettings:
m_PortalFolderPath:
luminCert:
m_CertPath:
m_SignPackage: 1
m_SignPackage: 0
luminIsChannelApp: 0
luminVersion:
m_VersionCode: 1
Expand Down
25 changes: 23 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
# XRTK Azure Pipelines build configuration

resources:
repositories:
- repository: pipeline_repo
type: github
name: XRTK/AzurePipelines
endpoint: XRTK

variables:
project.name: 'XRTK-Core'
project.upmSha: ''
Expand Down Expand Up @@ -51,5 +60,17 @@ trigger:
- XRTK-Core/Packages/com.xrtk.core/.github/*

extends:
template: azure_pipelines/common.yml

template: common.yml@pipeline_repo
parameters:
# Unity -buildTarget command line args https://docs.unity3d.com/Manual/CommandLineArguments.html
# StandaloneWindows64, WSAPlayer, StandaloneOSX, iOS, StandaloneLinux64, Android, WebGL, Lumin
# TODO: Only use XRTK defined platform targets for build
targets:
- StandaloneWindows64
- WSAPlayer
- StandaloneOSX
- iOS
- StandaloneLinux64
- Android
- Lumin
- WebGL
37 changes: 0 additions & 37 deletions azure_pipelines/common.yml

This file was deleted.

Loading
0