Fix uwp/Hololens 2 builds

korejan · Jun 4, 2024 · b5ea74e · b5ea74e
1 parent 0fdffe8
commit b5ea74e
Show file tree

Hide file tree

Showing 11 changed files with 77 additions and 77 deletions.
diff --git a/.github/workflows/prepare-alxr-release.yml b/.github/workflows/prepare-alxr-release.yml
@@ -668,8 +668,8 @@ jobs:
           # Fetch alxr-engine submodule.
           git submodule update --init --recursive
           Start-Process -FilePath .\alvr\openxr-client\alxr-client\uwp\install_uwp_toolchain.bat -Wait -NoNewWindow
-          rustup toolchain install nightly-2024-02-12
-          rustup component add rust-src --toolchain nightly-2024-02-12-x86_64-pc-windows-msvc
+          rustup toolchain install nightly
+          rustup component add rust-src --toolchain nightly-x86_64-pc-windows-msvc
           rustup update
             
       - name: Build & Package UWP Arm64 Debug (.msix)
@@ -724,8 +724,8 @@ jobs:
           # Fetch alxr-engine submodule.
           git submodule update --init --recursive
           Start-Process -FilePath .\alvr\openxr-client\alxr-client\uwp\install_uwp_toolchain.bat -Wait -NoNewWindow
-          rustup toolchain install nightly-2024-02-12
-          rustup component add rust-src --toolchain nightly-2024-02-12-x86_64-pc-windows-msvc
+          rustup toolchain install nightly
+          rustup component add rust-src --toolchain nightly-x86_64-pc-windows-msvc
           rustup update
       
       - name: Build & Package UWP Arm64 Release (.msix)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -110,12 +110,12 @@ jobs:
           # Fetch alxr-engine submodule.
           git submodule update --init --recursive
           Start-Process -FilePath .\alvr\openxr-client\alxr-client\uwp\install_uwp_toolchain.bat -Wait -NoNewWindow
-          rustup toolchain install nightly-2024-02-12
-          rustup component add rust-src --toolchain nightly-2024-02-12-x86_64-pc-windows-msvc
+          rustup toolchain install nightly
+          rustup component add rust-src --toolchain nightly-x86_64-pc-windows-msvc
           rustup update
       - name: Build Debug UWP aarch64/arm64
         run: |
-          cargo +nightly-2024-02-12 build -Z build-std=std,panic_abort -p alxr-client-uwp --target aarch64-uwp-windows-msvc --verbose
+          cargo +nightly build -Z build-std=std,panic_abort -p alxr-client-uwp --target aarch64-uwp-windows-msvc --verbose
   
   build_alxr_linux:
     runs-on: ubuntu-22.04