Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
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
2 changes: 1 addition & 1 deletion src/Misc/contentHash/dotnetRuntime/linux-arm
Original file line number Diff line number Diff line change
@@ -1 +1 @@
531b31914e525ecb12cc5526415bc70a112ebc818f877347af1a231011f539c5
54d95a44d118dba852395991224a6b9c1abe916858c87138656f80c619e85331
2 changes: 1 addition & 1 deletion src/Misc/contentHash/dotnetRuntime/linux-arm64
Original file line number Diff line number Diff line change
@@ -1 +1 @@
722dd5fa5ecc207fcccf67f6e502d689f2119d8117beff2041618fba17dc66a4
68015af17f06a824fa478e62ae7393766ce627fd5599ab916432a14656a19a52
2 changes: 1 addition & 1 deletion src/Misc/contentHash/dotnetRuntime/linux-x64
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8ca75c76e15ab9dc7fe49a66c5c74e171e7fabd5d26546fda8931bd11bff30f9
a2628119ca419cb54e279103ffae7986cdbd0814d57c73ff0dc74c38be08b9ae
2 changes: 1 addition & 1 deletion src/Misc/contentHash/dotnetRuntime/osx-arm64
Original file line number Diff line number Diff line change
@@ -1 +1 @@
70496eb1c99b39b3373b5088c95a35ebbaac1098e6c47c8aab94771f3ffbf501
de71ca09ead807e1a2ce9df0a5b23eb7690cb71fff51169a77e4c3992be53dda
2 changes: 1 addition & 1 deletion src/Misc/contentHash/dotnetRuntime/osx-x64
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4f8d48727d535daabcaec814e0dafb271c10625366c78e7e022ca7477a73023f
d009e05e6b26d614d65be736a15d1bd151932121c16a9ff1b986deadecc982b9
2 changes: 1 addition & 1 deletion src/Misc/contentHash/dotnetRuntime/win-arm64
Original file line number Diff line number Diff line change
@@ -1 +1 @@
d54d7428f2b9200a0030365a6a4e174e30a1b29b922f8254dffb2924bd09549d
f730db39c2305800b4653795360ba9c10c68f384a46b85d808f1f9f0ed3c42e4
2 changes: 1 addition & 1 deletion src/Misc/contentHash/dotnetRuntime/win-x64
Original file line number Diff line number Diff line change
@@ -1 +1 @@
eaa939c45307f46b7003902255b3a2a09287215d710984107667e03ac493eb26
a35b5722375490e9473cdcccb5e18b41eba3dbf4344fe31abc9821e21f18ea5a
9 changes: 8 additions & 1 deletion src/Misc/runnercoreassets
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ darwin.svc.sh.template
hashFiles/index.js
installdependencies.sh
macos-run-invoker.js
Azure.Core.dll
Azure.Storage.Blobs.dll
Azure.Storage.Common.dll
Microsoft.Bcl.AsyncInterfaces.dll
Microsoft.IdentityModel.Logging.dll
Microsoft.IdentityModel.Tokens.dll
Minimatch.dll
Expand Down Expand Up @@ -46,12 +50,15 @@ runsvc.sh
Sdk.deps.json
Sdk.dll
Sdk.pdb
System.Diagnostics.DiagnosticSource.dll
System.IdentityModel.Tokens.Jwt.dll
System.IO.Hashing.dll
System.Memory.Data.dll
System.Net.Http.Formatting.dll
System.Security.Cryptography.Pkcs.dll
System.Security.Cryptography.ProtectedData.dll
System.ServiceProcess.ServiceController.dll
systemd.svc.sh.template
update.cmd.template
update.sh.template
YamlDotNet.dll
YamlDotNet.dll
1 change: 0 additions & 1 deletion src/Misc/runnerdotnetruntimeassets
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ System.Data.DataSetExtensions.dll
System.Data.dll
System.Diagnostics.Contracts.dll
System.Diagnostics.Debug.dll
System.Diagnostics.DiagnosticSource.dll
System.Diagnostics.FileVersionInfo.dll
System.Diagnostics.Process.dll
System.Diagnostics.StackTrace.dll
Expand Down
4 changes: 2 additions & 2 deletions src/Runner.Common/JobServerQueue.cs
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ public void Start(Pipelines.AgentJobRequestMessage jobRequest, bool resultsServi
{
liveConsoleFeedUrl = feedStreamUrl;
}

_resultsServer.InitializeResultsClient(new Uri(resultsReceiverEndpoint), liveConsoleFeedUrl, accessToken);
jobRequest.Variables.TryGetValue("system.github.results_upload_with_sdk", out VariableValue resultsUseSdkVariable);
_resultsServer.InitializeResultsClient(new Uri(resultsReceiverEndpoint), liveConsoleFeedUrl, accessToken, StringUtil.ConvertToBoolean(resultsUseSdkVariable?.Value));
_resultsClientInitiated = true;
}

Expand Down
10 changes: 5 additions & 5 deletions src/Runner.Common/ResultsServer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ namespace GitHub.Runner.Common
[ServiceLocator(Default = typeof(ResultServer))]
public interface IResultsServer : IRunnerService, IAsyncDisposable
{
void InitializeResultsClient(Uri uri, string liveConsoleFeedUrl, string token);
void InitializeResultsClient(Uri uri, string liveConsoleFeedUrl, string token, bool useSdk);

Task<bool> AppendLiveConsoleFeedAsync(Guid scopeIdentifier, string hubName, Guid planId, Guid timelineId, Guid timelineRecordId, Guid stepId, IList<string> lines, long? startLine, CancellationToken cancellationToken);

Expand Down Expand Up @@ -51,9 +51,9 @@ public sealed class ResultServer : RunnerService, IResultsServer
private String _liveConsoleFeedUrl;
private string _token;

public void InitializeResultsClient(Uri uri, string liveConsoleFeedUrl, string token)
public void InitializeResultsClient(Uri uri, string liveConsoleFeedUrl, string token, bool useSdk)
{
this._resultsClient = CreateHttpClient(uri, token);
this._resultsClient = CreateHttpClient(uri, token, useSdk);

_token = token;
if (!string.IsNullOrEmpty(liveConsoleFeedUrl))
Expand All @@ -63,7 +63,7 @@ public void InitializeResultsClient(Uri uri, string liveConsoleFeedUrl, string t
}
}

public ResultsHttpClient CreateHttpClient(Uri uri, string token)
public ResultsHttpClient CreateHttpClient(Uri uri, string token, bool useSdk)
{
// Using default 100 timeout
RawClientHttpRequestSettings settings = VssUtil.GetHttpRequestSettings(null);
Expand All @@ -80,7 +80,7 @@ public ResultsHttpClient CreateHttpClient(Uri uri, string token)

var pipeline = HttpClientFactory.CreatePipeline(httpMessageHandler, delegatingHandlers);

return new ResultsHttpClient(uri, pipeline, token, disposeHandler: true);
return new ResultsHttpClient(uri, pipeline, token, disposeHandler: true, useSdk: useSdk);
}

public Task CreateResultsStepSummaryAsync(string planId, string jobId, Guid stepId, string file,
Expand Down
1 change: 1 addition & 0 deletions src/Sdk/Sdk.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Azure.Storage.Blobs" Version="12.19.1" />
<PackageReference Include="Microsoft.Win32.Registry" Version="4.4.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" />
Expand Down
Loading