Update releaseVersion

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

.github/workflows/build.yml

@@ -53,7 +53,7 @@ jobs:
 
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v7
+    - uses: actions/checkout@v6
 
     # Build runner layout
     - name: Build & Layout Release
@@ -95,7 +95,7 @@ jobs:
             docker_platform: linux/arm64
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v7
+    - uses: actions/checkout@v6
 
     - name: Get latest runner version
       id: latest_runner

.github/workflows/codeql.yml

@@ -23,7 +23,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v7
+      uses: actions/checkout@v6
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/dependency-check.yml

@@ -29,7 +29,7 @@ jobs:
       npm-vulnerabilities: ${{ steps.check-versions.outputs.npm-vulnerabilities }}
       open-dependency-prs: ${{ steps.check-prs.outputs.open-dependency-prs }}
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
       - name: Setup Node.js
         uses: actions/setup-node@v6
         with:

.github/workflows/docker-buildx-upgrade.yml

@@ -17,7 +17,7 @@ jobs:
       BUILDX_CURRENT_VERSION: ${{ steps.check_buildx_version.outputs.CURRENT_VERSION }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
 
       - name: Check Docker version
         id: check_docker_version
@@ -89,7 +89,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
 
       - name: Update Docker version
         shell: bash

.github/workflows/docker-publish.yml

@@ -20,7 +20,7 @@ jobs:
       IMAGE_NAME: ${{ github.repository_owner }}/actions-runner
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
         with:
           ref: ${{ github.event.inputs.releaseBranch }}
 

.github/workflows/dotnet-upgrade.yml

@@ -15,7 +15,7 @@ jobs:
       DOTNET_CURRENT_MAJOR_MINOR_VERSION: ${{ steps.fetch_current_version.outputs.DOTNET_CURRENT_MAJOR_MINOR_VERSION }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
       - name: Get current major minor version
         id: fetch_current_version
         shell: bash
@@ -89,7 +89,7 @@ jobs:
     if: ${{ needs.dotnet-update.outputs.SHOULD_UPDATE == 1 && needs.dotnet-update.outputs.BRANCH_EXISTS == 0 }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
         with:
           ref: feature/dotnetsdk-upgrade/${{ needs.dotnet-update.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }}
       - name: Create Pull Request

.github/workflows/node-upgrade.yml

@@ -9,7 +9,7 @@ jobs:
   update-node:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
       - name: Get latest Node versions
         id: node-versions
         run: |

.github/workflows/npm-audit-typescript.yml

@@ -7,7 +7,7 @@ jobs:
   npm-audit-with-ts-fix:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
       - name: Setup Node.js
         uses: actions/setup-node@v6
         with:

.github/workflows/npm-audit.yml

@@ -9,7 +9,7 @@ jobs:
   npm-audit:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
       
       - name: Setup Node.js
         uses: actions/setup-node@v6

.github/workflows/release.yml

@@ -11,7 +11,7 @@ jobs:
     if: startsWith(github.ref, 'refs/heads/releases/') || github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v7
+    - uses: actions/checkout@v6
 
     # Make sure ./releaseVersion match ./src/runnerversion
     # Query GitHub release ensure version is not used
@@ -86,7 +86,7 @@ jobs:
 
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v7
+    - uses: actions/checkout@v6
 
     # Build runner layout
     - name: Build & Layout Release
@@ -129,7 +129,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - uses: actions/checkout@v7
+    - uses: actions/checkout@v6
 
     # Download runner package tar.gz/zip produced by 'build' job
     - name: Download Artifact (win-x64)
@@ -296,7 +296,7 @@ jobs:
       IMAGE_NAME: ${{ github.repository_owner }}/actions-runner
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
 
       - name: Compute image version
         id: image

images/Dockerfile

@@ -5,8 +5,8 @@ ARG TARGETOS
 ARG TARGETARCH
 ARG RUNNER_VERSION
 ARG RUNNER_CONTAINER_HOOKS_VERSION=0.7.0
-ARG DOCKER_VERSION=29.6.0
-ARG BUILDX_VERSION=0.35.0
+ARG DOCKER_VERSION=29.5.3
+ARG BUILDX_VERSION=0.34.1
 
 RUN apt update -y && apt install curl unzip -y
 

releaseVersion

@@ -1 +1 @@
-<Update to ./src/runnerversion when creating release>
+2.335.0

src/Misc/externals.sh

@@ -7,7 +7,7 @@ NODE_ALPINE_URL=https://github.com/actions/alpine_nodejs/releases/download
 # When you update Node versions you must also create a new release of alpine_nodejs at that updated version.
 # Follow the instructions here: https://github.com/actions/alpine_nodejs?tab=readme-ov-file#getting-started
 NODE20_VERSION="20.20.2"
-NODE24_VERSION="24.18.0"
+NODE24_VERSION="24.16.0"
 
 get_abs_path() {
   # exploits the fact that pwd will print abs path when no args

src/Runner.Worker/ActionManager.cs

@@ -1108,6 +1108,12 @@ namespace GitHub.Runner.Worker
                     }
                 }
 
+                executionContext.Global.JobTelemetry.Add(new JobTelemetry()
+                {
+                    Type = JobTelemetryType.General,
+                    Message = $"Action archive cache usage: {downloadInfo.ResolvedNameWithOwner}@{downloadInfo.ResolvedSha} use cache {useActionArchiveCache} has cache {hasActionArchiveCache}"
+                });
+
                 if (!useActionArchiveCache)
                 {
                     await DownloadRepositoryArchive(executionContext, link, downloadInfo.Authentication?.Token, archiveFile);
@@ -1116,13 +1122,6 @@ namespace GitHub.Runner.Worker
                 var stagingDirectory = Path.Combine(tempDirectory, "_staging");
                 Directory.CreateDirectory(stagingDirectory);
 
-                var fileInfo = new FileInfo(archiveFile);
-                executionContext.Global.JobTelemetry.Add(new JobTelemetry()
-                {
-                    Type = JobTelemetryType.General,
-                    Message = $"Action archive cache usage: {downloadInfo.ResolvedNameWithOwner}@{downloadInfo.ResolvedSha} use cache {useActionArchiveCache} has cache {hasActionArchiveCache} size {fileInfo.Length} bytes"
-                });
-
 #if OS_WINDOWS
                 try
                 {
@@ -1160,6 +1159,7 @@ namespace GitHub.Runner.Worker
                     int exitCode = await processInvoker.ExecuteAsync(stagingDirectory, tar, $"-xzf \"{archiveFile}\"", null, executionContext.CancellationToken);
                     if (exitCode != 0)
                     {
+                        var fileInfo = new FileInfo(archiveFile);
                         var sha256hash = await IOUtil.GetFileContentSha256HashAsync(archiveFile);
                         throw new InvalidActionArchiveException($"Can't use 'tar -xzf' extract archive file: {archiveFile} (SHA256 '{sha256hash}', size '{fileInfo.Length}' bytes, tar outputs '{string.Join(' ', tarOutputs)}'). Action being checked out: {downloadInfo.NameWithOwner}@{downloadInfo.Ref}. return code: {exitCode}.");
                     }

src/Runner.Worker/BackgroundStepCoordinator.cs

@@ -32,11 +32,6 @@ namespace GitHub.Runner.Worker
         // IDs of background steps that have already been completed (waited on or canceled).
         // Used to avoid waiting on or flushing the same step more than once.
         private readonly HashSet<string> _completedStepIds = new();
-
-        // IDs of background steps that were explicitly canceled via a `cancel` control step.
-        // These steps are expected to be canceled, so their (Canceled) result must not be
-        // merged into the overall job result.
-        private readonly HashSet<string> _explicitlyCanceledStepIds = new();
         private SemaphoreSlim _backgroundSlotSemaphore = new SemaphoreSlim(DefaultMaxBackgroundSteps);
 
         /// <summary>
@@ -46,7 +41,6 @@ namespace GitHub.Runner.Worker
         {
             _backgroundSteps.Clear();
             _completedStepIds.Clear();
-            _explicitlyCanceledStepIds.Clear();
             var max = maxConcurrent > 0 ? maxConcurrent : DefaultMaxBackgroundSteps;
             _backgroundSlotSemaphore = new SemaphoreSlim(max);
         }
@@ -91,9 +85,6 @@ namespace GitHub.Runner.Worker
         // Safety net
         // -----------------------------------------------------------------
 
-        // Drain any background steps that weren't already waited on by an explicit wait/cancel
-        // control step, then merge the final results of all background steps into a single result
-        // for the caller to fold into the job result.
         public async Task<TaskResult> WaitForUnwaitedStepsAsync(CancellationToken cancellationToken)
         {
             var unwaitedIds = _backgroundSteps.Keys.Where(id => !_completedStepIds.Contains(id)).ToList();
@@ -104,26 +95,14 @@ namespace GitHub.Runner.Worker
                 CompleteWaitedSteps(unwaitedIds);
             }
 
+            // Report the merged result of all background steps; the caller merges this into the job result.
             var result = TaskResult.Succeeded;
-            foreach (var (stepId, (step, _, _)) in _backgroundSteps)
+            foreach (var (_, (step, _, _)) in _backgroundSteps)
             {
-                // A step that succeeded does not set a Result by default, so a missing
-                // value means the step succeeded and there is nothing to merge.
-                if (!step.ExecutionContext.Result.HasValue)
+                if (step.ExecutionContext.Result.HasValue)
                 {
-                    continue;
+                    result = TaskResultUtil.MergeTaskResults(result, step.ExecutionContext.Result.Value);
                 }
-
-                // A step explicitly canceled via a `cancel` control step is expected to be canceled,
-                // so a Canceled result must not influence the overall job result. However, if the step
-                // failed (e.g. before the cancellation took effect), that failure should still count.
-                if (_explicitlyCanceledStepIds.Contains(stepId) &&
-                    step.ExecutionContext.Result.Value == TaskResult.Canceled)
-                {
-                    continue;
-                }
-
-                result = TaskResultUtil.MergeTaskResults(result, step.ExecutionContext.Result.Value);
             }
 
             if (result != TaskResult.Succeeded)
@@ -277,13 +256,6 @@ namespace GitHub.Runner.Worker
                 return;
             }
 
-            // Mark these steps as expected-to-be-canceled so their result does not
-            // affect the overall job result.
-            foreach (var id in cancelStepIds)
-            {
-                _explicitlyCanceledStepIds.Add(id);
-            }
-
             var idsToCancel = cancelStepIds
                 .Where(id => _backgroundSteps.ContainsKey(id) && !_backgroundSteps[id].Task.IsCompleted)
                 .ToArray();

src/Runner.Worker/JobExtension.cs

@@ -4,7 +4,6 @@ using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Net;
 using System.Net.Http;
 using System.Runtime.Serialization;
 using System.Threading;
@@ -902,8 +901,8 @@ namespace GitHub.Runner.Worker
                             foreach (var check in _connectivityCheckTasks)
                             {
                                 var result = await check;
-                                Trace.Info($"Connectivity check result: {StringUtil.ConvertToJson(result)}");
-                                context.Global.JobTelemetry.Add(new JobTelemetry() { Type = JobTelemetryType.ConnectivityCheck, Message = $"{StringUtil.ConvertToJson(result)}" });
+                                Trace.Info($"Connectivity check result: {result}");
+                                context.Global.JobTelemetry.Add(new JobTelemetry() { Type = JobTelemetryType.ConnectivityCheck, Message = $"{result.EndpointUrl}: {result.StatusCode}" });
                             }
                         }
                         catch (Exception ex)
@@ -1013,30 +1012,6 @@ namespace GitHub.Runner.Worker
             using (var timeoutTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(timeoutInSeconds)))
             using (var linkedTokenSource = CancellationTokenSource.CreateLinkedTokenSource(token, timeoutTokenSource.Token))
             {
-                try
-                {
-                    var addresses = await Dns.GetHostAddressesAsync(new Uri(endpointUrl).Host, linkedTokenSource.Token);
-                    stopwatch.Stop();
-                    result.DNSResolutionDurationInMs = (int)stopwatch.ElapsedMilliseconds;
-                    result.EndpointIPs = addresses.Select(a => a.ToString()).ToArray();
-                }
-                catch (Exception ex) when (ex is OperationCanceledException && token.IsCancellationRequested)
-                {
-                    Trace.Error($"DNS resolution canceled: {ex}");
-                    result.StatusCode = "dns_canceled";
-                }
-                catch (Exception ex) when (ex is OperationCanceledException && timeoutTokenSource.IsCancellationRequested)
-                {
-                    Trace.Error($"DNS resolution timeout: {ex}");
-                    result.StatusCode = "dns_timeout";
-                }
-                catch (Exception ex)
-                {
-                    Trace.Error($"Catch exception during DNS resolution: {ex}");
-                    result.StatusCode = $"dns_{ex.Message}";
-                }
-
-                stopwatch.Restart();
                 try
                 {
                     using (var httpClientHandler = HostContext.CreateHttpClientHandler())
@@ -1049,7 +1024,7 @@ namespace GitHub.Runner.Worker
                         }
 
                         var response = await httpClient.GetAsync(endpointUrl, linkedTokenSource.Token);
-                        result.StatusCode = $"http_{response.StatusCode}";
+                        result.StatusCode = $"{response.StatusCode}";
 
                         var githubRequestId = UrlUtil.GetGitHubRequestId(response.Headers);
                         var vssRequestId = UrlUtil.GetVssRequestId(response.Headers);
@@ -1061,26 +1036,26 @@ namespace GitHub.Runner.Worker
                         {
                             result.RequestId = vssRequestId;
                         }
-                        stopwatch.Stop();
-                        result.HttpRequestDurationInMs = (int)stopwatch.ElapsedMilliseconds;
                     }
                 }
                 catch (Exception ex) when (ex is OperationCanceledException && token.IsCancellationRequested)
                 {
                     Trace.Error($"Request canceled during connectivity check: {ex}");
-                    result.StatusCode = "http_canceled";
+                    result.StatusCode = "canceled";
                 }
                 catch (Exception ex) when (ex is OperationCanceledException && timeoutTokenSource.IsCancellationRequested)
                 {
                     Trace.Error($"Request timeout during connectivity check: {ex}");
-                    result.StatusCode = "http_timeout";
+                    result.StatusCode = "timeout";
                 }
                 catch (Exception ex)
                 {
                     Trace.Error($"Catch exception during connectivity check: {ex}");
-                    result.StatusCode = $"http_{ex.Message}";
+                    result.StatusCode = $"{ex.Message}";
                 }
             }
+            stopwatch.Stop();
+            result.DurationInMs = (int)stopwatch.ElapsedMilliseconds;
 
             return result;
         }
@@ -1166,7 +1141,7 @@ namespace GitHub.Runner.Worker
                     try
                     {
                         var result = await CheckConnectivity(endpoint.Value, accessToken: accessToken, timeoutInSeconds: checkConnectivityInfo.RequestTimeoutInSecond, token);
-                        testResult.EndpointsResult[endpoint.Key].Add($"{result.StartTime:s}: {result.StatusCode} - {result.RequestId} - {result.HttpRequestDurationInMs}ms");
+                        testResult.EndpointsResult[endpoint.Key].Add($"{result.StartTime:s}: {result.StatusCode} - {result.RequestId} - {result.DurationInMs}ms");
                         if (!testResult.HasFailure &&
                             result.StatusCode != "OK" &&
                             result.StatusCode != "canceled")
@@ -1237,17 +1212,13 @@ namespace GitHub.Runner.Worker
 
             public string EndpointUrl { get; set; }
 
-            public string[] EndpointIPs { get; set; }
-
             public DateTime StartTime { get; set; }
 
             public string StatusCode { get; set; }
 
             public string RequestId { get; set; }
 
-            public int HttpRequestDurationInMs { get; set; }
-
-            public int DNSResolutionDurationInMs { get; set; }
+            public int DurationInMs { get; set; }
         }
     }
 }

src/Test/L0/Worker/BackgroundStepsL0.cs

@@ -372,88 +372,6 @@ namespace GitHub.Runner.Common.Tests.Worker
             }
         }
 
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public async Task CanceledBackgroundStepDoesNotAffectJobResult()
-        {
-            using (TestHostContext hc = CreateTestContext())
-            {
-                // Arrange: a background step that runs until explicitly canceled. When canceled it
-                // reports TaskResult.Canceled, but since the cancellation is expected (driven by a
-                // cancel control step), it must not impact the overall job result.
-                using var stepCts = new CancellationTokenSource();
-
-                var bgStep = CreateStep(hc, TaskResult.Succeeded, "success()", name: "server", contextName: "server", isBackground: true);
-                var bgStepContext = Mock.Get(bgStep.Object.ExecutionContext);
-                bgStepContext.Setup(x => x.CancellationToken).Returns(stepCts.Token);
-                bgStepContext.Setup(x => x.CancelToken()).Callback(() => stepCts.Cancel());
-                bgStep.Setup(x => x.RunAsync()).Returns(async () =>
-                {
-                    await Task.Delay(TimeSpan.FromSeconds(2), stepCts.Token);
-                });
-                bgStep.Setup(x => x.Action).Returns(new GitHub.DistributedTask.Pipelines.ActionStep()
-                {
-                    Name = "server",
-                    Id = Guid.NewGuid(),
-                    ContextName = "server",
-                    Background = true,
-                });
-
-                var cancelStep = CreateCancelStep(hc, "server");
-
-                _ec.Object.Result = null;
-                _ec.Setup(x => x.JobSteps).Returns(new Queue<IStep>(new IStep[]
-                {
-                    bgStep.Object, cancelStep
-                }));
-
-                // Act
-                await _stepsRunner.RunAsync(jobContext: _ec.Object);
-
-                // Assert: the canceled background step reported Canceled, but the job result is unaffected.
-                Assert.Equal(TaskResult.Canceled, bgStep.Object.ExecutionContext.Result);
-                Assert.Equal(TaskResult.Succeeded, _ec.Object.Result ?? TaskResult.Succeeded);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public async Task FailedBackgroundStepTargetedByCancelStillAffectsJobResult()
-        {
-            using (TestHostContext hc = CreateTestContext())
-            {
-                // Arrange: a background step that fails (e.g. before the cancel takes effect). Even
-                // though a cancel control step targets it, its Failed result must still propagate to
-                // the overall job result.
-                var bgStep = CreateStep(hc, TaskResult.Failed, "success()", name: "server", contextName: "server", isBackground: true);
-                bgStep.Setup(x => x.RunAsync()).Returns(Task.CompletedTask);
-                bgStep.Setup(x => x.Action).Returns(new GitHub.DistributedTask.Pipelines.ActionStep()
-                {
-                    Name = "server",
-                    Id = Guid.NewGuid(),
-                    ContextName = "server",
-                    Background = true,
-                });
-
-                var cancelStep = CreateCancelStep(hc, "server");
-
-                _ec.Object.Result = null;
-                _ec.Setup(x => x.JobSteps).Returns(new Queue<IStep>(new IStep[]
-                {
-                    bgStep.Object, cancelStep
-                }));
-
-                // Act
-                await _stepsRunner.RunAsync(jobContext: _ec.Object);
-
-                // Assert: the background step failed, so the job result reflects that failure.
-                Assert.Equal(TaskResult.Failed, bgStep.Object.ExecutionContext.Result);
-                Assert.Equal(TaskResult.Failed, _ec.Object.Result);
-            }
-        }
-
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]