Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: SlimeVR/SlimeVR-Server
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a832b8bd7394bfa670a5518d3550a3901578ae8f
Choose a base ref
..
head repository: SlimeVR/SlimeVR-Server
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d8efe924b2c5421036fbbcdd5212198af8cb896d
Choose a head ref
Showing with 48 additions and 47 deletions.
  1. +9 −9 .github/workflows/build-gui.yml
  2. +35 −35 .github/workflows/gradle.yaml
  3. +1 −1 .github/workflows/pontoon-pr.yml
  4. +3 −2 .github/workflows/rebase.yml
18 changes: 9 additions & 9 deletions .github/workflows/build-gui.yml
View file
Original file line number Diff line number Diff line change
@@ -21,13 +21,13 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive

- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v3
- name: Use Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: '.node-version'
cache: 'pnpm'
@@ -51,7 +51,7 @@ jobs:
CI: false

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive

@@ -72,9 +72,9 @@ jobs:
with:
shared-key: "${{ matrix.os }}"

- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v3
- name: Use Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: '.node-version'
cache: 'pnpm'
@@ -91,7 +91,7 @@ jobs:
- if: matrix.os == 'windows-latest'
name: Upload a Build Artifact (Windows)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
# Artifact name
name: SlimeVR-GUI-Windows
@@ -100,7 +100,7 @@ jobs:

- if: matrix.os == 'ubuntu-22.04'
name: Upload a Build Artifact (Linux)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
# Artifact name
name: SlimeVR-GUI-Linux
@@ -109,7 +109,7 @@ jobs:

- if: matrix.os == 'macos-latest'
name: Upload a Build Artifact (macOS)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
# Artifact name
name: SlimeVR-GUI-macOS
70 changes: 35 additions & 35 deletions .github/workflows/gradle.yaml
View file
Original file line number Diff line number Diff line change
@@ -19,21 +19,21 @@ jobs:
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive

- name: Get tags
run: git fetch --tags origin --recurse-submodules=no --force

- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: "17"
distribution: "adopt"

- name: Setup Gradle
uses: gradle/gradle-build-action@v2
uses: gradle/actions/setup-gradle@v3

- run: mkdir ./gui/dist && touch ./gui/dist/somefile
shell: bash
@@ -49,35 +49,35 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive

- name: Get tags
run: git fetch --tags origin --recurse-submodules=no --force

- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: "17"
distribution: "adopt"

- name: Setup Gradle
uses: gradle/gradle-build-action@v2
uses: gradle/actions/setup-gradle@v3

- name: Build with Gradle
run: ./gradlew shadowJar

- name: Upload the Server JAR as a Build Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
# Artifact name
name: "SlimeVR-Server" # optional, default is artifact
# A file, directory or wildcard pattern that describes what to upload
path: server/desktop/build/libs/*

- name: Upload to draft release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
if: startsWith(github.ref, 'refs/tags/')
with:
draft: true
@@ -89,25 +89,25 @@ jobs:
bundle-android:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive

- name: Get tags
run: git fetch --tags origin --recurse-submodules=no --force

- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: "17"
distribution: "adopt"

- name: Setup Gradle
uses: gradle/gradle-build-action@v2
uses: gradle/actions/setup-gradle@v3

- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v3
- name: Use Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: '.node-version'
cache: 'pnpm'
@@ -121,7 +121,7 @@ jobs:
run: ./gradlew :server:android:assembleDebug

- name: Upload the Android Build Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
# Artifact name
name: "SlimeVR-Android" # optional, default is artifact
@@ -134,7 +134,7 @@ jobs:
cp server/android/build/outputs/apk/debug/android-debug.apk ./SlimeVR-android.apk
- name: Upload to draft release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
if: startsWith(github.ref, 'refs/tags/')
with:
draft: true
@@ -148,11 +148,11 @@ jobs:
needs: [build, test]
if: contains(fromJSON('["workflow_dispatch", "create"]'), github.event_name)
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: "SlimeVR-Server"
path: server/desktop/build/libs/
@@ -173,9 +173,9 @@ jobs:
with:
shared-key: "ubuntu-22.04"

- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v3
- name: Use Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: '.node-version'
cache: 'pnpm'
@@ -185,7 +185,7 @@ jobs:
pnpm i
pnpm run tauri build
- uses: actions/upload-artifact@v3.1.0
- uses: actions/upload-artifact@v4
with:
name: SlimeVR-GUI-Deb
path: target/release/bundle/deb/slimevr*.deb
@@ -205,7 +205,7 @@ jobs:
chmod 644 squashfs-root/slimevr.jar
appimagetool squashfs-root slimevr*.AppImage
- uses: actions/upload-artifact@v3.1.0
- uses: actions/upload-artifact@v4
with:
name: SlimeVR-GUI-AppImage
path: target/release/bundle/appimage/slimevr*.AppImage
@@ -217,7 +217,7 @@ jobs:
cp target/release/bundle/deb/slimevr*.deb ./SlimeVR-amd64.deb
- name: Upload to draft release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
if: startsWith(github.ref, 'refs/tags/')
with:
draft: true
@@ -232,11 +232,11 @@ jobs:
needs: [build, test]
if: contains(fromJSON('["workflow_dispatch", "create"]'), github.event_name)
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: "SlimeVR-Server"
path: server/desktop/build/libs/
@@ -246,9 +246,9 @@ jobs:
with:
shared-key: "macos-latest"

- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v3
- name: Use Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: '.node-version'
cache: 'pnpm'
@@ -269,12 +269,12 @@ jobs:
--volicon ../macos/slimevr.app/Contents/Resources/icon.icns --skip-jenkins \
--eula ../../../../LICENSE-MIT slimevr.dmg ../macos/slimevr.app
- uses: actions/upload-artifact@v3.1.0
- uses: actions/upload-artifact@v4
with:
name: SlimeVR-GUI-MacApp
path: target/universal-apple-darwin/release/bundle/macos/slimevr*.app

- uses: actions/upload-artifact@v3.1.0
- uses: actions/upload-artifact@v4
with:
name: SlimeVR-GUI-MacDmg
path: target/universal-apple-darwin/release/bundle/dmg/slimevr.dmg
@@ -285,7 +285,7 @@ jobs:
cp target/universal-apple-darwin/release/bundle/dmg/slimevr.dmg ./SlimeVR-mac.dmg
- name: Upload to draft release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
if: startsWith(github.ref, 'refs/tags/')
with:
draft: true
@@ -299,11 +299,11 @@ jobs:
needs: [build, test]
if: contains(fromJSON('["workflow_dispatch", "create"]'), github.event_name)
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: "SlimeVR-Server"
path: server/desktop/build/libs/
@@ -313,9 +313,9 @@ jobs:
with:
shared-key: "windows-latest"

- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v3
- name: Use Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: '.node-version'
cache: 'pnpm'
@@ -341,13 +341,13 @@ jobs:
mv ./SlimeVR/slimevr.exe ./SlimeVR/slimevr-ui.exe
7z a -tzip SlimeVR.zip ./SlimeVR/
- uses: actions/upload-artifact@v3.1.0
- uses: actions/upload-artifact@v4
with:
name: SlimeVR-GUI-Windows
path: ./SlimeVR*.zip

- name: Upload to draft release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
if: startsWith(github.ref, 'refs/tags/')
with:
draft: true
2 changes: 1 addition & 1 deletion .github/workflows/pontoon-pr.yml
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ jobs:
pull-requests: write

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
- uses: repo-sync/pull-request@v2
5 changes: 3 additions & 2 deletions .github/workflows/rebase.yml
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ jobs:
contents: write

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: pontoon
submodules: recursive
@@ -24,7 +24,7 @@ jobs:
- name: Rebase
run: |
git config --local user.name "slimevr-bot"
git config --local user.email pantoon@slimevr.dev
git config --local user.email 'pantoon@slimevr.dev'
git fetch origin main
git rebase origin/main
git submodule update
@@ -36,3 +36,4 @@ jobs:
commit-message: "update"
force-push: "true"
name: "slimevr-bot"
email: "pantoon@slimevr.dev"