fixup actions and use 'cargo make windows' instead of 'cargo make msvc'

Author: rtldg

.github/workflows/build-everything.yml

@@ -19,13 +19,14 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
+        targetos: ["linux", "windows"]
         targetbits: ["x32", "x64"]
-        targetos: ["linux", "msvc"]
 
     steps:
       - name: Prepare env
         shell: bash
         run: echo "GITHUB_SHA_SHORT=${GITHUB_SHA::7}" >> $GITHUB_ENV
+      # checkout current repo...
       - uses: actions/checkout@v4
       - name: Install cargo-binstall
         uses: cargo-bins/[email protected]
@@ -37,7 +38,7 @@ jobs:
       # This is `cargo make full` but turned into steps so you can have better progress visibility
       - name: Install Rust toolchains
         run: |
-          cargo make rustup-${{ matrix.os }}
+          cargo make --profile ${{ matrix.targetbits }} rustup-${{ matrix.targetos }}
       - name: Clone alliedmodders repositories
         run: cargo make clone-alliedmodders
       - name: Setup SourcePawn Compiler
@@ -59,5 +60,5 @@ jobs:
       - name: Upload package
         uses: actions/upload-artifact@v4
         with:
-          name: srcwrtimer-${{ github.head_ref || github.ref_name }}-${{ env.GITHUB_SHA_SHORT }}
+          name: srcwrtimer-${{ github.head_ref || github.ref_name }}-${{ env.GITHUB_SHA_SHORT }}-${{ matrix.targetos }}-${{ matrix.targetbits }}
           path: _package/srcwrtimer

Makefile.toml

@@ -37,28 +37,28 @@ dependencies = [
 [tasks.full.windows]
 dependencies = [
 	"rustup-linux",
-	"rustup-msvc",
+	"rustup-windows",
 	"clone-alliedmodders",
 	"install-sm-bins",
 	"install-zig",
 	"linux",
-	"msvc",
+	"windows",
 	"copy-srcwrtimer",
 	"copy-extensions",
 	"compile-srcwrtimer-scripts",
 ]
 
 [tasks.x]
 dependencies = [
-	"msvc",
+	"windows",
 	"copy-srcwrtimer",
 	"copy-extensions",
 	"compile-srcwrtimer-scripts",
 ]
 
 [tasks.y]
 dependencies = [
-	"msvc",
+	"windows",
 	"copy-srcwrtimer",
 	"copy-extensions",
 ]
@@ -315,14 +315,18 @@ command = "cargo"
 #   objdump -T bin/*.so | grep GLIBC | sed 's/.*GLIBC_\([.0-9]*\).*/\1/g' | sort -Vu
 args = ["zigbuild", "--release", "--target", "${TARGETARCH}-unknown-linux-gnu.2.29"]
 
+# alias :^)
 [tasks.msvc]
+dependencies = ["windows"]
+
+[tasks.windows]
 toolchain = "nightly"
 command = "cargo"
 #env = { "CARGO_LOG" = "cargo::core::compiler::fingerprint=info" }
 args = ["build", "--release", "--target", "${TARGETARCH}-pc-windows-msvc"]
 
 # TODO: xwin not quite worky...
-#[tasks.msvc.linux]
+#[tasks.windows.linux]
 #toolchain = "nightly"
 #command = "cargo"
 #args = ["xwin", "build", "--xwin-arch", "x86", "--release", "--target", "${TARGETARCH}-pc-windows-msvc"]
@@ -336,7 +340,7 @@ toolchain = "nightly"
 command = "rustup"
 args = ["target", "add", "${TARGETARCH}-unknown-linux-gnu"]
 
-[tasks.rustup-msvc]
+[tasks.rustup-windows]
 toolchain = "nightly"
 command = "rustup"
 args = ["target", "add", "${TARGETARCH}-pc-windows-msvc"]