diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index c31211d25..151f0a9e0 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,27 +1,24 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
{
- "name": "Actions Runner Devcontainer",
- "image": "mcr.microsoft.com/devcontainers/base:focal",
- "features": {
- "ghcr.io/devcontainers/features/docker-in-docker:1": {},
- "ghcr.io/devcontainers/features/dotnet": {
- "version": "6.0.412"
- },
- "ghcr.io/devcontainers/features/node:1": {
- "version": "16"
- }
- },
- "customizations": {
- "vscode": {
- "extensions": [
- "ms-azuretools.vscode-docker",
- "ms-dotnettools.csharp",
- "eamodio.gitlens"
- ]
- }
- },
- // dotnet restore to install dependencies so OmniSharp works out of the box
- // src/Test restores all other projects it references, src/Runner.PluginHost is not one of them
- "postCreateCommand": "dotnet restore src/Test && dotnet restore src/Runner.PluginHost",
- "remoteUser": "vscode"
-}
\ No newline at end of file
+ "name": "Actions Runner Devcontainer",
+ "image": "mcr.microsoft.com/devcontainers/base:focal",
+ "features": {
+ "ghcr.io/devcontainers/features/docker-in-docker:1": {},
+ "ghcr.io/devcontainers/features/dotnet": {
+ "version": "6.0.414"
+ },
+ "ghcr.io/devcontainers/features/node:1": {
+ "version": "16"
+ }
+ },
+ "customizations": {
+ "vscode": {
+ "extensions": [
+ "ms-azuretools.vscode-docker",
+ "ms-dotnettools.csharp",
+ "eamodio.gitlens"
+ ]
+ }
+ },
+ "postCreateCommand": "dotnet restore src/Test && dotnet restore src/Runner.PluginHost",
+ "remoteUser": "vscode"
+}
diff --git a/.github/workflows/dotnet-upgrade.yml b/.github/workflows/dotnet-upgrade.yml
new file mode 100644
index 000000000..e3d23d254
--- /dev/null
+++ b/.github/workflows/dotnet-upgrade.yml
@@ -0,0 +1,306 @@
+name: "DotNet SDK Upgrade"
+
+on:
+ schedule:
+ - cron: '0 0 * * 1'
+ workflow_dispatch:
+
+jobs:
+ dotnet-update:
+ runs-on: ubuntu-latest
+ outputs:
+ SHOULD_UPDATE: ${{ steps.fetch_latest_version.outputs.SHOULD_UPDATE }}
+ BRANCH_EXISTS: ${{ steps.fetch_latest_version.outputs.BRANCH_EXISTS }}
+ DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION: ${{ steps.fetch_latest_version.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }}
+ DOTNET_CURRENT_MAJOR_MINOR_VERSION: ${{ steps.fetch_current_version.outputs.DOTNET_CURRENT_MAJOR_MINOR_VERSION }}
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v3
+ - name: Get current major minor version
+ id: fetch_current_version
+ shell: bash
+ run: |
+ current_major_minor_patch_version=$(jq .sdk.version ./src/global.json | xargs)
+ current_major_minor_version=$(cut -d '.' -f 1,2 <<< "$current_major_minor_patch_version")
+
+ echo "DOTNET_CURRENT_MAJOR_MINOR_PATCH_VERSION=${current_major_minor_patch_version}" >> $GITHUB_OUTPUT
+ echo "DOTNET_CURRENT_MAJOR_MINOR_VERSION=${current_major_minor_version}" >> $GITHUB_OUTPUT
+ - name: Check patch version
+ id: fetch_latest_version
+ shell: bash
+ run: |
+ latest_patch_version=$(curl -sb -H "Accept: application/json" "https://dotnetcli.blob.core.windows.net/dotnet/Sdk/${{ steps.fetch_current_version.outputs.DOTNET_CURRENT_MAJOR_MINOR_VERSION }}/latest.version")
+ current_patch_version=${{ steps.fetch_current_version.outputs.DOTNET_CURRENT_MAJOR_MINOR_PATCH_VERSION }}
+
+ should_update=0
+ [ "$current_patch_version" != "$latest_patch_version" ] && should_update=1
+
+ # check if git branch already exists for the upgrade
+ branch_already_exists=0
+
+ if git ls-remote --heads --exit-code origin refs/heads/feature/dotnetsdk-upgrade/${latest_patch_version};
+ then
+ branch_already_exists=1
+ should_update=0
+ fi
+ echo "DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION=${latest_patch_version}" >> $GITHUB_OUTPUT
+ echo "SHOULD_UPDATE=${should_update}" >> $GITHUB_OUTPUT
+ echo "BRANCH_EXISTS=${branch_already_exists}" >> $GITHUB_OUTPUT
+ - name: Create an error annotation if branch exists
+ if: ${{ steps.fetch_latest_version.outputs.BRANCH_EXISTS == 1 }}
+ run: echo "::error links::feature/dotnet-sdk-upgrade${{ steps.fetch_latest_version.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }} https://github.com/actions/runner/tree/feature/dotnet-sdk-upgrade${{ steps.fetch_latest_version.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }}::Branch feature/dotnetsdk-upgrade/${{ steps.fetch_latest_version.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }} already exists. Please take a look and delete that branch if you wish to recreate"
+ - name: Create a warning annotation if no need to update
+ if: ${{ steps.fetch_latest_version.outputs.SHOULD_UPDATE == 0 && steps.fetch_latest_version.outputs.BRANCH_EXISTS == 0 }}
+ run: echo "::warning ::Latest DotNet SDK patch is ${{ steps.fetch_latest_version.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }}, and we are on ${{ steps.fetch_latest_version.outputs.DOTNET_CURRENT_MAJOR_MINOR_PATCH_VERSION }}. No need to update"
+ - name: Update patch version
+ if: ${{ steps.fetch_latest_version.outputs.SHOULD_UPDATE == 1 && steps.fetch_latest_version.outputs.BRANCH_EXISTS == 0 }}
+ shell: bash
+ run: |
+ patch_version="${{ steps.fetch_latest_version.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }}"
+ current_version="${{ steps.fetch_current_version.outputs.DOTNET_CURRENT_MAJOR_MINOR_PATCH_VERSION }}"
+
+ # Update globals
+ echo Updating globals
+ globals_temp=$(mktemp)
+ jq --unbuffered --arg patch_version "$patch_version" '.sdk.version = $patch_version' ./src/global.json > "$globals_temp" && mv "$globals_temp" ./src/global.json
+
+ # Update devcontainer
+ echo Updating devcontainer
+ devcontainer_temp=$(mktemp)
+ jq --unbuffered --arg patch_version "$patch_version" '.features."ghcr.io/devcontainers/features/dotnet".version = $patch_version' ./.devcontainer/devcontainer.json > "$devcontainer_temp" && mv "$devcontainer_temp" ./.devcontainer/devcontainer.json
+
+ # Update dev.sh
+ echo Updating start script
+ sed -i "s/DOTNETSDK_VERSION=\"$current_version\"/DOTNETSDK_VERSION=\"$patch_version\"/g" ./src/dev.sh
+ - name: GIT commit and push all changed files
+ if: ${{ steps.fetch_latest_version.outputs.SHOULD_UPDATE == 1 && steps.fetch_latest_version.outputs.BRANCH_EXISTS == 0 }}
+ id: create_branch
+ run: |
+ branch_name="feature/dotnetsdk-upgrade/${{ steps.fetch_latest_version.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }}"
+ git config --global user.name "github-actions[bot]"
+ git config --global user.email "<41898282+github-actions[bot]@users.noreply.github.com>"
+
+ git checkout -b $branch_name
+ git commit -a -m "Upgrade dotnet sdk to v${{ steps.fetch_latest_version.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }}"
+ git push --set-upstream origin $branch_name
+
+ build-hashes:
+ if: ${{ needs.dotnet-update.outputs.SHOULD_UPDATE == 1 && needs.dotnet-update.outputs.BRANCH_EXISTS == 0 }}
+ needs: [dotnet-update]
+ outputs:
+ # pass outputs from this job to create-pr for use
+ DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION: ${{ needs.dotnet-update.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }}
+ DOTNET_CURRENT_MAJOR_MINOR_VERSION: ${{ needs.dotnet-update.outputs.DOTNET_CURRENT_MAJOR_MINOR_VERSION }}
+ NEEDS_HASH_UPDATE: ${{ steps.compute-hash.outputs.NEED_UPDATE }}
+ strategy:
+ fail-fast: false
+ matrix:
+ runtime: [ linux-x64, linux-arm64, linux-arm, win-x64, win-arm64, osx-x64, osx-arm64 ]
+ include:
+ - runtime: linux-x64
+ os: ubuntu-latest
+ devScript: ./dev.sh
+
+ - runtime: linux-arm64
+ os: ubuntu-latest
+ devScript: ./dev.sh
+
+ - runtime: linux-arm
+ os: ubuntu-latest
+ devScript: ./dev.sh
+
+ - runtime: osx-x64
+ os: macOS-latest
+ devScript: ./dev.sh
+
+ - runtime: osx-arm64
+ os: macOS-latest
+ devScript: ./dev.sh
+
+ - runtime: win-x64
+ os: windows-2019
+ devScript: ./dev
+
+ - runtime: win-arm64
+ os: windows-latest
+ devScript: ./dev
+
+ runs-on: ${{ matrix.os }}
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ ref: feature/dotnetsdk-upgrade/${{ needs.dotnet-update.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }}
+
+ # Build runner layout
+ - name: Build & Layout Release
+ run: |
+ ${{ matrix.devScript }} layout Release ${{ matrix.runtime }}
+ working-directory: src
+
+ # Check runtime/externals hash
+ - name: Compute/Compare runtime and externals Hash
+ id: compute-hash
+ continue-on-error: true
+ shell: bash
+ run: |
+ echo "Current dotnet runtime hash result: $DOTNET_RUNTIME_HASH"
+ echo "Current Externals hash result: $EXTERNALS_HASH"
+
+ NeedUpdate=0
+ if [ "$EXTERNALS_HASH" != "$(cat ./src/Misc/contentHash/externals/${{ matrix.runtime }})" ] ;then
+ echo Hash mismatch, Update ./src/Misc/contentHash/externals/${{ matrix.runtime }} to $EXTERNALS_HASH
+
+ echo "EXTERNAL_HASH=$EXTERNALS_HASH" >> $GITHUB_OUTPUT
+ NeedUpdate=1
+ fi
+
+ if [ "$DOTNET_RUNTIME_HASH" != "$(cat ./src/Misc/contentHash/dotnetRuntime/${{ matrix.runtime }})" ] ;then
+ echo Hash mismatch, Update ./src/Misc/contentHash/dotnetRuntime/${{ matrix.runtime }} to $DOTNET_RUNTIME_HASH
+
+ echo "DOTNET_RUNTIME_HASH=$DOTNET_RUNTIME_HASH" >> $GITHUB_OUTPUT
+ NeedUpdate=1
+ fi
+
+ echo "NEED_UPDATE=$NeedUpdate" >> $GITHUB_OUTPUT
+ env:
+ DOTNET_RUNTIME_HASH: ${{hashFiles('**/_layout_trims/runtime/**/*')}}
+ EXTERNALS_HASH: ${{hashFiles('**/_layout_trims/externals/**/*')}}
+ - name: update hash
+ if: ${{ steps.compute-hash.outputs.NEED_UPDATE == 1 }}
+ shell: bash
+ run: |
+ ExternalHash=${{ steps.compute-hash.outputs.EXTERNAL_HASH }}
+ DotNetRuntimeHash=${{ steps.compute-hash.outputs.DOTNET_RUNTIME_HASH }}
+
+ if [ -n "$ExternalHash" ]; then
+ echo "$ExternalHash" > ./src/Misc/contentHash/externals/${{ matrix.runtime }}
+ fi
+
+ if [ -n "$DotNetRuntimeHash" ]; then
+ echo "$DotNetRuntimeHash" > ./src/Misc/contentHash/dotnetRuntime/${{ matrix.runtime }}
+ fi
+ - name: cache updated hashes
+ if: ${{ steps.compute-hash.outputs.NEED_UPDATE == 1 }}
+ uses: actions/cache/save@v3
+ with:
+ enableCrossOsArchive: true
+ path: |
+ ./src/Misc/contentHash/externals/${{ matrix.runtime }}
+ ./src/Misc/contentHash/dotnetRuntime/${{ matrix.runtime }}
+ key: compute-hashes-${{ matrix.runtime }}-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}
+
+
+ hash-update:
+ needs: [build-hashes]
+ if: ${{ needs.build-hashes.outputs.NEEDS_HASH_UPDATE == 1 }}
+ outputs:
+ # pass outputs from this job to create-pr for use
+ DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION: ${{ needs.build-hashes.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }}
+ DOTNET_CURRENT_MAJOR_MINOR_VERSION: ${{ needs.build-hashes.outputs.DOTNET_CURRENT_MAJOR_MINOR_VERSION }}
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ ref: feature/dotnetsdk-upgrade/${{ needs.build-hashes.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }}
+ - name: Restore cached hashes - linux-x64
+ id: cache-restore-linux-x64
+ uses: actions/cache/restore@v3
+ with:
+ enableCrossOsArchive: true
+ path: |
+ ./src/Misc/contentHash/externals/linux-x64
+ ./src/Misc/contentHash/dotnetRuntime/linux-x64
+ key: compute-hashes-linux-x64-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}
+ - name: Restore cached hashes - linux-arm64
+ id: cache-restore-linux-arm64
+ uses: actions/cache/restore@v3
+ with:
+ enableCrossOsArchive: true
+ path: |
+ ./src/Misc/contentHash/externals/linux-arm64
+ ./src/Misc/contentHash/dotnetRuntime/linux-arm64
+ key: compute-hashes-linux-arm64-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}
+ - name: Restore cached hashes - linux-arm
+ id: cache-restore-linux-arm
+ uses: actions/cache/restore@v3
+ with:
+ enableCrossOsArchive: true
+ path: |
+ ./src/Misc/contentHash/externals/linux-arm
+ ./src/Misc/contentHash/dotnetRuntime/linux-arm
+ key: compute-hashes-linux-arm-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}
+ - name: Restore cached hashes - osx-x64
+ id: cache-restore-osx-x64
+ uses: actions/cache/restore@v3
+ with:
+ enableCrossOsArchive: true
+ path: |
+ ./src/Misc/contentHash/externals/osx-x64
+ ./src/Misc/contentHash/dotnetRuntime/osx-x64
+ key: compute-hashes-osx-x64-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}
+ - name: Restore cached hashes - osx-arm64
+ id: cache-restore-osx-arm64
+ uses: actions/cache/restore@v3
+ with:
+ enableCrossOsArchive: true
+ path: |
+ ./src/Misc/contentHash/externals/osx-arm64
+ ./src/Misc/contentHash/dotnetRuntime/osx-arm64
+ key: compute-hashes-osx-arm64-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}
+ - name: Restore cached hashes - win-x64
+ id: cache-restore-win-x64
+ uses: actions/cache/restore@v3
+ with:
+ enableCrossOsArchive: true
+ path: |
+ ./src/Misc/contentHash/externals/win-x64
+ ./src/Misc/contentHash/dotnetRuntime/win-x64
+ key: compute-hashes-win-x64-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}
+ - name: Restore cached hashes - win-arm64
+ id: cache-restore-win-arm64
+ uses: actions/cache/restore@v3
+ with:
+ enableCrossOsArchive: true
+ path: |
+ ./src/Misc/contentHash/externals/win-arm64
+ ./src/Misc/contentHash/dotnetRuntime/win-arm64
+ key: compute-hashes-win-arm64-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}
+ - name: Fetch cached computed hashes
+ if: steps.cache-restore-linux-x64.outputs.cache-hit == 'true' ||
+ steps.cache-restore-linux-arm64.outputs.cache-hit == 'true' ||
+ steps.cache-restore-linux-arm.outputs.cache-hit == 'true' ||
+ steps.cache-restore-win-x64.outputs.cache-hit == 'true' ||
+ steps.cache-restore-win-arm64.outputs.cache-hit == 'true' ||
+ steps.cache-restore-osx-x64.outputs.cache-hit == 'true' ||
+ steps.cache-restore-osx-arm64.outputs.cache-hit == 'true'
+ shell: bash
+ run: |
+ Environments=( "linux-x64" "linux-arm64" "linux-arm" "win-x64" "win-arm64" "osx-x64" "osx-arm64" )
+
+ git config --global user.name "github-actions[bot]"
+ git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
+ git commit -a -m "Update computed hashes"
+ git push --set-upstream origin feature/dotnetsdk-upgrade/${{ needs.build-hashes.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }}
+
+ create-pr:
+ needs: [hash-update]
+ outputs:
+ # pass outputs from this job to run-tests for use
+ DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION: ${{ needs.hash-update.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }}
+ DOTNET_CURRENT_MAJOR_MINOR_VERSION: ${{ needs.hash-update.outputs.DOTNET_CURRENT_MAJOR_MINOR_VERSION }}
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ ref: feature/dotnetsdk-upgrade/${{ needs.hash-update.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }}
+ - name: Create Pull Request
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ run: |
+ gh pr create -B main -H feature/dotnetsdk-upgrade/${{ needs.hash-update.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }} --title "Update dotnet sdk to latest version @${{ needs.hash-update.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }}" --body "
+ https://dotnetcli.blob.core.windows.net/dotnet/Sdk/${{ needs.hash-update.outputs.DOTNET_CURRENT_MAJOR_MINOR_VERSION }}/latest.version
+
+
+ ---
+
+ Autogenerated by [DotNet SDK Upgrade Workflow](https://github.com/actions/runner/blob/main/.github/workflows/dotnet-upgrade.yml)"
diff --git a/.github/workflows/stale-bot.yml b/.github/workflows/stale-bot.yml
index 13fc526c4..bec1321bb 100644
--- a/.github/workflows/stale-bot.yml
+++ b/.github/workflows/stale-bot.yml
@@ -1,4 +1,4 @@
-name: ‘Close stale Runner issues’
+name: Stale Bot
on:
workflow_dispatch:
schedule:
@@ -9,9 +9,8 @@ jobs:
steps:
- uses: actions/stale@v8
with:
- stale-issue-message: ‘This issue is stale because it has been open 365 days with no activity. Remove stale label or comment or this will be closed in 15 days.’
- close-issue-message: ‘This issue was closed because it has been stalled for 15 days with no activity.’
- exempt-issue-labels: ‘keep’
+ stale-issue-message: "This issue is stale because it has been open 365 days with no activity. Remove stale label or comment or this will be closed in 15 days."
+ close-issue-message: "This issue was closed because it has been stalled for 15 days with no activity."
+ exempt-issue-labels: "keep"
days-before-stale: 365
- days-before-close: 15
- debug-only: true
+ days-before-close: 15
\ No newline at end of file
diff --git a/docs/checks/actions.md b/docs/checks/actions.md
index 6924d1f9e..dd63fd886 100644
--- a/docs/checks/actions.md
+++ b/docs/checks/actions.md
@@ -9,11 +9,13 @@ Make sure the runner has access to actions service for GitHub.com or GitHub Ente
- The runner needs to access `https://api.github.com` for downloading actions.
- The runner needs to access `https://vstoken.actions.githubusercontent.com/_apis/.../` for requesting an access token.
- The runner needs to access `https://pipelines.actions.githubusercontent.com/_apis/.../` for receiving workflow jobs.
+ ---
+ **NOTE:** for the full list of domains that are required to be in the firewall allow list refer to the [GitHub self-hosted runners requirements documentation](https://docs.github.com/en/actions/hosting-your-own-runners/managing-self-hosted-runners/about-self-hosted-runners#communication-between-self-hosted-runners-and-github).
These can by tested by running the following `curl` commands from your self-hosted runner machine:
```
- curl -v https://api.github.com/api/v3/zen
+ curl -v https://api.github.com/zen
curl -v https://vstoken.actions.githubusercontent.com/_apis/health
curl -v https://pipelines.actions.githubusercontent.com/_apis/health
```
diff --git a/docs/checks/network.md b/docs/checks/network.md
index 5b47e913c..aaf92480f 100644
--- a/docs/checks/network.md
+++ b/docs/checks/network.md
@@ -14,7 +14,7 @@
- A Proxy may try to modify the HTTPS request (like add or change some http headers) and causes the request become incompatible with the Actions Service (ASP.NetCore), Ex: [Nginx](https://github.com/dotnet/aspnetcore/issues/17081)
-- Firewall rules that block action runner from accessing certain hosts, ex: `*.github.com`, `*.actions.githubusercontent.com`, etc
+- Firewall rules that block action runner from accessing [certain hosts](https://docs.github.com/en/actions/hosting-your-own-runners/managing-self-hosted-runners/about-self-hosted-runners#communication-between-self-hosted-runners-and-github), ex: `*.github.com`, `*.actions.githubusercontent.com`, etc
### Identify and solve these problems
diff --git a/releaseNote.md b/releaseNote.md
index 875775e5c..bf2363006 100644
--- a/releaseNote.md
+++ b/releaseNote.md
@@ -1,19 +1,37 @@
-## Features
-- Support linux/arm64 docker build (#2601)
-- Add node20 to runner (#2732)
-- Update node16 to latest version (#2736)
-- Remove node12 from runner (#2717)
+## What's Changed
+* Bump @types/node from 12.12.14 to 20.4.10 in /src/Misc/expressionFunc/hashFiles by @dependabot in https://github.com/actions/runner/pull/2759
+* Trace x-github-request-id when download action tarball. by @TingluoHuang in https://github.com/actions/runner/pull/2755
+* Fix typo by @kyanny in https://github.com/actions/runner/pull/2741
+* Bump prettier from 3.0.1 to 3.0.2 in /src/Misc/expressionFunc/hashFiles by @dependabot in https://github.com/actions/runner/pull/2772
+* Bump @types/node from 20.4.10 to 20.5.0 in /src/Misc/expressionFunc/hashFiles by @dependabot in https://github.com/actions/runner/pull/2773
+* Revert "Fixed a bug where a misplaced `=` character could bypass here… by @cory-miller in https://github.com/actions/runner/pull/2774
+* Filter NODE_OPTIONS from env for file output by @cory-miller in https://github.com/actions/runner/pull/2775
+* Bump @types/node from 20.5.0 to 20.5.1 in /src/Misc/expressionFunc/hashFiles by @dependabot in https://github.com/actions/runner/pull/2781
+* Update Docker Version in Images by @ajschmidt8 in https://github.com/actions/runner/pull/2694
+* Bump @types/node from 20.5.1 to 20.5.4 in /src/Misc/expressionFunc/hashFiles by @dependabot in https://github.com/actions/runner/pull/2789
+* Bump @typescript-eslint/parser from 6.4.0 to 6.4.1 in /src/Misc/expressionFunc/hashFiles by @dependabot in https://github.com/actions/runner/pull/2785
+* Bump Microsoft.AspNet.WebApi.Client from 5.2.4 to 5.2.9 in /src by @dependabot in https://github.com/actions/runner/pull/2751
+* Bump System.Buffers from 4.3.0 to 4.5.1 in /src by @dependabot in https://github.com/actions/runner/pull/2749
+* Bump dotnet/runtime-deps from 6.0-jammy to 7.0-jammy in /images by @dependabot in https://github.com/actions/runner/pull/2745
+* Remove need to manually compile JS binary for hashFiles utility by @vanZeben in https://github.com/actions/runner/pull/2770
+* Revert "Bump dotnet/runtime-deps from 6.0-jammy to 7.0-jammy in /images" by @TingluoHuang in https://github.com/actions/runner/pull/2790
+* Query runner by name on server side. by @TingluoHuang in https://github.com/actions/runner/pull/2771
+* Bump typescript from 5.1.6 to 5.2.2 in /src/Misc/expressionFunc/hashFiles by @dependabot in https://github.com/actions/runner/pull/2795
+* Bump @types/node from 20.5.4 to 20.5.6 in /src/Misc/expressionFunc/hashFiles by @dependabot in https://github.com/actions/runner/pull/2796
+* Bump Newtonsoft.Json from 13.0.1 to 13.0.3 in /src by @dependabot in https://github.com/actions/runner/pull/2797
+* Support replacing runners in v2 flow by @luketomlinson in https://github.com/actions/runner/pull/2791
+* Delegating handler for Http redirects by @paveliak in https://github.com/actions/runner/pull/2814
+* Add references to the firewall requirements docs by @paveliak in https://github.com/actions/runner/pull/2815
+* Create automated workflow that will auto-generate dotnet sdk patches by @vanZeben in https://github.com/actions/runner/pull/2776
+* Fixes minor issues with using proper output varaibles by @vanZeben in https://github.com/actions/runner/pull/2818
+* Throw NonRetryableException on GetNextMessage from broker as needed. by @TingluoHuang in https://github.com/actions/runner/pull/2828
+* Mark action download failures as infra failures by @cory-miller in https://github.com/actions/runner/pull/2827
-## Misc
-- Pass timeout in ExecutionContext instead of StepsRunner (#2714)
-- Return early on invalid_client OAuth exception (#2721)
-- Expose results service endpoint as environment variable (#2726)
-- Update HTTPEventSourceListener to trace the right events (#2727)
-- Change RunnerId/AgentId from int32 to uint64 (#2661)
-- Configure stale bot for Runner (#2729)
-- Add in dependabot security scanning/updates (#2743)
-- Bump dotnet sdk to latest version (#2733)
-- Switch from InnerException to ErrorCode on disableupdate check (#2718)
+## New Contributors
+* @kyanny made their first contribution in https://github.com/actions/runner/pull/2741
+* @ajschmidt8 made their first contribution in https://github.com/actions/runner/pull/2694
+
+**Full Changelog**: https://github.com/actions/runner/compare/v2.308.0...v2.309.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.
diff --git a/src/Misc/contentHash/dotnetRuntime/linux-arm b/src/Misc/contentHash/dotnetRuntime/linux-arm
index 467165a2e..9a6e4a641 100644
--- a/src/Misc/contentHash/dotnetRuntime/linux-arm
+++ b/src/Misc/contentHash/dotnetRuntime/linux-arm
@@ -1 +1 @@
-7b78ca2997fbe048642d3717ab7321cdd359752b97158f3c67eb3df8786e21d3
\ No newline at end of file
+7539d33c35b0bc94ee67e3c0de1a6bac5ef89ce8e8efaa110131fa0520a54fb4
diff --git a/src/Misc/contentHash/dotnetRuntime/linux-arm64 b/src/Misc/contentHash/dotnetRuntime/linux-arm64
index 462079eb8..990265baf 100644
--- a/src/Misc/contentHash/dotnetRuntime/linux-arm64
+++ b/src/Misc/contentHash/dotnetRuntime/linux-arm64
@@ -1 +1 @@
-6f34c1d501c87c2e22c2278df7152999aca628c66ee4176d32325773487da6d7
\ No newline at end of file
+d71a31f9a17e1a41d6e1edea596edfa68a0db5948ed160e86f2154a547f4dd10
diff --git a/src/Misc/contentHash/dotnetRuntime/linux-x64 b/src/Misc/contentHash/dotnetRuntime/linux-x64
index 074f8215d..f9b75a567 100644
--- a/src/Misc/contentHash/dotnetRuntime/linux-x64
+++ b/src/Misc/contentHash/dotnetRuntime/linux-x64
@@ -1 +1 @@
-921ca58050be56e0b84af05e544cab4a151cb66405e815e19c0e0928ef7313f5
\ No newline at end of file
+3c2f700d8a995efe7895614ee07d9c7880f872d214b45983ad6163e1931870ab
diff --git a/src/Misc/contentHash/dotnetRuntime/osx-arm64 b/src/Misc/contentHash/dotnetRuntime/osx-arm64
index f90128d63..2778fe18d 100644
--- a/src/Misc/contentHash/dotnetRuntime/osx-arm64
+++ b/src/Misc/contentHash/dotnetRuntime/osx-arm64
@@ -1 +1 @@
-50f5c147074fc4943b4198b2d9b57c5e94344ab21350b0880ec8e2b85d27152b
\ No newline at end of file
+b2d85c95ecad13d352f4c7d31c64dbb0d9c6381b48fa5874c4c72a43a025a8a1
diff --git a/src/Misc/contentHash/dotnetRuntime/osx-x64 b/src/Misc/contentHash/dotnetRuntime/osx-x64
index 24c54202d..ae844f7a2 100644
--- a/src/Misc/contentHash/dotnetRuntime/osx-x64
+++ b/src/Misc/contentHash/dotnetRuntime/osx-x64
@@ -1 +1 @@
-16269548335b1f2add41a409aa3558c56581b63f280a9a26956707b6370558bd
\ No newline at end of file
+417d835c1a108619886b4bb5d25988cb6c138eb7b4c00320b1d9455c5630bff9
diff --git a/src/Misc/contentHash/dotnetRuntime/win-arm64 b/src/Misc/contentHash/dotnetRuntime/win-arm64
index a24ec6fe3..f7eba158d 100644
--- a/src/Misc/contentHash/dotnetRuntime/win-arm64
+++ b/src/Misc/contentHash/dotnetRuntime/win-arm64
@@ -1 +1 @@
-e4aa6003ec77a2b21f3021927fed48727bde379fafff300f39565ff2fff4dd87
\ No newline at end of file
+8f35aaecfb53426ea10816442e23065142bab9dd0fb712a29e0fc471d13c44ac
diff --git a/src/Misc/contentHash/dotnetRuntime/win-x64 b/src/Misc/contentHash/dotnetRuntime/win-x64
index 3fd49d6c5..c54e44677 100644
--- a/src/Misc/contentHash/dotnetRuntime/win-x64
+++ b/src/Misc/contentHash/dotnetRuntime/win-x64
@@ -1 +1 @@
-16ab4c166c58bc4c5600ff055be7ce0a9bb0dd993388114a76efea51e4ea14cb
\ No newline at end of file
+811c7debdfc54d074385b063b83c997e5360c8a9160cd20fe777713968370063
diff --git a/src/Misc/runnerdotnetruntimeassets b/src/Misc/runnerdotnetruntimeassets
index f2a5f05bb..ba46f54bd 100644
--- a/src/Misc/runnerdotnetruntimeassets
+++ b/src/Misc/runnerdotnetruntimeassets
@@ -76,6 +76,7 @@ mscordaccore_amd64_amd64_6.0.522.21309.dll
mscordaccore_arm64_arm64_6.0.522.21309.dll
mscordaccore_amd64_amd64_6.0.1322.58009.dll
mscordaccore_amd64_amd64_6.0.2023.32017.dll
+mscordaccore_amd64_amd64_6.0.2223.42425.dll
mscordbi.dll
mscorlib.dll
mscorrc.debug.dll
diff --git a/src/Runner.Common/RedirectMessageHandler.cs b/src/Runner.Common/RedirectMessageHandler.cs
new file mode 100644
index 000000000..81d216c01
--- /dev/null
+++ b/src/Runner.Common/RedirectMessageHandler.cs
@@ -0,0 +1,73 @@
+using System;
+using System.ComponentModel;
+using System.Net;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using GitHub.Runner.Sdk;
+using GitHub.Services.Common;
+
+namespace GitHub.Runner.Common
+{
+ ///
+ /// Handles redirects for Http requests
+ ///
+ [EditorBrowsable(EditorBrowsableState.Never)]
+ public class RedirectMessageHandler : DelegatingHandler
+ {
+ public RedirectMessageHandler(ITraceWriter trace)
+ {
+ Trace = trace;
+ }
+
+ protected override async Task SendAsync(
+ HttpRequestMessage request,
+ CancellationToken cancellationToken)
+ {
+ HttpResponseMessage response = await base.SendAsync(request, cancellationToken).ConfigureAwait(false);
+
+ if (response != null &&
+ IsRedirect(response.StatusCode) &&
+ response.Headers.Location != null)
+ {
+ Trace.Info($"Redirecting to '{response.Headers.Location}'.");
+
+ request = await CloneAsync(request, response.Headers.Location).ConfigureAwait(false);
+
+ response.Dispose();
+
+ response = await base.SendAsync(request, cancellationToken).ConfigureAwait(false);
+ }
+
+ return response;
+ }
+
+ private static bool IsRedirect(HttpStatusCode statusCode)
+ {
+ return (int)statusCode >= 300 && (int)statusCode < 400;
+ }
+
+ private static async Task CloneAsync(HttpRequestMessage request, Uri requestUri)
+ {
+ var clone = new HttpRequestMessage(request.Method, requestUri)
+ {
+ Version = request.Version
+ };
+
+ request.Headers.ForEach(header => clone.Headers.TryAddWithoutValidation(header.Key, header.Value));
+
+ request.Options.ForEach(option => clone.Options.Set(new HttpRequestOptionsKey