mirror of
https://github.com/actions/runner.git
synced 2025-12-10 12:36:23 +00:00
Compare commits
2 Commits
fhammerl/s
...
feature/do
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ad8d7c3f16 | ||
|
|
eaeb0a9a7b |
@@ -4,7 +4,7 @@
|
||||
"features": {
|
||||
"ghcr.io/devcontainers/features/docker-in-docker:1": {},
|
||||
"ghcr.io/devcontainers/features/dotnet": {
|
||||
"version": "6.0.415"
|
||||
"version": "6.0.417"
|
||||
},
|
||||
"ghcr.io/devcontainers/features/node:1": {
|
||||
"version": "16"
|
||||
|
||||
@@ -1 +1 @@
|
||||
531b31914e525ecb12cc5526415bc70a112ebc818f877347af1a231011f539c5
|
||||
e0d58e4d74a124f722a549f48eb5fe38fdbdd8eb389032a20ab29ca6d18f5384
|
||||
|
||||
@@ -1 +1 @@
|
||||
722dd5fa5ecc207fcccf67f6e502d689f2119d8117beff2041618fba17dc66a4
|
||||
734bbc98fe1862447c661791f5fd9a457fb11e0342e73c2ac977aa5a5e4d4e78
|
||||
|
||||
@@ -1 +1 @@
|
||||
8ca75c76e15ab9dc7fe49a66c5c74e171e7fabd5d26546fda8931bd11bff30f9
|
||||
e44bef2f3dfe6947cfbfe0af74e0c1e19804f44ac3f744082cba5a2d1496a058
|
||||
|
||||
@@ -1 +1 @@
|
||||
70496eb1c99b39b3373b5088c95a35ebbaac1098e6c47c8aab94771f3ffbf501
|
||||
b1357994d44da169b6876f7b877388587fbb5a61a32d202539bfc266c07b5a3e
|
||||
|
||||
@@ -1 +1 @@
|
||||
4f8d48727d535daabcaec814e0dafb271c10625366c78e7e022ca7477a73023f
|
||||
2429d6dd57a3ed0ddf307722539b150503d0a0d03b6f14426f42e39a6a37cf20
|
||||
|
||||
@@ -1 +1 @@
|
||||
d54d7428f2b9200a0030365a6a4e174e30a1b29b922f8254dffb2924bd09549d
|
||||
b5110498a8c60e137a238d8dcd914baf7b00bda85128c112cc1292846192e20b
|
||||
|
||||
@@ -1 +1 @@
|
||||
eaa939c45307f46b7003902255b3a2a09287215d710984107667e03ac493eb26
|
||||
5a655b7d9ac9df1f2bec874307719627a4dd0f8592f64b8d89eecfd760d02ddf
|
||||
|
||||
@@ -19,13 +19,6 @@ namespace GitHub.Runner.Common
|
||||
{
|
||||
DefaultTraceLevel = TraceLevel.Verbose;
|
||||
}
|
||||
else if (int.TryParse(Environment.GetEnvironmentVariable("ACTIONS_RUNNER_TRACE_LEVEL"), out var traceLevel))
|
||||
{
|
||||
// force user's TraceLevel to comply with runner TraceLevel enums
|
||||
traceLevel = Math.Clamp(traceLevel, 0, 5);
|
||||
|
||||
DefaultTraceLevel = (TraceLevel)traceLevel;
|
||||
}
|
||||
}
|
||||
|
||||
[DataMember(EmitDefaultValue = false)]
|
||||
|
||||
@@ -172,43 +172,6 @@ namespace GitHub.Runner.Common.Tests
|
||||
}
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData("randomString", "0", "VERB", "FALSELEVEL")]
|
||||
[InlineData("", "-1", "", "INFO")]
|
||||
[InlineData("", "6", "VERB", "FALSELEVEL")]
|
||||
[InlineData("", "99", "VERB", "FALSELEVEL")]
|
||||
[Trait("Level", "L0")]
|
||||
[Trait("Category", "Common")]
|
||||
public void TraceLevel(string trace, string traceLevel, string mustContainTraceLevel, string mustNotContainTraceLevel)
|
||||
{
|
||||
try
|
||||
{
|
||||
Environment.SetEnvironmentVariable("GITHUB_ACTIONS_RUNNER_TRACE", trace);
|
||||
Environment.SetEnvironmentVariable("ACTIONS_RUNNER_TRACE_LEVEL", traceLevel);
|
||||
|
||||
// Arrange.
|
||||
Setup();
|
||||
_hc.SetDefaultCulture("hu-HU"); // logs [VERB] if traceLevel allows it
|
||||
|
||||
// Assert.
|
||||
var logFile = Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), $"trace_{nameof(HostContextL0)}_{nameof(TraceLevel)}.log");
|
||||
var tempFile = Path.GetTempFileName();
|
||||
File.Delete(tempFile);
|
||||
File.Copy(logFile, tempFile);
|
||||
|
||||
var content = File.ReadAllText(tempFile);
|
||||
Assert.Contains($"{mustContainTraceLevel}", content);
|
||||
Assert.DoesNotContain($"{mustNotContainTraceLevel}", content);
|
||||
}
|
||||
finally
|
||||
{
|
||||
Environment.SetEnvironmentVariable("GITHUB_ACTIONS_RUNNER_TRACE", null);
|
||||
Environment.SetEnvironmentVariable("ACTIONS_RUNNER_TRACE_LEVEL", null);
|
||||
// Cleanup.
|
||||
Teardown();
|
||||
}
|
||||
}
|
||||
|
||||
private void Setup([CallerMemberName] string testName = "")
|
||||
{
|
||||
_tokenSource = new CancellationTokenSource();
|
||||
|
||||
@@ -22,7 +22,7 @@ DOWNLOAD_DIR="$SCRIPT_DIR/../_downloads/netcore2x"
|
||||
PACKAGE_DIR="$SCRIPT_DIR/../_package"
|
||||
PACKAGE_TRIMS_DIR="$SCRIPT_DIR/../_package_trims"
|
||||
DOTNETSDK_ROOT="$SCRIPT_DIR/../_dotnetsdk"
|
||||
DOTNETSDK_VERSION="6.0.415"
|
||||
DOTNETSDK_VERSION="6.0.417"
|
||||
DOTNETSDK_INSTALLDIR="$DOTNETSDK_ROOT/$DOTNETSDK_VERSION"
|
||||
RUNNER_VERSION=$(cat runnerversion)
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"sdk": {
|
||||
"version": "6.0.415"
|
||||
"version": "6.0.417"
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user