Merge branch 'develop' into steam-beta

Raphiiko · Dec 18, 2023 · f7c65c7 · f7c65c7
2 parents 06e51e3 + 338ca9d
commit f7c65c7
Show file tree

Hide file tree

Showing 15 changed files with 276 additions and 188 deletions.
diff --git a/.github/workflows/build-development.yml b/.github/workflows/build-development.yml
@@ -49,8 +49,8 @@ jobs:
             src-shared-rust
             src-elevated-sidecar
             src-core
-      - name: Install development Tauri CLI
-        run: cargo install --git https://github.com/tauri-apps/tauri --branch 1.x tauri-cli
+#      - name: Install development Tauri CLI
+#        run: cargo install --git https://github.com/tauri-apps/tauri --branch 1.x tauri-cli
       - name: Get Changelog Entry
         id: changelog_reader
         uses: mindsers/changelog-reader-action@v2
@@ -72,7 +72,7 @@ jobs:
           includeDebug: true
           includeRelease: false
           includeUpdaterJson: true
-          tauriScript: cargo-tauri
+#          tauriScript: cargo-tauri
       - name: Update release data
         uses: actions/github-script@v3
         with:

diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
@@ -49,8 +49,8 @@ jobs:
             src-shared-rust
             src-elevated-sidecar
             src-core
-      - name: Install development Tauri CLI
-        run: cargo install --git https://github.com/tauri-apps/tauri --branch 1.x tauri-cli
+#      - name: Install development Tauri CLI
+#        run: cargo install --git https://github.com/tauri-apps/tauri --branch 1.x tauri-cli
       - name: Get Changelog Entry
         id: changelog_reader
         uses: mindsers/changelog-reader-action@v2
@@ -70,7 +70,7 @@ jobs:
           releaseBody: ${{ steps.changelog_reader.outputs.changes }}
           releaseDraft: false
           includeUpdaterJson: true
-          tauriScript: cargo-tauri
+#          tauriScript: cargo-tauri
       - name: Update the update manifest
         uses: Raphiiko/actions-deploy-gist@main
         with:

diff --git a/.github/workflows/build-steam-beta-release.yml b/.github/workflows/build-steam-beta-release.yml
@@ -43,8 +43,8 @@ jobs:
             src-shared-rust
             src-elevated-sidecar
             src-core
-      - name: Install development Tauri CLI
-        run: cargo install --git https://github.com/tauri-apps/tauri --branch 1.x tauri-cli
+#      - name: Install development Tauri CLI
+#        run: cargo install --git https://github.com/tauri-apps/tauri --branch 1.x tauri-cli
       - name: Get Changelog Entry
         id: changelog_reader
         uses: mindsers/changelog-reader-action@v2
@@ -64,7 +64,7 @@ jobs:
       - name: Set flavour to STEAM
         run: npm run set-flavour STEAM
       - name: Build OyasumiVR (STEAM Flavour)
-        run: cargo-tauri build -b none
+        run: tauri build -b none
       - name: Copy STEAM build
         shell: bash
         run: chmod +x ./scripts/steam/2-move-build-steam.sh && ./scripts/steam/2-move-build-steam.sh

diff --git a/.github/workflows/build-steam-release.yml b/.github/workflows/build-steam-release.yml
@@ -44,8 +44,8 @@ jobs:
             src-shared-rust
             src-elevated-sidecar
             src-core
-      - name: Install development Tauri CLI
-        run: cargo install --git https://github.com/tauri-apps/tauri --branch 1.x tauri-cli
+#      - name: Install development Tauri CLI
+#        run: cargo install --git https://github.com/tauri-apps/tauri --branch 1.x tauri-cli
       - name: Get Changelog Entry
         id: changelog_reader
         uses: mindsers/changelog-reader-action@v2
@@ -65,7 +65,7 @@ jobs:
       - name: Set flavour to STEAM
         run: npm run set-flavour STEAM
       - name: Build OyasumiVR (STEAM Flavour)
-        run: cargo-tauri build -b none
+        run: tauri build -b none
       - name: Copy STEAM build
         shell: bash
         run: chmod +x ./scripts/steam/2-move-build-steam.sh && ./scripts/steam/2-move-build-steam.sh

diff --git a/.github/workflows/pr-and-feature-check.yml b/.github/workflows/pr-and-feature-check.yml
@@ -51,14 +51,14 @@ jobs:
             src-shared-rust
             src-elevated-sidecar
             src-core
-      - name: Install development Tauri CLI
-        run: cargo install --git https://github.com/tauri-apps/tauri --branch 1.x tauri-cli
+#      - name: Install development Tauri CLI
+#        run: cargo install --git https://github.com/tauri-apps/tauri --branch 1.x tauri-cli
       - name: Test if OyasumiVR compiles
         uses: tauri-apps/tauri-action@v0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          tauriScript: cargo-tauri
+#          tauriScript: cargo-tauri
           includeDebug: true
           includeRelease: false
           includeUpdaterJson: false

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -30,6 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - When your VRChat session expires and you've opted to store your credentials, OyasumiVR will automatically attempt to log you back in.
 - Improved reliability of base station power management
 - Brightness automations no longer apply on start as a default setting
+- Updated to Tauri v1.5
 
 ### Fixed