update gh-pages ci to not compile trunk every time, and update build

scripts to work with that

Author: lucascompython

.github/workflows/pages.yml

@@ -21,16 +21,16 @@ jobs:
           rustup target add wasm32-unknown-unknown
       - name: Rust Cache # cache the rust build artefacts
         uses: Swatinem/rust-cache@v2
-      - name: install Trunk binary
-        run: cargo install trunk
+      - name: Download Trunk binary
+        run: wget -qO- https://github.com/thedodd/trunk/releases/latest/download/trunk-x86_64-unknown-linux-gnu.tar.gz | tar -xzf-
       - name: Build # build
         # Environment $public_url resolves to the github project page.
         # If using a user/organization page, remove the `${{ github.event.repository.name }}` part.
         # using --public-url something will allow trunk to modify all the href paths like from favicon.ico to repo_name/favicon.ico .
         # this is necessary for github pages where the site is deployed to username.github.io/repo_name and all files must be requested
         # relatively as eframe_template/favicon.ico. if we skip public-url option, the href paths will instead request username.github.io/favicon.ico which
         # will obviously return error 404 not found.
-        run: ./build.sh --wasm --public-url "$public_url"
+        run: ./build.sh --ci --wasm --public-url "$public_url"
         env:
           public_url: "https://${{ github.repository_owner }}.github.io/${{ github.event.repository.name }}"
       - name: Deploy

build.ps1

@@ -1,38 +1,91 @@
 param(
     [switch]$native,
     [string]$publicUrl = "",
-    [switch]$wasm
+    [switch]$wasm,
+    [switch]$ci
 )
 
 $TARGET = "x86_64-pc-windows-msvc"
 
+$trunkCmd = "trunk"
+if ($ci) {
+    $trunkCmd = ".\trunk"
+    Write-Host "CI mode enabled: Using local trunk binary at $trunkCmd"
+    if (-not (Test-Path $trunkCmd)) {
+        Write-Error "Error: CI mode specified, but '$trunkCmd' not found."
+        exit 1
+    }
+}
+
+
 $env:RUSTFLAGS = "-Csymbol-mangling-version=v0 -Zlocation-detail=none -Zfmt-debug=none"
 
-mv .cargo/.config.toml .cargo/config.toml
+
+Move-Item -Path ".cargo/.config.toml" -Destination ".cargo/config.toml" -Force
+
 
 if ($wasm -or $publicUrl -ne "") {
     Write-Host "Building particle-simulation for web..."
-    if ($publicUrl -ne "") {
-        Write-Host "Using public URL: $publicUrl"
-        $env:RUSTFLAGS += " -C target-feature=-nontrapping-fptoint"
-        & trunk build --release --public-url $publicUrl
-    } else {
-        $env:RUSTFLAGS += " -C target-feature=-nontrapping-fptoint"
-        & trunk build --release
+
+    $originalRustFlags = $env:RUSTFLAGS
+    $env:RUSTFLAGS += " -C target-feature=-nontrapping-fptoint"
+
+    try {
+        if ($publicUrl -ne "") {
+            Write-Host "Using public URL: $publicUrl"
+            & $trunkCmd build --release --public-url $publicUrl
+        } else {
+            & $trunkCmd build --release
+        }
+
+        if ($LASTEXITCODE -ne 0) {
+            throw "trunk build failed with exit code $LASTEXITCODE"
+        }
+    }
+    catch {
+        Write-Error "Error during trunk build: $_"
+
+        $env:RUSTFLAGS = $originalRustFlags
+        Move-Item -Path ".cargo/config.toml" -Destination ".cargo/.config.toml" -Force
+        exit 1
+    }
+    finally {
+
+        $env:RUSTFLAGS = $originalRustFlags
     }
 }
 
+$nativeRustFlags = $env:RUSTFLAGS
 if ($native) {
     Write-Host "Building particle-simulation for $TARGET with native CPU optimizations..."
-    $env:RUSTFLAGS += " -C target-cpu=native"
+    $nativeRustFlags += " -C target-cpu=native"
 } else {
     Write-Host "Building particle-simulation for $TARGET..."
 }
 
-$env:RUSTFLAGS += " -Clink-args=-fuse-ld=lld -Clink-args=-Wl,--icf=all"
 
-cargo +nightly build --target $TARGET --release
+$nativeRustFlags += " -Clink-args=-fuse-ld=lld -Clink-args=-Wl,--icf=all"
+
+
+$env:RUSTFLAGS = $nativeRustFlags
+
+try {
+    cargo +nightly build --target $TARGET --release
+
+    if ($LASTEXITCODE -ne 0) {
+        throw "cargo build failed with exit code $LASTEXITCODE"
+    }
+}
+catch {
+    Write-Error "Error during cargo build: $_"
+
+    Move-Item -Path ".cargo/config.toml" -Destination ".cargo/.config.toml" -Force
+    exit 1
+}
+
+
+Move-Item -Path ".cargo/config.toml" -Destination ".cargo/.config.toml" -Force
 
-mv .cargo/config.toml .cargo/.config.toml
+Write-Host "Build finished successfully."
 
 exit $LASTEXITCODE

build.sh

@@ -4,6 +4,7 @@ TARGET=""
 BUILD_WASM=false
 NATIVE_OPT=false
 PUBLIC_URL=""
+CI_MODE=false
 
 while [[ "$#" -gt 0 ]]; do
     case $1 in
@@ -27,6 +28,9 @@ while [[ "$#" -gt 0 ]]; do
             PUBLIC_URL="$2"
             shift
             ;;
+        --ci)
+            CI_MODE=true
+            ;;
         native)
             NATIVE_OPT=true
             ;;
@@ -35,47 +39,76 @@ while [[ "$#" -gt 0 ]]; do
             ;;
         *)
             echo "Unknown parameter: $1"
-            echo "Usage: $0 [--target=<target>] [--wasm] [--native] [--public-url=<url>]"
+            echo "Usage: $0 [--target=<target>] [--wasm] [--native] [--public-url=<url>] [--ci]"
             exit 1
             ;;
     esac
     shift
 done
 
-RUSTFLAGS="-Csymbol-mangling-version=v0 -Zlocation-detail=none -Zfmt-debug=none"
+TRUNK_CMD="trunk"
+if [ "$CI_MODE" = true ]; then
+    TRUNK_CMD="./trunk"
+    echo "CI mode enabled: Using local trunk binary at $TRUNK_CMD"
+    if [ ! -x "$TRUNK_CMD" ]; then
+        echo "Error: CI mode specified, but '$TRUNK_CMD' not found or not executable."
+        exit 1
+    fi
+fi
+
 
 if [ -z "$TARGET" ] && [ "$BUILD_WASM" = false ]; then
     echo "Error: At least a target platform or the --wasm flag is required"
-    echo "Usage: $0 [--target=<target>] [--wasm] [--native] [--public-url=<url>]"
+    echo "Usage: $0 [--target=<target>] [--wasm] [--native] [--public-url=<url>] [--ci]"
     echo "Examples:"
     echo "  $0 --target=x86_64-unknown-linux-gnu"
     echo "  $0 x86_64-unknown-linux-gnu --native"
     echo "  $0 --wasm"
     echo "  $0 --wasm --public-url=https://example.com"
+    echo "  $0 --wasm --ci"
     exit 1
 fi
 
+BASE_RUSTFLAGS="-Csymbol-mangling-version=v0 -Zlocation-detail=none -Zfmt-debug=none"
+
 mv .cargo/.config.toml .cargo/config.toml
 
 if [ "$BUILD_WASM" = true ]; then
     echo "Building particle-simulation for web..."
+    WASM_RUSTFLAGS="$BASE_RUSTFLAGS -C target-feature=-nontrapping-fptoint"
     if [ -n "$PUBLIC_URL" ]; then
         echo "Using public URL: $PUBLIC_URL"
-        RUSTFLAGS="$RUSTFLAGS -C target-feature=-nontrapping-fptoint" trunk build --release --public-url "$PUBLIC_URL"
+        RUSTFLAGS="$WASM_RUSTFLAGS" "$TRUNK_CMD" build --release --public-url "$PUBLIC_URL"
     else
-        RUSTFLAGS="$RUSTFLAGS -C target-feature=-nontrapping-fptoint" trunk build --release
+        RUSTFLAGS="$WASM_RUSTFLAGS" "$TRUNK_CMD" build --release
+    fi
+    if [ $? -ne 0 ]; then
+        echo "Error: trunk build failed."
+        mv .cargo/config.toml .cargo/.config.toml
+        exit 1
     fi
 fi
 
 if [ -n "$TARGET" ]; then
+    NATIVE_RUSTFLAGS="$BASE_RUSTFLAGS"
     if [ "$NATIVE_OPT" = true ]; then
         echo "Building particle-simulation for $TARGET with native CPU optimizations..."
-        RUSTFLAGS="$RUSTFLAGS -C target-cpu=native"
+        NATIVE_RUSTFLAGS="$NATIVE_RUSTFLAGS -C target-cpu=native"
     else
         echo "Building particle-simulation for $TARGET..."
     fi
 
-    RUSTFLAGS="$RUSTFLAGS -Clink-args=-fuse-ld=lld -Clink-args=-Wl,--icf=all" cargo +nightly build --target $TARGET --release
+    NATIVE_RUSTFLAGS="$NATIVE_RUSTFLAGS -Clink-args=-fuse-ld=lld -Clink-args=-Wl,--icf=all"
+
+    RUSTFLAGS="$NATIVE_RUSTFLAGS" cargo +nightly build --target "$TARGET" --release
+
+    if [ $? -ne 0 ]; then
+        echo "Error: cargo build failed."
+        mv .cargo/config.toml .cargo/.config.toml
+        exit 1
+    fi
 fi
 
 mv .cargo/config.toml .cargo/.config.toml
+
+echo "Build finished successfully."