diff --git a/.github/workflows/github_actions.yml b/.github/workflows/github_actions.yml index fa5c9e6c..9f501a80 100644 --- a/.github/workflows/github_actions.yml +++ b/.github/workflows/github_actions.yml @@ -58,7 +58,7 @@ jobs: echo "${{ needs.set_version.outputs.version }}" > Version cat Version - name: Build Electron x64 .NET Application - run: dotnet build 'Dotnet/VRCX-Electron.csproj' -p:Configuration=Release -p:WarningLevel=0 -p:Platform=x64 -p:PlatformTarget=x64 -p:RestorePackagesConfig=true -t:"Restore;Clean;Build" -m -a x64 --self-contained + run: dotnet build 'Dotnet/VRCX-Electron.csproj' -p:Configuration=Release -p:WarningLevel=0 -p:Platform=x64 -p:PlatformTarget=x64 -p:RestorePackagesConfig=true -t:"Restore;Clean;Build" -m -a x64 - name: Upload Electron x64 dotnet artifacts uses: actions/upload-artifact@v4 with: @@ -68,7 +68,7 @@ jobs: run: | rm -R build/Electron - name: Build Electron arm64 .NET Application - run: dotnet build 'Dotnet/VRCX-Electron-arm64.csproj' -p:Configuration=Release -p:WarningLevel=0 -p:Platform=arm64 -p:PlatformTarget=arm64 -p:RestorePackagesConfig=true -t:"Restore;Clean;Build" -m -a arm64 --self-contained + run: dotnet build 'Dotnet/VRCX-Electron-arm64.csproj' -p:Configuration=Release -p:WarningLevel=0 -p:Platform=arm64 -p:PlatformTarget=arm64 -p:RestorePackagesConfig=true -t:"Restore;Clean;Build" -m -a arm64 - name: Upload Electron arm64 dotnet artifacts uses: actions/upload-artifact@v4 with: @@ -89,7 +89,7 @@ jobs: echo "${{ needs.set_version.outputs.version }}" > Version cat Version - name: Build Electron x64 .NET Application - run: dotnet build 'Dotnet/VRCX-Electron.csproj' -p:Configuration=Release -p:WarningLevel=0 -p:Platform=x64 -p:PlatformTarget=x64 -p:RestorePackagesConfig=true -t:"Restore;Clean;Build" -m -a x64 --self-contained + run: dotnet build 'Dotnet/VRCX-Electron.csproj' -p:Configuration=Release -p:WarningLevel=0 -p:Platform=x64 -p:PlatformTarget=x64 -p:RestorePackagesConfig=true -t:"Restore;Clean;Build" -m -a x64 - name: Upload Electron x64 .NET artifacts uses: actions/upload-artifact@v4 with: @@ -99,7 +99,7 @@ jobs: run: | rm -R build/Electron - name: Build Electron arm64 .NET Application - run: dotnet build 'Dotnet/VRCX-Electron-arm64.csproj' -p:Configuration=Release -p:WarningLevel=0 -p:Platform=arm64 -p:PlatformTarget=arm64 -p:RestorePackagesConfig=true -t:"Restore;Clean;Build" -m -a arm64 --self-contained + run: dotnet build 'Dotnet/VRCX-Electron-arm64.csproj' -p:Configuration=Release -p:WarningLevel=0 -p:Platform=arm64 -p:PlatformTarget=arm64 -p:RestorePackagesConfig=true -t:"Restore;Clean;Build" -m -a arm64 - name: Upload Electron arm64 dotnet artifacts uses: actions/upload-artifact@v4 with: diff --git a/src-electron/main.js b/src-electron/main.js index 094f74b0..f31e9746 100644 --- a/src-electron/main.js +++ b/src-electron/main.js @@ -69,7 +69,12 @@ tryRelaunchWithArgs(args); tryCopyFromWinePrefix(); const rootDir = app.getAppPath(); -require(path.join(rootDir, 'build/Electron/VRCX-Electron.cjs')); +const armPath = path.join(rootDir, 'build/Electron/VRCX-Electron-arm64.cjs'); +if (fs.existsSync(armPath)) { + require(armPath); +} else { + require(path.join(rootDir, 'build/Electron/VRCX-Electron.cjs')); +} const InteropApi = require('./InteropApi'); const interopApi = new InteropApi();