From 6d266a7c44fc24f1e88dec2ca3f53b92814a3d69 Mon Sep 17 00:00:00 2001 From: Tingluo Huang Date: Wed, 13 Nov 2024 12:20:10 -0500 Subject: [PATCH 1/9] Prepare runner release 2.321.0 (#3566) --- releaseNote.md | 41 ++++++++++++++++++++++++++--------------- src/runnerversion | 2 +- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/releaseNote.md b/releaseNote.md index 70d85af2dcd..c3f99e2872a 100644 --- a/releaseNote.md +++ b/releaseNote.md @@ -1,17 +1,30 @@ ## What's Changed -- Adding Snapshot additional mapping tokens https://github.com/actions/runner/pull/3468 -- 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 +* 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. @@ -33,9 +46,7 @@ Add-Type -AssemblyName System.IO.Compression.FileSystem ; [System.IO.Compression.ZipFile]::ExtractToDirectory("$PWD\actions-runner-win-x64-.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. diff --git a/src/runnerversion b/src/runnerversion index 8084ad3118b..248da29093e 100644 --- a/src/runnerversion +++ b/src/runnerversion @@ -1 +1 @@ -2.320.0 +2.321.0 From e640a9fef36e174358074a2d7fcc3c91eea67fdf Mon Sep 17 00:00:00 2001 From: "Satadru Pramanik, DO, MPH, MEng" Date: Wed, 13 Nov 2024 13:08:32 -0500 Subject: [PATCH 2/9] Fix generation of artifact builds from GitHub workflow. (#3568) Signed-off-by: Satadru Pramanik --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c1d350b8988..ab9057257ce 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -69,7 +69,7 @@ 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 From b50b45da074d94b10cd517c5cc7ee31074a099e6 Mon Sep 17 00:00:00 2001 From: Satadru Pramanik Date: Wed, 23 Oct 2024 10:15:41 -0400 Subject: [PATCH 3/9] Bump version to 2.320.1 to test new arm builds Signed-off-by: Satadru Pramanik --- releaseVersion | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releaseVersion b/releaseVersion index ef96e25e847..feb5f1ab9d9 100644 --- a/releaseVersion +++ b/releaseVersion @@ -1 +1 @@ - +2.320.1 From cf75af43b338b0bd4d17ea23cba982254102d042 Mon Sep 17 00:00:00 2001 From: Satadru Pramanik Date: Wed, 23 Oct 2024 10:25:43 -0400 Subject: [PATCH 4/9] Adjust workflow to build artifacts. Signed-off-by: Satadru Pramanik --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 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 }} From 6b56a932d3c253dffd575700f445c8bf3f5b1cee Mon Sep 17 00:00:00 2001 From: Satadru Pramanik Date: Wed, 23 Oct 2024 12:41:01 -0400 Subject: [PATCH 5/9] 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 | 2 +- src/Runner.Listener/Runner.Listener.csproj | 2 +- 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 | 2 +- src/Sdk/Sdk.csproj | 2 +- src/Test/Test.csproj | 2 +- src/dev.sh | 2 +- src/global.json | 2 +- 11 files changed, 12 insertions(+), 12 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..5339116c45e 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 diff --git a/src/Runner.Listener/Runner.Listener.csproj b/src/Runner.Listener/Runner.Listener.csproj index afd528128a5..48c7559b019 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 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..3b252bb85ed 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 diff --git a/src/Sdk/Sdk.csproj b/src/Sdk/Sdk.csproj index ce7f97c8888..c65e831281a 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 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 9383809e212b9b61d1236b5233ba0b06537cbacb Mon Sep 17 00:00:00 2001 From: Satadru Pramanik Date: Wed, 23 Oct 2024 13:02:28 -0400 Subject: [PATCH 6/9] Bump versions of packages to avoid NU1903 NU1902 warnings. Signed-off-by: Satadru Pramanik --- 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 ++++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Runner.Common/Runner.Common.csproj b/src/Runner.Common/Runner.Common.csproj index 5339116c45e..fbf431ec7c3 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 48c7559b019..f1e65ffc1b7 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 3b252bb85ed..1a135cfe1fc 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 c65e831281a..8c5bcf90e16 100644 --- a/src/Sdk/Sdk.csproj +++ b/src/Sdk/Sdk.csproj @@ -18,14 +18,16 @@ + - - + + + From 832c8993798fca5afdc28b7909e965a63cd58347 Mon Sep 17 00:00:00 2001 From: Satadru Pramanik Date: Wed, 13 Nov 2024 11:29:29 -0500 Subject: [PATCH 7/9] Update to .Net 9.0 Final. Signed-off-by: Satadru Pramanik --- .devcontainer/devcontainer.json | 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 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 7430b90d365..53951293e1b 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": "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/releaseVersion b/releaseVersion index feb5f1ab9d9..fb6efe86e17 100644 --- a/releaseVersion +++ b/releaseVersion @@ -1 +1 @@ -2.320.1 +2.320.2 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" } } From 6acf378efc96df70d00e8d0047a9896d7ba17135 Mon Sep 17 00:00:00 2001 From: Satadru Pramanik Date: Wed, 13 Nov 2024 12:09:11 -0500 Subject: [PATCH 8/9] More updates to use .Net 9.0 and the latest Ubuntu LTS (Ubuntu 24.04/noble). Signed-off-by: Satadru Pramanik --- .devcontainer/devcontainer.json | 2 +- docs/checks/sslcert.md | 2 +- images/Dockerfile | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 53951293e1b..a2708375e9d 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "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": { 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 From 254de6dd42ced14de20cf8d1c1eb0d84099e3133 Mon Sep 17 00:00:00 2001 From: Satadru Pramanik Date: Wed, 13 Nov 2024 13:10:05 -0500 Subject: [PATCH 9/9] Bump version Signed-off-by: Satadru Pramanik --- releaseVersion | 2 +- src/runnerversion | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/releaseVersion b/releaseVersion index fb6efe86e17..29ca807fd87 100644 --- a/releaseVersion +++ b/releaseVersion @@ -1 +1 @@ -2.320.2 +2.321.1 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