Merge branch 'main' into releases/dind-network-host-2.318.0

dfinity · Jul 29, 2024 · 16cabdc · 16cabdc
2 parents f49d780 + 1250684
commit 16cabdc
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 32 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -4,7 +4,7 @@
   "features": {
     "ghcr.io/devcontainers/features/docker-in-docker:1": {},
     "ghcr.io/devcontainers/features/dotnet": {
-      "version": "8.0.302"
+      "version": "8.0.303"
     },
     "ghcr.io/devcontainers/features/node:1": {
       "version": "16"

diff --git a/docs/start/envlinux.md b/docs/start/envlinux.md
@@ -4,16 +4,7 @@
 
 ## Supported Distributions and Versions
 
-x64
-  - Red Hat Enterprise Linux 7+
-  - CentOS 7+
-  - Oracle Linux 7+
-  - Fedora 29+
-  - Debian 9+
-  - Ubuntu 16.04+
-  - Linux Mint 18+
-  - openSUSE 15+
-  - SUSE Enterprise Linux (SLES) 12 SP2+
+Please see "[Supported architectures and operating systems for self-hosted runners](https://docs.github.com/en/actions/hosting-your-own-runners/managing-self-hosted-runners/about-self-hosted-runners#linux)."
 
 ## Install .Net Core 3.x Linux Dependencies
 

diff --git a/docs/start/envosx.md b/docs/start/envosx.md
@@ -4,7 +4,6 @@
 
 ## Supported Versions
 
-  - macOS High Sierra (10.13) and later versions
-  - x64 and arm64 (Apple Silicon)
+Please see "[Supported architectures and operating systems for self-hosted runners](https://docs.github.com/en/actions/hosting-your-own-runners/managing-self-hosted-runners/about-self-hosted-runners#macos)."
 
 ## [More .Net Core Prerequisites Information](https://docs.microsoft.com/en-us/dotnet/core/macos-prerequisites?tabs=netcore30)
diff --git a/docs/start/envwin.md b/docs/start/envwin.md
@@ -2,11 +2,6 @@
 
 ## Supported Versions
 
- - Windows 7 64-bit
- - Windows 8.1 64-bit
- - Windows 10 64-bit
- - Windows Server 2012 R2 64-bit
- - Windows Server 2016 64-bit
- - Windows Server 2019 64-bit
+Please see "[Supported architectures and operating systems for self-hosted runners](https://docs.github.com/en/actions/hosting-your-own-runners/managing-self-hosted-runners/about-self-hosted-runners#windows)."
 
 ## [More .NET Core Prerequisites Information](https://docs.microsoft.com/en-us/dotnet/core/windows-prerequisites?tabs=netcore30)
diff --git a/images/Dockerfile b/images/Dockerfile
@@ -5,8 +5,8 @@ ARG TARGETOS
 ARG TARGETARCH
 ARG RUNNER_VERSION
 ARG RUNNER_CONTAINER_HOOKS_VERSION=0.6.1
-ARG DOCKER_VERSION=25.0.5
-ARG BUILDX_VERSION=0.14.1
+ARG DOCKER_VERSION=27.1.1
+ARG BUILDX_VERSION=0.16.2
 
 RUN apt update -y && apt install curl unzip -y
 

diff --git a/releaseNote.md b/releaseNote.md
@@ -1,12 +1,18 @@
 ## What's Changed
 
-- Do not give up when uploading steps metadata by @yacaovsnc in https://github.com/actions/runner/pull/3280
-- Upgrade node20 to 20.13.1 by @pje in https://github.com/actions/runner/pull/3284
-- Delete all the contentHash files by @pje in https://github.com/actions/runner/pull/3285
-- Make it easy to install `git` on an Action Runner Image by @jww3 in https://github.com/actions/runner/pull/3273
-- Install `gpg-agent` during actions/runner container image build by @jww3 in https://github.com/actions/runner/pull/3294
-
-**Full Changelog**: https://github.com/actions/runner/compare/v2.316.1...v2.317.0
+- Update Docker to v27.1.1 by @TingluoHuang in https://github.com/actions/runner/pull/3401
+- Upgrade dotnet sdk to v8.0.303 in https://github.com/actions/runner/pull/3388
+- Rephrase node20 warning by @rentziass in https://github.com/actions/runner/pull/3376
+- Bump hook version to 0.6.1 by @nikola-jokic in https://github.com/actions/runner/pull/3350
+- Backoff to avoid excessive retries to Run Service in a duration by @ericsciple in https://github.com/actions/runner/pull/3354
+- Bump System.Security.Cryptography.Pkcs from 5.0.0 to 8.0.0 in /src in https://github.com/actions/runner/pull/3347
+- Upgrade dotnet sdk to v8.0.302 in https://github.com/actions/runner/pull/3346
+- Bump runner to dotnet 8 by @TingluoHuang in https://github.com/actions/runner/pull/3345
+- Pass runner version as environment variable in workflow by @joshmgross in https://github.com/actions/runner/pull/3318
+- Make sure we mask secrets when reporting telemetry by @TingluoHuang in https://github.com/actions/runner/pull/3315
+- Bump docker version and docker buildx version by @int128 in https://github.com/actions/runner/pull/3277
+
+**Full Changelog**: https://github.com/actions/runner/compare/v2.317.0...v2.318.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/Runner.Common/Constants.cs b/src/Runner.Common/Constants.cs
@@ -181,7 +181,7 @@ public static class Features
             public static readonly string DeprecatedNodeVersion = "node16";
             public static readonly string EnforcedNode12DetectedAfterEndOfLife = "The following actions uses node12 which is deprecated and will be forced to run on node16: {0}. For more info: https://github.blog/changelog/2023-06-13-github-actions-all-actions-will-run-on-node16-instead-of-node12-by-default/";
             public static readonly string EnforcedNode12DetectedAfterEndOfLifeEnvVariable = "Node16ForceActionsWarnings";
-            public static readonly string EnforcedNode16DetectedAfterEndOfLife = "The following actions uses Node.js version which is deprecated and will be forced to run on node20: {0}. For more info: https://github.blog/changelog/2024-03-07-github-actions-all-actions-will-run-on-node20-instead-of-node16-by-default/";
+            public static readonly string EnforcedNode16DetectedAfterEndOfLife = "The following actions use a deprecated Node.js version and will be forced to run on node20: {0}. For more info: https://github.blog/changelog/2024-03-07-github-actions-all-actions-will-run-on-node20-instead-of-node16-by-default/";
             public static readonly string EnforcedNode16DetectedAfterEndOfLifeEnvVariable = "Node20ForceActionsWarnings";
 
         }

diff --git a/src/dev.sh b/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="8.0.302"
+DOTNETSDK_VERSION="8.0.303"
 DOTNETSDK_INSTALLDIR="$DOTNETSDK_ROOT/$DOTNETSDK_VERSION"
 RUNNER_VERSION=$(cat runnerversion)
 

diff --git a/src/global.json b/src/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "8.0.302"
+    "version": "8.0.303"
   }
 }
diff --git a/src/runnerversion b/src/runnerversion
@@ -1 +1 @@
-2.317.0
+2.318.0