From 66e1a77b1e33fb300741834cf7db13af5530ac51 Mon Sep 17 00:00:00 2001
From: Anton <anton@liap.xyz>
Date: Wed, 27 Dec 2023 22:15:37 +0200
Subject: [PATCH] Fix the toolchain / target confusion

---
 .github/workflows/build.yml | 5 +----
 Dockerfile                  | 6 +-----
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c7208da..4be42c0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,13 +29,10 @@ jobs:
       - name: Set path variable
         run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
 
-      - name: Switch toolchain
-        run: rustup default stable-${{ matrix.target }}
-
       - uses: actions/checkout@v4
 
       - run: npm install
-      - run: npm run build -- --release
+      - run: npm run build -- --release --target ${{ matrix.target }}
 
       - uses: actions/cache@v3
         with:
diff --git a/Dockerfile b/Dockerfile
index f261c91..46dd4f7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,8 +7,4 @@ WORKDIR /opt/rust
 RUN wget https://sh.rustup.rs -O rustup-init.sh
 RUN chmod +x rustup-init.sh
 
-RUN ./rustup-init.sh -y
-RUN $HOME/.cargo/bin/rustup install --force-non-host stable-x86_64-unknown-linux-gnu
-RUN $HOME/.cargo/bin/rustup install --force-non-host stable-x86_64-unknown-linux-musl
-RUN $HOME/.cargo/bin/rustup install --force-non-host stable-aarch64-unknown-linux-gnu
-RUN $HOME/.cargo/bin/rustup install --force-non-host stable-aarch64-unknown-linux-musl
+RUN ./rustup-init.sh -y -t x86_64-unknown-linux-gnu x86_64-unknown-linux-musl aarch64-unknown-linux-gnu aarch64-unknown-linux-musl