Release 2.320.1 patch runner with #3548 (#3727)

.devcontainer/devcontainer.json

@@ -4,7 +4,7 @@
   "features": {
     "ghcr.io/devcontainers/features/docker-in-docker:1": {},
     "ghcr.io/devcontainers/features/dotnet": {
-      "version": "6.0.427"
+      "version": "6.0.421"
     },
     "ghcr.io/devcontainers/features/node:1": {
       "version": "16"

.github/workflows/release.yml

@@ -285,54 +285,54 @@ jobs:
         asset_name: actions-runner-linux-arm64-${{ steps.releaseNote.outputs.version }}.tar.gz
         asset_content_type: application/octet-stream
 
-  publish-image:
+  # publish-image:
-    needs: release
+  #   needs: release
-    runs-on: ubuntu-latest
+  #   runs-on: ubuntu-latest
-    permissions:
+  #   permissions:
-      contents: read
+  #     contents: read
-      packages: write
+  #     packages: write
-    env:
+  #   env:
-      REGISTRY: ghcr.io
+  #     REGISTRY: ghcr.io
-      IMAGE_NAME: ${{ github.repository_owner }}/actions-runner
+  #     IMAGE_NAME: ${{ github.repository_owner }}/actions-runner
-    steps:
+  #   steps:
-      - name: Checkout repository
+  #     - name: Checkout repository
-        uses: actions/checkout@v3
+  #       uses: actions/checkout@v3
 
-      - name: Compute image version
+  #     - name: Compute image version
-        id: image
+  #       id: image
-        uses: actions/github-script@v6
+  #       uses: actions/github-script@v6
-        with:
+  #       with:
-          script: |
+  #         script: |
-            const fs = require('fs');
+  #           const fs = require('fs');
-            const runnerVersion = fs.readFileSync('${{ github.workspace }}/releaseVersion', 'utf8').replace(/\n$/g, '')
+  #           const runnerVersion = fs.readFileSync('${{ github.workspace }}/releaseVersion', 'utf8').replace(/\n$/g, '')
-            console.log(`Using runner version ${runnerVersion}`)
+  #           console.log(`Using runner version ${runnerVersion}`)
-            core.setOutput('version', runnerVersion);
+  #           core.setOutput('version', runnerVersion);
 
-      - name: Setup Docker buildx
+  #     - name: Setup Docker buildx
-        uses: docker/setup-buildx-action@v2
+  #       uses: docker/setup-buildx-action@v2
 
-      - name: Log into registry ${{ env.REGISTRY }}
+  #     - name: Log into registry ${{ env.REGISTRY }}
-        uses: docker/login-action@v2
+  #       uses: docker/login-action@v2
-        with:
+  #       with:
-          registry: ${{ env.REGISTRY }}
+  #         registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
+  #         username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+  #         password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build and push Docker image
+  #     - name: Build and push Docker image
-        id: build-and-push
+  #       id: build-and-push
-        uses: docker/build-push-action@v3
+  #       uses: docker/build-push-action@v3
-        with:
+  #       with:
-          context: ./images
+  #         context: ./images
-          platforms: |
+  #         platforms: |
-            linux/amd64
+  #           linux/amd64
-            linux/arm64
+  #           linux/arm64
-          tags: |
+  #         tags: |
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.image.outputs.version }}
+  #           ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.image.outputs.version }}
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+  #           ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
-          build-args: |
+  #         build-args: |
-            RUNNER_VERSION=${{ steps.image.outputs.version }}
+  #           RUNNER_VERSION=${{ steps.image.outputs.version }}
-          push: true
+  #         push: true
-          labels: |
+  #         labels: |
-            org.opencontainers.image.source=${{github.server_url}}/${{github.repository}}
+  #           org.opencontainers.image.source=${{github.server_url}}/${{github.repository}}
-            org.opencontainers.image.description=https://github.com/actions/runner/releases/tag/v${{ steps.image.outputs.version }}
+  #           org.opencontainers.image.description=https://github.com/actions/runner/releases/tag/v${{ steps.image.outputs.version }}
-            org.opencontainers.image.licenses=MIT
+  #           org.opencontainers.image.licenses=MIT

releaseNote.md

@@ -1,17 +1,8 @@
 ## What's Changed
 
-- Adding Snapshot additional mapping tokens https://github.com/actions/runner/pull/3468
+- Backport: Expose ENV for cache service v2. https://github.com/actions/runner/pull/3548
-- Create launch httpclient using the right handler and setting https://github.com/actions/runner/pull/3476
-- Fix missing default user-agent for jitconfig runner https://github.com/actions/runner/pull/3473
-- Cleanup back-compat code for interpreting Run Service status codes https://github.com/actions/runner/pull/3456
-- Add runner or worker to the useragent https://github.com/actions/runner/pull/3457
-- Handle Error Body in Responses from Broker https://github.com/actions/runner/pull/3454
-- Fix issues for composite actions (Run Service flow) https://github.com/actions/runner/pull/3446
-- Trace GitHub RequestId to log https://github.com/actions/runner/pull/3442
-- Add `jq`, `git`, `unzip` and `curl` to default packages installed https://github.com/actions/runner/pull/3056
-- Add pid to user-agent and session owner https://github.com/actions/runner/pull/3432
 
-**Full Changelog**: https://github.com/actions/runner/compare/v2.319.1...v2.320.0
+**Full Changelog**: https://github.com/actions/runner/compare/v2.320.0...v2.320.1
 
 _Note: Actions Runner follows a progressive release policy, so the latest release might not be available to your enterprise, organization, or repository yet.
 To confirm which version of the Actions Runner you should expect, please view the download instructions for your enterprise, organization, or repository.

releaseVersion

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

src/Runner.Listener/MessageListener.cs

@@ -264,6 +264,8 @@ namespace GitHub.Runner.Listener
 
                     if (message != null && message.MessageType == BrokerMigrationMessage.MessageType)
                     {
+                        Trace.Info("BrokerMigration message received. Polling Broker for messages...");
+
                         var migrationMessage = JsonUtility.FromString<BrokerMigrationMessage>(message.Body);
 
                         await _brokerServer.UpdateConnectionIfNeeded(migrationMessage.BrokerBaseUrl, _creds);

src/Runner.Worker/ExecutionContext.cs

@@ -508,8 +508,6 @@ namespace GitHub.Runner.Worker
                     Status = _record.State,
                     Number = _record.Order,
                     Name = _record.Name,
-                    Ref = StepTelemetry?.Ref,
-                    Type = StepTelemetry?.Type,
                     StartedAt = _record.StartTime,
                     CompletedAt = _record.FinishTime,
                     Annotations = new List<Annotation>()

src/Runner.Worker/Handlers/NodeScriptActionHandler.cs

@@ -72,6 +72,11 @@ namespace GitHub.Runner.Worker.Handlers
                 Environment["ACTIONS_RESULTS_URL"] = resultsUrl;
             }
 
+            if (ExecutionContext.Global.Variables.GetBoolean("actions_uses_cache_service_v2") ?? false)
+            {
+                Environment["ACTIONS_CACHE_SERVICE_V2"] = bool.TrueString;
+            }
+
             // Resolve the target script.
             string target = null;
             if (stage == ActionRunStage.Main)

src/Sdk/RSWebApi/Contracts/StepResult.cs

@@ -19,12 +19,6 @@ namespace GitHub.Actions.RunService.WebApi
         [DataMember(Name = "name", EmitDefaultValue = false)]
         public string Name { get; set; }
 
-        [DataMember(Name = "ref", EmitDefaultValue = false)]
-        public string Ref { get; set; }
-
-        [DataMember(Name = "type", EmitDefaultValue = false)]
-        public string Type { get; set; }
-
         [DataMember(Name = "status")]
         public TimelineRecordState? Status { get; set; }
 

src/dev.sh

@@ -17,7 +17,7 @@ LAYOUT_DIR="$SCRIPT_DIR/../_layout"
 DOWNLOAD_DIR="$SCRIPT_DIR/../_downloads/netcore2x"
 PACKAGE_DIR="$SCRIPT_DIR/../_package"
 DOTNETSDK_ROOT="$SCRIPT_DIR/../_dotnetsdk"
-DOTNETSDK_VERSION="6.0.427"
+DOTNETSDK_VERSION="6.0.421"
 DOTNETSDK_INSTALLDIR="$DOTNETSDK_ROOT/$DOTNETSDK_VERSION"
 DOTNET8SDK_VERSION="8.0.303"
 DOTNET8SDK_INSTALLDIR="$DOTNETSDK_ROOT/$DOTNET8SDK_VERSION"

src/global.json

@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "6.0.427"
+    "version": "6.0.421"
   }
 }

src/runnerversion

@@ -1 +1 @@
-2.320.0
+2.320.1