Release v20.12.0

.gitattributes

@@ -1,8 +1,5 @@
 * text=auto eol=lf
 
-alvr/client_core/cpp/VrApi_* linguist-vendored
-alvr/client_core/cpp/glm/** linguist-vendored
-alvr/client_core/cpp/tinygltf/** linguist-vendored
 alvr/server_openvr/cpp/alvr_server/include/** linguist-vendored
 alvr/server_openvr/cpp/alvr_server/nvEncodeAPI.h linguist-vendored
 alvr/server_openvr/cpp/platform/win32/NvCodecUtils.h linguist-vendored

.github/workflows/prepare-release.yml

@@ -72,6 +72,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           ref: ${{ needs.prepare_release.outputs.release_ref }}
+          submodules: true
 
       - uses: actions-rs/toolchain@v1
         with:
@@ -87,9 +88,8 @@ jobs:
         env:
           RUST_BACKTRACE: 1
         run: |
-          cargo xtask prepare-deps --platform windows --ci
-          cargo xtask package-streamer --gpl
-          cargo xtask package-launcher
+          cargo xtask package-streamer --gpl --ci
+          cargo xtask package-launcher --ci
 
       - name: Upload streamer
         uses: actions/upload-release-asset@v1
@@ -117,6 +117,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           ref: ${{ needs.prepare_release.outputs.release_ref }}
+          submodules: true
 
       - uses: actions-rs/toolchain@v1
         with:
@@ -132,15 +133,14 @@ jobs:
           sudo apt-get update
           sudo apt-get install libfuse2 build-essential pkg-config nasm libva-dev libdrm-dev libvulkan-dev libx264-dev libx265-dev cmake libasound2-dev libjack-jackd2-dev libxrandr-dev libunwind-dev libffmpeg-nvenc-dev nvidia-cuda-toolkit libgtk-3-dev libpipewire-0.3-dev libspa-0.2-dev
           cp alvr/xtask/deb/cuda.pc /usr/share/pkgconfig
-          cargo xtask prepare-deps --platform linux
 
       - name: Build and package ALVR (.tar.gz)
         id: build
         env:
           RUST_BACKTRACE: 1
         run: |
-          cargo xtask package-streamer --gpl
-          cargo xtask package-launcher
+          cargo xtask package-streamer --gpl --ci
+          cargo xtask package-launcher --ci
 
       - name: Upload streamer (tar.gz)
         uses: actions/upload-release-asset@v1
@@ -168,6 +168,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           ref: ${{ needs.prepare_release.outputs.release_ref }}
+          submodules: true
 
       - name: Build and install dependencies
         env:
@@ -200,6 +201,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           ref: ${{ needs.prepare_release.outputs.release_ref }}
+          submodules: true
 
       - uses: actions-rs/toolchain@v1
         with:
@@ -212,7 +214,7 @@ jobs:
           java-version: "17"
       - uses: android-actions/setup-android@v3
         with:
-          packages: "platforms;android-29"
+          packages: "platforms;android-32"
       - uses: nttld/setup-ndk@v1
         id: setup-ndk
         with:
@@ -223,9 +225,7 @@ jobs:
         env:
           RUST_BACKTRACE: 1
           ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
-        run: |
-          cargo xtask prepare-deps --platform android --ci
-          cargo xtask package-client
+        run: cargo xtask package-client --ci
 
       - name: Sign APK
         uses: ilharp/sign-android-release@v1

.github/workflows/rust.yml

@@ -11,191 +11,158 @@ env:
 
 jobs:
   check-windows:
-    runs-on: windows-2019
+    runs-on: windows-2022
     env:
-      LIBCLANG_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\Llvm\x64\bin'
+      LIBCLANG_PATH: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\Llvm\x64\bin'
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+      - uses: dtolnay/rust-toolchain@stable
         with:
-          profile: minimal
-          toolchain: stable
-          override: true
           components: clippy
-      - uses: Swatinem/rust-cache@v1
+      - uses: Swatinem/rust-cache@v2
 
-      - run: cargo xtask prepare-deps --platform windows
+      - name: Prepare deps
+        env:
+          RUST_BACKTRACE: 1
+        run: cargo xtask prepare-deps --platform windows
 
-      - uses: ErichDonGubler/clippy-check@fix-windows-lf-breaking-reports
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+      - run: cargo xtask clippy --ci
 
   check-linux:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+      - uses: dtolnay/rust-toolchain@stable
         with:
-          profile: minimal
-          toolchain: stable
-          override: true
           components: clippy
-      - uses: Swatinem/rust-cache@v1
+      - uses: Swatinem/rust-cache@v2
 
-      - name: Build and install dependencies
-        env:
-          RUST_BACKTRACE: 1
+      - name: Install dependencies
         run: |
-          sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 25088A0359807596
-          echo "deb http://ppa.launchpad.net/pipewire-debian/pipewire-upstream/ubuntu $(lsb_release -cs) main" | sudo tee -a /etc/apt/sources.list.d/pipewire-upstream.list
           sudo apt update
-          sudo apt install build-essential pkg-config nasm libva-dev libdrm-dev libvulkan-dev libx264-dev libx265-dev cmake libasound2-dev libjack-jackd2-dev libxrandr-dev libunwind-dev libgtk-3-dev libpipewire-0.3-dev libspa-0.2-dev
-          cargo xtask prepare-deps --platform linux --no-nvidia
+          sudo apt install build-essential pkg-config nasm libva-dev libdrm-dev libvulkan-dev libx264-dev libasound2-dev libxrandr-dev libunwind-dev libgtk-3-dev libpipewire-0.3-dev libspa-0.2-dev
 
-      - uses: actions-rs/clippy-check@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          args: --features gpl
+      - name: Prepare deps
+        env:
+          RUST_BACKTRACE: 1
+        run:  cargo xtask prepare-deps --platform linux --no-nvidia
+
+      - run: cargo xtask clippy --ci
 
   check-macos:
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+      - uses: dtolnay/rust-toolchain@stable
         with:
-          profile: minimal
-          toolchain: stable
-          override: true
           components: clippy
-      - uses: Swatinem/rust-cache@v1
+      - uses: Swatinem/rust-cache@v2
 
-      - run: cargo xtask prepare-deps --platform macos
+      # This step currently does nothing on macos, but might in the future
+      # - run: cargo xtask prepare-deps --platform macos
 
-      - uses: actions-rs/clippy-check@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+      - run: cargo clippy
 
   build-android:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v4
         with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      - uses: actions-rs/toolchain@v1
+          submodules: true
+      - uses: dtolnay/rust-toolchain@stable
         with:
-          profile: minimal
-          toolchain: stable
-          target: aarch64-linux-android
-          override: true
-      - uses: Swatinem/rust-cache@v1
+          targets: aarch64-linux-android
+      - uses: Swatinem/rust-cache@v2
       - uses: actions/setup-java@v2
         with:
           distribution: 'temurin'
           java-version: '17'
       - uses: android-actions/setup-android@v3
         with:
-          packages: 'platforms;android-29'
+          packages: 'platforms;android-32'
       - uses: nttld/setup-ndk@v1
         id: setup-ndk
         with:
           ndk-version: r26b
 
       - name: Install deps
-        uses: actions-rs/cargo@v1
-        with:
-          command: install
-          args: cargo-apk
+        run: cargo install cargo-apk
 
         # Create folder without content to make the build succeed
-      - run: |
-          mkdir -p deps/android_openxr/arm64-v8a
-          cargo xtask prepare-deps --platform android
+      - run: mkdir -p deps/android_openxr/arm64-v8a
 
       - name: Build client
         env:
           ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
         working-directory: ./alvr/client_openxr
-        run:
-          cargo xtask build-client
+        run: cargo xtask build-client
 
   tests:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v4
         with:
-          toolchain: stable
-          override: true
-      - uses: Swatinem/rust-cache@v1
-
-      - name: Build and install dependencies
-        env:
-          RUST_BACKTRACE: 1
-        run: |
-          sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 25088A0359807596
-          echo "deb http://ppa.launchpad.net/pipewire-debian/pipewire-upstream/ubuntu $(lsb_release -cs) main" | sudo tee -a /etc/apt/sources.list.d/pipewire-upstream.list
-          sudo apt update
-          sudo apt install build-essential pkg-config nasm libva-dev libdrm-dev libvulkan-dev libx264-dev libx265-dev cmake libasound2-dev libjack-jackd2-dev libxrandr-dev libunwind-dev libgtk-3-dev libpipewire-0.3-dev libspa-0.2-dev
-          cargo xtask prepare-deps --platform linux --no-nvidia
+          submodules: true
+      - uses: dtolnay/rust-toolchain@stable
+      - uses: Swatinem/rust-cache@v2
 
       - name: Run tests
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: -p alvr_session
+        run: cargo test -p alvr_session
 
   check-format:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
         with:
-          profile: minimal
-          toolchain: stable
-          override: true
           components: rustfmt
 
       - run: cargo xtask check-format
 
   check-msrv-windows:
-    runs-on: windows-2019
+    runs-on: windows-2022
     env:
-      LIBCLANG_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\Llvm\x64\bin'
+      LIBCLANG_PATH: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\Llvm\x64\bin'
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v4
         with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      - uses: Swatinem/rust-cache@v1
+          submodules: true
+      - uses: dtolnay/rust-toolchain@stable
+      - uses: Swatinem/rust-cache@v2
+
+      # Fix actions rust install and msrv both being stupid
+      - run: rustup update
 
-      - run: |
-          cargo xtask prepare-deps --platform windows
-          cargo xtask check-msrv
+      - name: Prepare deps
+        env:
+          RUST_BACKTRACE: 1
+        run: cargo xtask prepare-deps --platform windows
+
+      - run: cargo xtask check-msrv
 
   check-msrv-linux:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v4
         with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      - uses: Swatinem/rust-cache@v1
+          submodules: true
+      - uses: dtolnay/rust-toolchain@stable
+      - uses: Swatinem/rust-cache@v2
 
-      - name: Build and install dependencies
-        env:
-          RUST_BACKTRACE: 1
+      - name: Install dependencies
         run: |
-          sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 25088A0359807596
-          echo "deb http://ppa.launchpad.net/pipewire-debian/pipewire-upstream/ubuntu $(lsb_release -cs) main" | sudo tee -a /etc/apt/sources.list.d/pipewire-upstream.list
           sudo apt update
-          sudo apt install build-essential pkg-config nasm libva-dev libdrm-dev libvulkan-dev libx264-dev libx265-dev cmake libasound2-dev libjack-jackd2-dev libxrandr-dev libunwind-dev libgtk-3-dev libpipewire-0.3-dev libspa-0.2-dev
-          cargo xtask prepare-deps --platform linux --no-nvidia
+          sudo apt install build-essential pkg-config nasm libva-dev libdrm-dev libvulkan-dev libx264-dev libasound2-dev libxrandr-dev libunwind-dev libgtk-3-dev libpipewire-0.3-dev libspa-0.2-dev
+
+      - name: Prepare deps
+        env:
+          RUST_BACKTRACE: 1
+        run:  cargo xtask prepare-deps --platform linux --no-nvidia
 
       - run: cargo xtask check-msrv