Sync actions/runner

.devcontainer/devcontainer.json

@@ -4,10 +4,10 @@
   "features": {
     "ghcr.io/devcontainers/features/docker-in-docker:1": {},
     "ghcr.io/devcontainers/features/dotnet": {
-      "version": "6.0.421"
+      "version": "8.0.404"
     },
     "ghcr.io/devcontainers/features/node:1": {
-      "version": "16"
+      "version": "20"
     },
     "ghcr.io/devcontainers/features/sshd:1": {
       "version": "latest"

.github/dependabot.yml

@@ -5,6 +5,11 @@ updates:
   schedule:
     interval: "daily" 
   target-branch: "main" 
+- package-ecosystem: "github-actions"
+  directory: "/"
+  schedule:
+    interval: "daily" 
+  target-branch: "main" 
 - package-ecosystem: "nuget"
   directory: "/src"
   schedule:

.github/workflows/build-publish.yml

@@ -26,9 +26,9 @@ jobs:
           - linux-x64
           - linux-arm
           - linux-arm64
-          - alpine-x64
-          - alpine-arm
-          - alpine-arm64
+          - linux-musl-x64
+          - linux-musl-arm
+          - linux-musl-arm64
           - win-x86
           - win-x64
           - win-arm64
@@ -41,9 +41,9 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 8.0.x
       - run: dotnet msbuild src/dir.proj -t:GenerateConstant -p:RunnerVersion=${{ inputs.version || '3.0.0' }} -p:PackageRuntime=${{ !matrix.fxdependent && matrix.runtime || 'Any' }}
-      - run: dotnet publish src/Runner.Client ${{ matrix.fxdependent && '--no-self-contained -p:RuntimeFrameworkVersion=6.0.0' || '--sc' }} -c Release -p:BUILD_OS=${{ matrix.fxdependent && 'Any' || startsWith(matrix.runtime, 'win-') && 'Windows' || startsWith(matrix.runtime, 'osx-') && 'OSX' || 'Linux' }} -r ${{ matrix.runtime }} -p:Version=${{ inputs.version || '3.0.0' }} -o output
+      - run: dotnet publish src/Runner.Client ${{ matrix.fxdependent && '--no-self-contained -p:RuntimeFrameworkVersion=8.0.0' || '--sc' }} -c Release -p:BUILD_OS=${{ matrix.fxdependent && 'Any' || startsWith(matrix.runtime, 'win-') && 'Windows' || startsWith(matrix.runtime, 'osx-') && 'OSX' || 'Linux' }} -r ${{ matrix.runtime }} -p:Version=${{ inputs.version || '3.0.0' }} -o output
       - name: Package tar
         if: ${{ !startsWith(matrix.runtime, 'win-') }}
         run: |
@@ -65,8 +65,9 @@ jobs:
     needs: build
     continue-on-error: true
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
+          pattern: "*"
           path: "artifacts"
       - uses: ncipollo/release-action@v1
         with:
@@ -82,26 +83,26 @@ jobs:
     needs: publish-to-github
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-dotnet@v3
+    - uses: actions/checkout@v4
+    - uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '6.0.x'
+        dotnet-version: '8.0.x'
     - name: GenerateConstant
       run: dotnet msbuild ./dir.proj -t:GenerateConstant -p:RunnerVersion=${{ inputs.version }} -p:PackageRuntime=any
       shell: pwsh
       working-directory: ./src
     - name: Restore
-      run: dotnet restore -p:RuntimeFrameworkVersion=6.0.0
+      run: dotnet restore -p:RuntimeFrameworkVersion=8.0.0
       shell: pwsh
       working-directory: ./src/Runner.Client
     - name: Build
-      run: dotnet build --no-restore -c Release -p:BUILD_OS=Any -p:Version=${{ inputs.version }} -p:RuntimeFrameworkVersion=6.0.0
+      run: dotnet build --no-restore -c Release -p:BUILD_OS=Any -p:Version=${{ inputs.version }} -p:RuntimeFrameworkVersion=8.0.0
       shell: pwsh
       working-directory: ./src/Runner.Client
     - name: Pack
       run: |
-        dotnet pack --no-restore -c Release --no-build -p:Version=${{ inputs.version }} -p:RuntimeFrameworkVersion=6.0.0 -p:CHANGELOG_URL=https://github.com/ChristopherHX/runner.server/releases/tag/v${{ inputs.version }}
-        dotnet pack --no-restore -c Release --no-build -p:Version=${{ inputs.version }} -p:RuntimeFrameworkVersion=6.0.0 -p:CHANGELOG_URL=https://github.com/ChristopherHX/runner.server/releases/tag/v${{ inputs.version }} /p:LegacyDotnetTool=1
+        dotnet pack --no-restore -c Release --no-build -p:Version=${{ inputs.version }} -p:RuntimeFrameworkVersion=8.0.0 -p:CHANGELOG_URL=https://github.com/ChristopherHX/runner.server/releases/tag/v${{ inputs.version }}
+        dotnet pack --no-restore -c Release --no-build -p:Version=${{ inputs.version }} -p:RuntimeFrameworkVersion=8.0.0 -p:CHANGELOG_URL=https://github.com/ChristopherHX/runner.server/releases/tag/v${{ inputs.version }} /p:LegacyDotnetTool=1
       shell: pwsh
       working-directory: ./src/Runner.Client
     - name: Upload Artifacts

.github/workflows/build.yml

@@ -64,7 +64,7 @@ jobs:
 
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     # Build runner layout
     - name: Build & Layout Release
@@ -76,13 +76,13 @@ jobs:
     - name: Package Release
       if: github.event_name != 'pull_request'
       run: |
-        ${{ matrix.devScript }} package Release
+        ${{ matrix.devScript }} package Release ${{ matrix.runtime }}
       working-directory: src
 
     # Upload runner package tar.gz/zip as artifact
     - name: Publish Artifact
       if: github.event_name != 'pull_request'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: runner-package-${{ matrix.runtime }}
         path: |

.github/workflows/codeql.yml

@@ -18,11 +18,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/container.yml

@@ -12,9 +12,9 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - run: |
-        FROM ${{ runner.arch == 'x64' && '--platform=linux/amd64' || runner.arch == 'arm64' && '--platform=linux/arm64' }} mcr.microsoft.com/dotnet/sdk:6.0
+        FROM ${{ runner.arch == 'x64' && '--platform=linux/amd64' || runner.arch == 'arm64' && '--platform=linux/arm64' }} mcr.microsoft.com/dotnet/sdk:8.0
         COPY . ./
-        RUN dotnet msbuild src/dir.proj -t:GenerateConstant && dotnet publish src/Runner.Client -c Release --no-self-contained -p:BUILD_OS=Any -p:RuntimeFrameworkVersion=6.0.0 -o /app
+        RUN dotnet msbuild src/dir.proj -t:GenerateConstant && dotnet publish src/Runner.Client -c Release --no-self-contained -p:BUILD_OS=Any -p:RuntimeFrameworkVersion=8.0.0 -o /app
         FROM mcr.microsoft.com/dotnet/aspnet:latest
         COPY --from=0 /app/ /app/
         ENTRYPOINT [ "dotnet", "/app/Runner.Client.dll" ]

.github/workflows/nuget.yml

@@ -18,30 +18,30 @@ jobs:
     - uses: actions/checkout@v3
     - uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '6.0.x'
+        dotnet-version: '8.0.x'
     - name: GenerateConstant
       run: dotnet msbuild ./dir.proj -t:GenerateConstant /p:RunnerVersion=$(Get-Content ./runnerversion) /p:PackageRuntime=any
       shell: pwsh
       working-directory: ./src
     - name: Restore
-      run: dotnet restore /p:RuntimeFrameworkVersion=6.0.0
+      run: dotnet restore /p:RuntimeFrameworkVersion=8.0.0
       shell: pwsh
       working-directory: ./src/Runner.Client
     - name: Build
       id: build
       run: |
         $d = Get-Date
         $version = $("$(gh release view --repo ${{ github.server_url }}/${{ github.repository }} --json tagName -t "{{.tagName}}")".TrimStart("v") + "-preview." + $d.Year + "." + $d.Month + "." + $d.Day + "." + $d.Hour + "." + $d.Minute + "." + $d.Second + "." + $ENV:GITHUB_RUN_ID)
-        dotnet build --no-restore -c Release /p:BUILD_OS=Any /p:Version=$version /p:RuntimeFrameworkVersion=6.0.0
+        dotnet build --no-restore -c Release /p:BUILD_OS=Any /p:Version=$version /p:RuntimeFrameworkVersion=8.0.0
         echo "version=$version" > $env:GITHUB_OUTPUT
       shell: pwsh
       working-directory: ./src/Runner.Client
       env:
         GH_TOKEN: ${{ github.token }}
     - name: Pack
       run: |
-        dotnet pack --no-restore -c Release --no-build /p:Version=${{steps.build.outputs.version}} /p:RuntimeFrameworkVersion=6.0.0 /p:RepositoryUrl=${{ github.server_url }}/${{ github.repository }}
-        dotnet pack --no-restore -c Release --no-build /p:Version=${{steps.build.outputs.version}} /p:RuntimeFrameworkVersion=6.0.0 /p:LegacyDotnetTool=1 /p:RepositoryUrl=${{ github.server_url }}/${{ github.repository }}
+        dotnet pack --no-restore -c Release --no-build /p:Version=${{steps.build.outputs.version}} /p:RuntimeFrameworkVersion=8.0.0 /p:RepositoryUrl=${{ github.server_url }}/${{ github.repository }}
+        dotnet pack --no-restore -c Release --no-build /p:Version=${{steps.build.outputs.version}} /p:RuntimeFrameworkVersion=8.0.0 /p:LegacyDotnetTool=1 /p:RepositoryUrl=${{ github.server_url }}/${{ github.repository }}
       shell: pwsh
       working-directory: ./src/Runner.Client
     - name: Upload Artifacts
@@ -77,15 +77,14 @@ jobs:
         - ubuntu-latest
         - macos-latest
         dotnet-version:
-        # - '6.0.100'
-        - '6.0.x'
+        - '8.0.x'
         image:
         - ''
         include:
         - os: windows-2022
           tag: ltsc2022
         - os: ubuntu-latest
-          image: mcr.microsoft.com/dotnet/sdk:6.0-alpine3.15
+          image: mcr.microsoft.com/dotnet/sdk:8.0-alpine3.20
           shell: sh
     runs-on: ${{matrix.os}}
     container: ${{matrix.image}}
@@ -234,14 +233,14 @@ jobs:
         cd Runner.Client
         unzip ../src/Runner.Client/nupkg/Runner.Client.${{needs.package.outputs.version}}.nupkg
         chmod -R +rw tools/
-        dotnet tools/net6.0/any/Runner.Server.dll --urls http://*:5000 "--ConnectionStrings:sqlite=Data Source=Agents.db;" &
+        dotnet tools/net8.0/any/Runner.Server.dll --urls http://*:5000 "--ConnectionStrings:sqlite=Data Source=Agents.db;" &
         sleep 2
         echo "Check for creation of sqlite db"
         stat Agents.db
         echo "Configure Runner"
-        dotnet tools/net6.0/any/Runner.Listener.dll configure --url http://localhost:5000 --token nothing
+        dotnet tools/net8.0/any/Runner.Listener.dll configure --url http://localhost:5000 --token nothing
         echo "Start Runner"
-        dotnet tools/net6.0/any/Runner.Listener.dll run&
+        dotnet tools/net8.0/any/Runner.Listener.dll run&
         sleep 2
         echo "Send job"
         cd ..

.gitignore

@@ -26,4 +26,5 @@ _dotnetsdk
 TestResults
 TestLogs
 .DS_Store
+.mono
 **/*.DotSettings.user

README.md

@@ -21,14 +21,13 @@ This fork of [actions/runner](https://github.com/actions/runner) adds two execut
 
 ## Dotnet Tool (Runner.Client)
 The current nuget package [can be found here](https://www.nuget.org/packages/Runner.Client)
-- Install the [dotnet sdk 6.0.0 or newer](https://dotnet.microsoft.com/en-us/download/dotnet)
+- Install the [dotnet sdk 8.0.0 or newer](https://dotnet.microsoft.com/en-us/download/dotnet)
 - Install `dotnet tool install --global Runner.Client`
 - Already Installed? Update `dotnet tool update --global Runner.Client`
 
 ### Dotnet Tool (gharun)
 The legacy nuget package [can be found here](https://www.nuget.org/packages/io.github.christopherhx.gharun)
-- Install the [dotnet sdk 6.0.0 or newer](https://dotnet.microsoft.com/en-us/download/dotnet)
-  - dotnet sdk 6.0.100 and 6.0.x are known to work and tested via CI
+- Install the [dotnet sdk 8.0.0 or newer](https://dotnet.microsoft.com/en-us/download/dotnet)
 - `dotnet tool install --global io.github.christopherhx.gharun`
 - Run `gharun` like `Runner.Client`
 
@@ -127,7 +126,7 @@ This builds `Runner.Client`, `Runner.Server` and a modifed github actions runner
 ### Building a framework dependent and os independent executable
 ```
 dotnet msbuild src/dir.proj -t:GenerateConstant
-dotnet publish src/Runner.Client -c Release --no-self-contained -p:BUILD_OS=Any -p:RuntimeFrameworkVersion=6.0.0
+dotnet publish src/Runner.Client -c Release --no-self-contained -p:BUILD_OS=Any -p:RuntimeFrameworkVersion=8.0.0
 ```
 
 #### To run the package on a different Operating System
@@ -160,7 +159,7 @@ dotnet publish src/Runner.Client -c Release -r win-x64
 ### Building a dotnet tool
 ```
 dotnet msbuild src/dir.proj -t:GenerateConstant
-dotnet pack src/Runner.Client -c Release -p:BUILD_OS=Any -p:RuntimeFrameworkVersion=6.0.0
+dotnet pack src/Runner.Client -c Release -p:BUILD_OS=Any -p:RuntimeFrameworkVersion=8.0.0
 ```
 #### To install the package
 ```
@@ -583,7 +582,7 @@ act -W cache.yml --env ACTIONS_CACHE_URL=http://host.docker.internal:4555/
 ```
 dotnet build ./src/Runner.Server/ /p:EFMigration=ON
 dotnet ef migrations add --project ./src/Runner.Server/ --no-build PersistentJobs
-dotnet pack src/Runner.Client -c Release -p:BUILD_OS=Any -p:RuntimeFrameworkVersion=6.0.0 -p:Version=3.4.0.3
+dotnet pack src/Runner.Client -c Release -p:BUILD_OS=Any -p:RuntimeFrameworkVersion=8.0.0 -p:Version=3.4.0.3
 dotnet tool install -g Runner.Client --add-source src/Runner.Client/nupkg
 dotnet tool update -g Runner.Client --add-source src/Runner.Client/nupkg
 ```

docs/checks/nodejs.md

@@ -4,9 +4,9 @@
 
 Make sure the built-in node.js has access to GitHub.com or GitHub Enterprise Server.
 
-The runner carries its own copy of node.js executable under `<runner_root>/externals/node16/`.
+The runner carries its own copy of node.js executable under `<runner_root>/externals/node20/`.
 
-All javascript base Actions will get executed by the built-in `node` at `<runner_root>/externals/node16/`.
+All javascript base Actions will get executed by the built-in `node` at `<runner_root>/externals/node20/`.
 
 > Not the `node` from `$PATH`
 

images/Dockerfile

@@ -1,12 +1,12 @@
 # Source: https://github.com/dotnet/dotnet-docker
-FROM mcr.microsoft.com/dotnet/runtime-deps:6.0-jammy as build
+FROM mcr.microsoft.com/dotnet/runtime-deps:8.0-jammy as build
 
 ARG TARGETOS
 ARG TARGETARCH
 ARG RUNNER_VERSION
 ARG RUNNER_CONTAINER_HOOKS_VERSION=0.6.1
-ARG DOCKER_VERSION=27.1.1
-ARG BUILDX_VERSION=0.16.2
+ARG DOCKER_VERSION=27.3.1
+ARG BUILDX_VERSION=0.18.0
 
 RUN apt update -y && apt install curl unzip -y
 
@@ -32,7 +32,7 @@ RUN export RUNNER_ARCH=${TARGETARCH} \
         "https://github.com/docker/buildx/releases/download/v${BUILDX_VERSION}/buildx-v${BUILDX_VERSION}.linux-${TARGETARCH}" \
     && chmod +x /usr/local/lib/docker/cli-plugins/docker-buildx
 
-FROM mcr.microsoft.com/dotnet/runtime-deps:6.0-jammy
+FROM mcr.microsoft.com/dotnet/runtime-deps:8.0-jammy
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV RUNNER_MANUALLY_TRAP_SIG=1
@@ -47,7 +47,8 @@ RUN apt update -y \
 # Configure git-core/ppa based on guidance here:  https://git-scm.com/download/linux
 RUN add-apt-repository ppa:git-core/ppa \
     && apt update -y \
-    && apt install -y --no-install-recommends git
+    && apt install -y git \
+    && rm -rf /var/lib/apt/lists/*
 
 RUN adduser --disabled-password --gecos "" --uid 1001 runner \
     && groupadd docker --gid 123 \

releaseNote.md

@@ -1,10 +1,30 @@
 ## What's Changed
 
-- .NET 8 OS compatibility test https://github.com/actions/runner/pull/3422
-- Ignore ssl cert on websocket client https://github.com/actions/runner/pull/3423
-- Revert "Bump runner to dotnet 8" https://github.com/actions/runner/pull/3412
-
-**Full Changelog**: https://github.com/actions/runner/compare/v2.318.0...v2.319.0
+* Fix release workflow to use distinct artifact names by @ericsciple in https://github.com/actions/runner/pull/3485
+* Update dotnet sdk to latest version @6.0.425 by @github-actions in https://github.com/actions/runner/pull/3433
+* add ref and type to job completion in run service by @yaananth in https://github.com/actions/runner/pull/3492
+* Remove Broker Migration Message logging by @luketomlinson in https://github.com/actions/runner/pull/3493
+* Bump dotnet SDK to dotnet 8. by @TingluoHuang in https://github.com/actions/runner/pull/3500
+* Remove dotnet8 compatibility test. by @TingluoHuang in https://github.com/actions/runner/pull/3502
+* Remove node16 from the runner. by @TingluoHuang in https://github.com/actions/runner/pull/3503
+* send action name for run service by @yaananth in https://github.com/actions/runner/pull/3520
+* Handle runner not found by @ericsciple in https://github.com/actions/runner/pull/3536
+* Publish job telemetry to run-service. by @TingluoHuang in https://github.com/actions/runner/pull/3545
+* Fetch repo-level runner groups from API in v2 flow by @lucavallin in https://github.com/actions/runner/pull/3546
+* Allow runner to check service connection in background. by @TingluoHuang in https://github.com/actions/runner/pull/3542
+* Expose ENV for cache service v2. by @TingluoHuang in https://github.com/actions/runner/pull/3548
+* Update runner docker image. by @TingluoHuang in https://github.com/actions/runner/pull/3511
+* Bump Azure.Storage.Blobs from 12.19.1 to 12.23.0 in /src by @dependabot in https://github.com/actions/runner/pull/3549
+* fix dotnet-upgrade.yml to print right version by @TingluoHuang in https://github.com/actions/runner/pull/3550
+* Update dotnet sdk to latest version @8.0.404 by @github-actions in https://github.com/actions/runner/pull/3552
+* Configure dependabot to check github-actions updates by @Goooler in https://github.com/actions/runner/pull/3333
+* Bump actions/checkout from 3 to 4 by @dependabot in https://github.com/actions/runner/pull/3556
+
+## New Contributors
+* @lucavallin made their first contribution in https://github.com/actions/runner/pull/3546
+* @Goooler made their first contribution in https://github.com/actions/runner/pull/3333
+
+**Full Changelog**: https://github.com/actions/runner/compare/v2.320.0...v2.321.0
 
 _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.
@@ -26,9 +46,7 @@ Add-Type -AssemblyName System.IO.Compression.FileSystem ;
 [System.IO.Compression.ZipFile]::ExtractToDirectory("$PWD\actions-runner-win-x64-<RUNNER_VERSION>.zip", "$PWD")
 ```
 
-## [Pre-release] Windows arm64
-
-**Warning:** Windows arm64 runners are currently in preview status and use [unofficial versions of nodejs](https://unofficial-builds.nodejs.org/). They are not intended for production workflows.
+## Windows arm64
 
 We recommend configuring the runner in a root folder of the Windows drive (e.g. "C:\actions-runner"). This will help avoid issues related to service identity folder permissions and long file path restrictions on Windows.
 

src/Directory.Build.props

@@ -56,4 +56,13 @@
   <PropertyGroup>
     <RollForward>LatestMajor</RollForward>
   </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- Enable NuGet package auditing -->
+    <NuGetAudit>true</NuGetAudit>
+    <!-- Audit direct and transitive packages -->
+    <NuGetAuditMode>all</NuGetAuditMode>
+    <!-- Report low, moderate, high and critical advisories -->
+    <NuGetAuditLevel>moderate</NuGetAuditLevel>
+  </PropertyGroup>
 </Project>