Merge pull request #248 from exelix11/6.0

Version 6.0

.github/workflows/client-android.yml

@@ -1,12 +1,65 @@
 name: SysDVR-Client android
 
-# This workflow is not implemented in the main branch yet, it's here so github lets us run it in the 6.0 branch
-
 on:
  workflow_dispatch:
 
 jobs:
  build:
  runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v3
+ steps
+ - uses: actions/checkout@v3
+ - name: Setup .NET
+ uses: actions/setup-dotnet@v3
+ with:
+ dotnet-version: 8.x
+ - name: Setup JDK 17
+ uses: actions/setup-java@v3
+ with:
+ java-version: 17
+ distribution: temurin 
+ - name: Setup Android SDK
+ uses: amyu/setup-android@v3
+ with:
+ ndk-version: "25.2.9519653"
+ - name: Configure native cache
+ uses: actions/cache@v3
+ with:
+ path: |
+ ${{ github.workspace }}/Client/Platform/Android/app/jni/cimgui
+ ${{ github.workspace }}/Client/Platform/Android/app/jni/libusb
+ ${{ github.workspace }}/Client/Platform/Android/app/jni/SDL
+ ${{ github.workspace }}/Client/Platform/Android/app/jni/SDL_Image
+ ${{ github.workspace }}/Client/Platform/Android/app/libs
+ ${{ github.workspace }}/Client/Platform/Android/bflat
+ key: deps-cache-${{ hashFiles('Client/Platform/Android/buildbinaries.sh') }}-${{ hashFiles('Client/Platform/Android/patches') }}
+ restore-keys: deps-cache-${{ hashFiles('Client/Platform/Android/buildbinaries.sh') }}-${{ hashFiles('Client/Platform/Android/patches') }}
+ - name: Build client native lib
+ run: |
+ export PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/:$PATH
+ cd ./Client/Platform/Android
+ ls -la
+ ln -s $(pwd)/../Resources/resources $(pwd)/app/src/main/assets
+ chmod +x buildbinaries.sh
+ ./buildbinaries.sh
+ - name: Extract keystore from secrets
+ run: |
+ echo ${{ secrets.ANDROID_CI_CERT }} | base64 -d > /tmp/CI.jks
+ - name: Configure gradle cache
+ uses: actions/cache@v3
+ with:
+ path: |
+ ${{ github.workspace }}/Client/Platform/Android/.gradle
+ ${{ github.workspace }}/Client/Platform/Android/app/build
+ key: build-cache-${{ hashFiles('Client/Platform/Android/buildbinaries.sh') }}-${{ hashFiles('Client/Platform/Android/patches') }}
+ restore-keys: build-cache-
+ - name: Build app with gradle
+ run: |
+ cd ./Client/Platform/Android
+ chmod +x gradlew
+ ./gradlew assembleRelease
+ env: 
+ ANDROID_CI_KEY: ${{ secrets.ANDROID_CI_KEY }}
+ - uses: actions/upload-artifact@v3
+ with:
+ name: SysDVR-Client
+ path: ./Client/Platform/Android/app/build/outputs/apk/release/app-release.apk

.github/workflows/client-cross.yml

@@ -1,12 +1,37 @@
 name: SysDVR-Client dotnet build
 
-# This workflow is not implemented in the main branch yet, it's here so github lets us run it in the 6.0 branch
+# This is the "cross platform" build of SysDVR-Client, it only produces clean .net binaries without dependencies
+# All the other builds are platform specific and produce a native AOT build with all the dependencies included
 
 on:
- workflow_dispatch:
+ push:
+ branches: [ master ]
+ paths:
+ - Client/**
+ # but not the multiplatform builds
+ - '!Client/Platform/Android/**'
+ - '!Client/Platform/Linux/**'
+ pull_request:
+ branches: [ master ]
+ paths:
+ - Client/**
+ - '!Client/Platform/Android/**'
+ - '!Client/Platform/Linux/**'
 
 jobs:
  build:
  runs-on: ubuntu-latest
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v3
+ - name: Setup .NET
+ uses: actions/setup-dotnet@v2
+ with:
+ dotnet-version: 8.x
+ - name: Run dotnet build
+ run: |
+ cd Client
+ dotnet build -c Release
+ - uses: actions/upload-artifact@v3
+ with:
+ name: SysDVR-Client-dotnet.zip
+ path: Client/bin/Release/net7.0/

.github/workflows/client-linux-x64.yml

@@ -1,12 +1,34 @@
 name: SysDVR-Client flatpak linux x64
 
-# This workflow is not implemented in the main branch yet, it's here so github lets us run it in the 6.0 branch
-
 on:
  workflow_dispatch:
 
 jobs:
  build:
  runs-on: ubuntu-latest
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v3
+ - name: Install flatpak
+ run: |
+ sudo apt update
+ sudo apt install flatpak flatpak-builder -y
+ flatpak --user remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+ - name: Setup .NET SDK
+ uses: actions/setup-dotnet@v3
+ with:
+ dotnet-version: "8.x"
+ - name: Cache flatpak builds
+ uses: actions/cache@v3
+ with:
+ path: Client/Platform/Linux/.flatpak-builder
+ key: flatpak-${{ runner.os }}
+ - name: Run build script
+ run: |
+ cd Client/Platform/Linux
+ chmod +x build-flatpak.sh
+ ./build-flatpak.sh
+ - name: Upload artifact
+ uses: actions/upload-artifact@v3
+ with:
+ name: SysDVR-Client.flatpak
+ path: Client/Platform/Linux/SysDVR-Client.flatpak

.github/workflows/client-macos.yml

@@ -1,12 +1,33 @@
 name: SysDVR-Client macos (cross platform)
 
-# This workflow is not implemented in the main branch yet, it's here so github lets us run it in the 6.0 branch
-
 on:
  workflow_dispatch:
 
 jobs:
  build:
- runs-on: ubuntu-latest
+ runs-on: macos-latest
  steps:
  - uses: actions/checkout@v3
+ - name: Install dependencies
+ shell: bash
+ run: brew install dmg2img
+ - name: Setup .NET SDK
+ uses: actions/setup-dotnet@v3
+ with:
+ dotnet-version: "8.x"
+ - name: Run build script
+ shell: bash
+ run: |
+ cd Client/Platform/
+ chmod +x BuildMacos.sh
+ ./BuildMacos.sh
+ - name: Upload artifact (intel)
+ uses: actions/upload-artifact@v3
+ with:
+ name: SysDVR-Cilent macos intel
+ path: Client/SysDVRClient-MacOs-x64.zip
+ - name: Upload artifact (arm)
+ uses: actions/upload-artifact@v3
+ with:
+ name: SysDVR-Cilent macos arm
+ path: Client/SysDVRClient-MacOs-arm64.zip

.github/workflows/client-windows-x64.yml

@@ -1,12 +1,23 @@
 name: SysDVR-Client Windows x64
 
-# This workflow is not implemented in the main branch yet, it's here so github lets us run it in the 6.0 branch
-
 on:
  workflow_dispatch:
 
 jobs:
  build:
- runs-on: ubuntu-latest
+ runs-on: windows-latest
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v3
+ - name: Setup .NET
+ uses: actions/setup-dotnet@v2
+ with:
+ dotnet-version: 8.x
+ - name: Run build script
+ shell: cmd
+ run: |
+ cd Client\Platform
+ .\BuildWindows.bat
+ - uses: actions/upload-artifact@v3
+ with:
+ name: SysDVR-Client-Windows-x64
+ path: Client\Client.7z

.gitignore

@@ -363,3 +363,5 @@ SysmoduleRelease/
 *.o
 *.lst
 *.map
+Client/Platform/Resources/resources/buildid.txt
+Client/Platform/Android/app/src/main/assets