mirror of
https://github.com/MrUnknownDE/VRCX.git
synced 2026-05-03 21:36:06 +02:00
Fix macOS action
This commit is contained in:
@@ -34,14 +34,14 @@ jobs:
|
|||||||
- name: Setup .NET 9
|
- name: Setup .NET 9
|
||||||
uses: actions/setup-dotnet@v4
|
uses: actions/setup-dotnet@v4
|
||||||
with:
|
with:
|
||||||
dotnet-version: '9.0.x'
|
dotnet-version: "9.0.x"
|
||||||
- name: Set version
|
- name: Set version
|
||||||
run: |
|
run: |
|
||||||
echo "${{ needs.set_version.outputs.version }}" > Version
|
echo "${{ needs.set_version.outputs.version }}" > Version
|
||||||
cat Version
|
cat Version
|
||||||
- name: Build Cef .NET Application
|
- name: Build Cef .NET Application
|
||||||
run: dotnet build Dotnet\VRCX-Cef.csproj -p:Configuration=Release -p:Platform=x64 -p:RestorePackagesConfig=true -t:"Restore;Clean;Build" -m --self-contained
|
run: dotnet build Dotnet\VRCX-Cef.csproj -p:Configuration=Release -p:Platform=x64 -p:RestorePackagesConfig=true -t:"Restore;Clean;Build" -m --self-contained
|
||||||
- name: Build DB Merger
|
- name: Build Cef .NET Application
|
||||||
run: dotnet build DBMerger\DBMerger.csproj -p:Configuration=Release -p:Platform=x64 -p:RestorePackagesConfig=true -t:"Restore;Clean;Build" -m --self-contained
|
run: dotnet build DBMerger\DBMerger.csproj -p:Configuration=Release -p:Platform=x64 -p:RestorePackagesConfig=true -t:"Restore;Clean;Build" -m --self-contained
|
||||||
- name: Upload Cef dotnet artifacts
|
- name: Upload Cef dotnet artifacts
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
@@ -59,7 +59,7 @@ jobs:
|
|||||||
- name: Setup .NET 9
|
- name: Setup .NET 9
|
||||||
uses: actions/setup-dotnet@v4
|
uses: actions/setup-dotnet@v4
|
||||||
with:
|
with:
|
||||||
dotnet-version: '9.0.x'
|
dotnet-version: "9.0.x"
|
||||||
- name: Set version
|
- name: Set version
|
||||||
run: |
|
run: |
|
||||||
echo "${{ needs.set_version.outputs.version }}" > Version
|
echo "${{ needs.set_version.outputs.version }}" > Version
|
||||||
@@ -69,7 +69,30 @@ jobs:
|
|||||||
- name: Upload Electron dotnet artifacts
|
- name: Upload Electron dotnet artifacts
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: Electron-Release
|
name: Electron-Release-Linux
|
||||||
|
path: build/Electron
|
||||||
|
|
||||||
|
build_dotnet_macos:
|
||||||
|
runs-on: macos-latest
|
||||||
|
needs: set_version
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Setup .NET 9
|
||||||
|
uses: actions/setup-dotnet@v4
|
||||||
|
with:
|
||||||
|
dotnet-version: "9.0.x"
|
||||||
|
- name: Set version
|
||||||
|
run: |
|
||||||
|
echo "${{ needs.set_version.outputs.version }}" > Version
|
||||||
|
cat Version
|
||||||
|
- name: Build Electron .NET Application
|
||||||
|
run: dotnet build 'Dotnet/VRCX-Electron.csproj' -p:Configuration=Release -p:Platform=x64 -p:RestorePackagesConfig=true -t:"Restore;Clean;Build" -m -a x64 --self-contained
|
||||||
|
- name: Upload Electron dotnet artifacts
|
||||||
|
uses: actions/upload-artifact@v4
|
||||||
|
with:
|
||||||
|
name: Electron-Release-macOS
|
||||||
path: build/Electron
|
path: build/Electron
|
||||||
|
|
||||||
build_node:
|
build_node:
|
||||||
@@ -83,8 +106,8 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
echo "${{ needs.set_version.outputs.version }}" > Version
|
echo "${{ needs.set_version.outputs.version }}" > Version
|
||||||
cat Version
|
cat Version
|
||||||
- name: Use Node.js
|
- name: Node.js
|
||||||
uses: actions/setup-node@v3
|
uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: lts/*
|
node-version: lts/*
|
||||||
- name: Restore dependencies
|
- name: Restore dependencies
|
||||||
@@ -102,7 +125,7 @@ jobs:
|
|||||||
- name: Download Electron dotnet artifacts
|
- name: Download Electron dotnet artifacts
|
||||||
uses: actions/download-artifact@v4
|
uses: actions/download-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: Electron-Release
|
name: Electron-Release-Linux
|
||||||
path: build/Electron
|
path: build/Electron
|
||||||
- name: Build AppImage
|
- name: Build AppImage
|
||||||
run: npm run build-electron
|
run: npm run build-electron
|
||||||
@@ -110,11 +133,11 @@ jobs:
|
|||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: Electron-AppImage
|
name: Electron-AppImage
|
||||||
path: 'build/VRCX_${{ needs.set_version.outputs.version }}.AppImage'
|
path: "build/VRCX_${{ needs.set_version.outputs.version }}.AppImage"
|
||||||
|
|
||||||
build_macos:
|
build_macos:
|
||||||
runs-on: macos-latest
|
runs-on: macos-latest
|
||||||
needs: [set_version, build_dotnet_linux, build_node]
|
needs: [set_version, build_dotnet_macos]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
@@ -124,30 +147,30 @@ jobs:
|
|||||||
echo "${{ needs.set_version.outputs.version }}" > Version
|
echo "${{ needs.set_version.outputs.version }}" > Version
|
||||||
cat Version
|
cat Version
|
||||||
- name: Use Node.js
|
- name: Use Node.js
|
||||||
uses: actions/setup-node@v3
|
uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: lts/*
|
node-version: lts/*
|
||||||
- name: Restore dependencies
|
- name: Restore dependencies
|
||||||
run: npm ci --arch=x64
|
run: npm ci --arch=x64
|
||||||
- name: Build Electron-html
|
- name: Build Electron-html
|
||||||
run: npm run prod-linux --arch=x64
|
run: npm run prod-linux --arch=x64
|
||||||
|
|
||||||
- name: Download Electron dotnet artifacts
|
- name: Download Electron dotnet artifacts
|
||||||
uses: actions/download-artifact@v4
|
uses: actions/download-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: Electron-Release
|
name: Electron-Release-macOS
|
||||||
path: build/Electron
|
path: build/Electron
|
||||||
- name: Build macOS .dmg
|
- name: Build macOS .dmg
|
||||||
run: npm run build-electron
|
run: npm run build-electron
|
||||||
- name: Upload Electron macOS artifacts
|
- name: Upload Electron macOS artifacts
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: Electron-MacApp
|
name: Electron-MacDmg
|
||||||
path: 'build/VRCX_${{ needs.set_version.outputs.version }}.dmg'
|
path: 'build/VRCX_${{ needs.set_version.outputs.version }}.dmg'
|
||||||
|
|
||||||
create_setup:
|
create_setup:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs:
|
needs: [set_version, build_dotnet_windows, build_dotnet_linux, build_dotnet_macos, build_node, build_macos]
|
||||||
[set_version, build_node, build_dotnet_windows, build_dotnet_linux]
|
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|||||||
Reference in New Issue
Block a user