From 5f438132d80845d92e0960254e67d244fe7a5cd0 Mon Sep 17 00:00:00 2001 From: Satadru Pramanik Date: Wed, 23 Oct 2024 10:15:41 -0400 Subject: [PATCH 1/4] Bump version locally to test new arm builds. Signed-off-by: Satadru Pramanik --- .github/workflows/build.yml | 4 ++-- releaseVersion | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ab9057257ce..af7e3c3e3e5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -67,14 +67,14 @@ jobs: # Create runner package tar.gz/zip - name: Package Release - if: github.event_name != 'pull_request' + # if: github.event_name != 'pull_request' run: | ${{ 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' + # if: github.event_name != 'pull_request' uses: actions/upload-artifact@v4 with: name: runner-package-${{ matrix.runtime }} diff --git a/releaseVersion b/releaseVersion index ef96e25e847..feb5f1ab9d9 100644 --- a/releaseVersion +++ b/releaseVersion @@ -1 +1 @@ - +2.320.1 From 5b104380b446522e2fb758ad54a25f8e763e66ce Mon Sep 17 00:00:00 2001 From: Satadru Pramanik Date: Wed, 23 Oct 2024 12:41:01 -0400 Subject: [PATCH 2/4] Update to .Net 9.0 to fix ARM32 Y2038 breakage. This updates .Net to 9.0.100-rc.2.24474.11 . See https://github.com/actions/runner/issues/3505 https://github.com/dotnet/runtime/issues/101444 https://github.com/dotnet/runtime/issues/96460 https://github.com/dotnet/runtime/pull/102410 (Looks like this has not been backported to .Net 8.x...) Signed-off-by: Satadru Pramanik --- .devcontainer/devcontainer.json | 4 ++-- src/Runner.Common/Runner.Common.csproj | 4 ++-- src/Runner.Listener/Runner.Listener.csproj | 4 ++-- src/Runner.PluginHost/Runner.PluginHost.csproj | 2 +- src/Runner.Plugins/Runner.Plugins.csproj | 2 +- src/Runner.Sdk/Runner.Sdk.csproj | 2 +- src/Runner.Worker/Runner.Worker.csproj | 4 ++-- src/Sdk/Sdk.csproj | 8 +++++--- src/Test/Test.csproj | 2 +- src/dev.sh | 2 +- src/global.json | 2 +- 11 files changed, 19 insertions(+), 17 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 139abbc26c1..7430b90d365 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -3,8 +3,8 @@ "image": "mcr.microsoft.com/devcontainers/base:focal", "features": { "ghcr.io/devcontainers/features/docker-in-docker:1": {}, - "ghcr.io/devcontainers/features/dotnet": { - "version": "8.0.404" + "ghcr.io/devcontainers/features/dotnet": {= + "version": "9.0.100-rc.2.24474.11" }, "ghcr.io/devcontainers/features/node:1": { "version": "20" diff --git a/src/Runner.Common/Runner.Common.csproj b/src/Runner.Common/Runner.Common.csproj index 6c4635626a2..fbf431ec7c3 100644 --- a/src/Runner.Common/Runner.Common.csproj +++ b/src/Runner.Common/Runner.Common.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 Library win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64 true @@ -17,7 +17,7 @@ - + diff --git a/src/Runner.Listener/Runner.Listener.csproj b/src/Runner.Listener/Runner.Listener.csproj index afd528128a5..f1e65ffc1b7 100644 --- a/src/Runner.Listener/Runner.Listener.csproj +++ b/src/Runner.Listener/Runner.Listener.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 Exe win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64 true @@ -22,7 +22,7 @@ - + diff --git a/src/Runner.PluginHost/Runner.PluginHost.csproj b/src/Runner.PluginHost/Runner.PluginHost.csproj index 81a8d2e4304..49272a23405 100644 --- a/src/Runner.PluginHost/Runner.PluginHost.csproj +++ b/src/Runner.PluginHost/Runner.PluginHost.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 Exe win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64 true diff --git a/src/Runner.Plugins/Runner.Plugins.csproj b/src/Runner.Plugins/Runner.Plugins.csproj index a786cf1cd1b..60d7662b7f7 100644 --- a/src/Runner.Plugins/Runner.Plugins.csproj +++ b/src/Runner.Plugins/Runner.Plugins.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 Library win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64 true diff --git a/src/Runner.Sdk/Runner.Sdk.csproj b/src/Runner.Sdk/Runner.Sdk.csproj index 55dbf12627c..dc3b27349c2 100644 --- a/src/Runner.Sdk/Runner.Sdk.csproj +++ b/src/Runner.Sdk/Runner.Sdk.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 Library win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64 true diff --git a/src/Runner.Worker/Runner.Worker.csproj b/src/Runner.Worker/Runner.Worker.csproj index 53c1610df3e..1a135cfe1fc 100644 --- a/src/Runner.Worker/Runner.Worker.csproj +++ b/src/Runner.Worker/Runner.Worker.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 Exe win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64 true @@ -19,7 +19,7 @@ - + diff --git a/src/Sdk/Sdk.csproj b/src/Sdk/Sdk.csproj index ce7f97c8888..8c5bcf90e16 100644 --- a/src/Sdk/Sdk.csproj +++ b/src/Sdk/Sdk.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 Library win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64 @@ -18,14 +18,16 @@ + - - + + + diff --git a/src/Test/Test.csproj b/src/Test/Test.csproj index aebe242096f..0685192bfa8 100644 --- a/src/Test/Test.csproj +++ b/src/Test/Test.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64 true NU1701;NU1603;NU1603;xUnit2013;SYSLIB0050;SYSLIB0051 diff --git a/src/dev.sh b/src/dev.sh index 8e23366554a..091ef0e3f4e 100755 --- 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.404" +DOTNETSDK_VERSION="9.0.100-rc.2.24474.11" DOTNETSDK_INSTALLDIR="$DOTNETSDK_ROOT/$DOTNETSDK_VERSION" RUNNER_VERSION=$(cat runnerversion) diff --git a/src/global.json b/src/global.json index 8c70738ad60..2dd360f846e 100644 --- a/src/global.json +++ b/src/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "8.0.404" + "version": "9.0.100-rc.2.24474.11" } } From 7a2fc6ffcc194c96be31fc40735860f53ce545a8 Mon Sep 17 00:00:00 2001 From: Satadru Pramanik Date: Wed, 13 Nov 2024 11:29:29 -0500 Subject: [PATCH 3/4] Update to .Net 9.0 Final. Signed-off-by: Satadru Pramanik --- .devcontainer/devcontainer.json | 6 +++--- docs/checks/sslcert.md | 2 +- images/Dockerfile | 4 ++-- releaseVersion | 2 +- src/Runner.Common/Runner.Common.csproj | 2 +- src/Runner.Listener/Runner.Listener.csproj | 2 +- src/Runner.Worker/Runner.Worker.csproj | 2 +- src/Sdk/Sdk.csproj | 6 +++--- src/dev.sh | 2 +- src/global.json | 2 +- src/runnerversion | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 7430b90d365..a2708375e9d 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,10 +1,10 @@ { "name": "Actions Runner Devcontainer", - "image": "mcr.microsoft.com/devcontainers/base:focal", + "image": "mcr.microsoft.com/devcontainers/base:noble", "features": { "ghcr.io/devcontainers/features/docker-in-docker:1": {}, - "ghcr.io/devcontainers/features/dotnet": {= - "version": "9.0.100-rc.2.24474.11" + "ghcr.io/devcontainers/features/dotnet": { + "version": "9.0.100" }, "ghcr.io/devcontainers/features/node:1": { "version": "20" diff --git a/docs/checks/sslcert.md b/docs/checks/sslcert.md index 2ab09b722d2..969314e9e69 100644 --- a/docs/checks/sslcert.md +++ b/docs/checks/sslcert.md @@ -41,7 +41,7 @@ To let the runner trusts your CA certificate, you will need to: - macOS: ![trust ca cert](./../res/macOStrustCA.gif) - Linux: Refer to the distribution documentation 1. RedHat: https://www.redhat.com/sysadmin/ca-certificates-cli - 2. Ubuntu: http://manpages.ubuntu.com/manpages/focal/man8/update-ca-certificates.8.html + 2. Ubuntu: https://manpages.ubuntu.com/manpages/noble/man8/update-ca-certificates.8.html 3. Google search: "trust ca certificate on [linux distribution]" 4. If all approaches failed, set environment variable `SSL_CERT_FILE` to the CA bundle `.pem` file we get. > To verify cert gets installed properly on Linux, you can try use `curl -v https://sitewithsslissue.com` and `pwsh -Command \"Invoke-WebRequest -Uri https://sitewithsslissue.com\"` diff --git a/images/Dockerfile b/images/Dockerfile index 50b4a6b2d27..a3968c05608 100644 --- a/images/Dockerfile +++ b/images/Dockerfile @@ -1,5 +1,5 @@ # Source: https://github.com/dotnet/dotnet-docker -FROM mcr.microsoft.com/dotnet/runtime-deps:8.0-jammy as build +FROM mcr.microsoft.com/dotnet/runtime-deps:9.0-noble as build ARG TARGETOS ARG TARGETARCH @@ -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:8.0-jammy +FROM mcr.microsoft.com/dotnet/runtime-deps:9.0-noble ENV DEBIAN_FRONTEND=noninteractive ENV RUNNER_MANUALLY_TRAP_SIG=1 diff --git a/releaseVersion b/releaseVersion index feb5f1ab9d9..29ca807fd87 100644 --- a/releaseVersion +++ b/releaseVersion @@ -1 +1 @@ -2.320.1 +2.321.1 diff --git a/src/Runner.Common/Runner.Common.csproj b/src/Runner.Common/Runner.Common.csproj index fbf431ec7c3..2aba53e07f8 100644 --- a/src/Runner.Common/Runner.Common.csproj +++ b/src/Runner.Common/Runner.Common.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/Runner.Listener/Runner.Listener.csproj b/src/Runner.Listener/Runner.Listener.csproj index f1e65ffc1b7..3a15a89dc14 100644 --- a/src/Runner.Listener/Runner.Listener.csproj +++ b/src/Runner.Listener/Runner.Listener.csproj @@ -22,7 +22,7 @@ - + diff --git a/src/Runner.Worker/Runner.Worker.csproj b/src/Runner.Worker/Runner.Worker.csproj index 1a135cfe1fc..5d0b89453f6 100644 --- a/src/Runner.Worker/Runner.Worker.csproj +++ b/src/Runner.Worker/Runner.Worker.csproj @@ -19,7 +19,7 @@ - + diff --git a/src/Sdk/Sdk.csproj b/src/Sdk/Sdk.csproj index 8c5bcf90e16..e7b49776195 100644 --- a/src/Sdk/Sdk.csproj +++ b/src/Sdk/Sdk.csproj @@ -18,11 +18,11 @@ - + - - + + diff --git a/src/dev.sh b/src/dev.sh index 091ef0e3f4e..3ae7d0be240 100755 --- 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="9.0.100-rc.2.24474.11" +DOTNETSDK_VERSION="9.0.100" DOTNETSDK_INSTALLDIR="$DOTNETSDK_ROOT/$DOTNETSDK_VERSION" RUNNER_VERSION=$(cat runnerversion) diff --git a/src/global.json b/src/global.json index 2dd360f846e..65324522984 100644 --- a/src/global.json +++ b/src/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "9.0.100-rc.2.24474.11" + "version": "9.0.100" } } diff --git a/src/runnerversion b/src/runnerversion index 248da29093e..29ca807fd87 100644 --- a/src/runnerversion +++ b/src/runnerversion @@ -1 +1 @@ -2.321.0 +2.321.1 From a6e4ede748908ed98ec8f2c84c633ebbcd28d633 Mon Sep 17 00:00:00 2001 From: Satadru Pramanik Date: Thu, 14 Nov 2024 11:35:24 -0500 Subject: [PATCH 4/4] Revert local changes for local build for PR submission upstream. Signed-off-by: Satadru Pramanik --- .github/workflows/build.yml | 4 ++-- releaseVersion | 2 +- src/runnerversion | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index af7e3c3e3e5..ab9057257ce 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -67,14 +67,14 @@ jobs: # Create runner package tar.gz/zip - name: Package Release - # if: github.event_name != 'pull_request' + if: github.event_name != 'pull_request' run: | ${{ 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' + if: github.event_name != 'pull_request' uses: actions/upload-artifact@v4 with: name: runner-package-${{ matrix.runtime }} diff --git a/releaseVersion b/releaseVersion index 29ca807fd87..ef96e25e847 100644 --- a/releaseVersion +++ b/releaseVersion @@ -1 +1 @@ -2.321.1 + diff --git a/src/runnerversion b/src/runnerversion index 29ca807fd87..248da29093e 100644 --- a/src/runnerversion +++ b/src/runnerversion @@ -1 +1 @@ -2.321.1 +2.321.0