From c9ec420e7c4a4127f82c6228e0fc425d03f10cac Mon Sep 17 00:00:00 2001
From: MOZGIII <mike-n@narod.ru>
Date: Tue, 4 Mar 2025 09:58:28 -0300
Subject: [PATCH] Fix rustup after update

---
 .github/actions/common-setup/action.yml | 2 +-
 docker/build.sh                         | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/actions/common-setup/action.yml b/.github/actions/common-setup/action.yml
index bf6c19b88..547b0719b 100644
--- a/.github/actions/common-setup/action.yml
+++ b/.github/actions/common-setup/action.yml
@@ -50,7 +50,7 @@ runs:
 
     - name: Install rust toolchain
       shell: bash
-      run: rustup show
+      run: rustup show active-toolchain || rustup toolchain install
       if: ${{ inputs.requiresRust == 'true' }}
 
     - name: Prepare the build environment
diff --git a/docker/build.sh b/docker/build.sh
index 9d4270ec4..71ecec52a 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -42,6 +42,7 @@ docker run \
   --rm \
   -i \
   --platform "$PLATFORM" \
+  --init \
   --mount "type=bind,src=$(pwd),dst=/build" \
   --volume "${BUILD_VOLUMES_PATH}/cargo:/cargo-host:rw" \
   --volume "${BUILD_VOLUMES_PATH}/rustup:/rustup-host:rw" \
@@ -51,7 +52,7 @@ docker run \
   --workdir /build \
   --user "$(id -u):$(id -g)" \
   "$BUILDER_CONTAINER_TAG" \
-  cargo build --release
+  /bin/sh -c 'rustup toolchain install && cargo build --release'
 
 # Prepare artifacts.
 TMP_ARTIFACTS_DIR="$(mktemp -d)"