diff --git a/.github/workflows/ci.yml b/.github/workflows/external.yml similarity index 90% rename from .github/workflows/ci.yml rename to .github/workflows/external.yml index 435ac64..db1f9d2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/external.yml @@ -1,11 +1,13 @@ -name: CI +name: External Branch Build + on: push: - branches: - - '*' + branches-ignore: + - main pull_request: branches: - '*' + concurrency: ci-${{ github.ref }} jobs: build: @@ -19,9 +21,10 @@ jobs: - name: Install WinLibs run: choco install winlibs -y --no-progress - name: Install Qt - uses: jurplel/install-qt-action@v2 + uses: jurplel/install-qt-action@v3 with: arch: win64_mingw81 + cache: true - name: Run CMake run: | set PATH=C:\ProgramData\chocolatey\lib\winlibs\tools\mingw64\bin;%PATH% @@ -36,7 +39,6 @@ jobs: run: | $src = Resolve-Path "${env:Qt5_DIR}\bin" $dest = "_Build\_Gcc\_bin" - Copy-Item "${src}\libwinpthread-1.dll" -Destination $dest Copy-Item "${src}\libstdc++-6.dll" -Destination $dest Copy-Item "${src}\libgcc_s_seh-1.dll" -Destination $dest diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..4bed0c6 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,60 @@ +name: Main Compilation + +on: + push: + branches: [ "main" ] + +env: + major: 0 + minor: 2 + version: v${{ env.major }}.${{ env.minor }}.${{ github.run_number }} + +concurrency: ci-${{ github.ref }} +jobs: + build: + name: Build + runs-on: windows-2022 + steps: + - name: Checkout source + uses: actions/checkout@v3 + with: + lfs: true + - name: Install WinLibs + run: choco install winlibs -y --no-progress + - name: Install Qt + uses: jurplel/install-qt-action@v3 + with: + arch: win64_mingw81 + cache: true + - name: Run CMake + run: | + set PATH=C:\ProgramData\chocolatey\lib\winlibs\tools\mingw64\bin;%PATH% + cmake_EclipseMinGW.bat 4 _Gcc + working-directory: _Build + shell: cmd + - name: Build + run: _build.bat + working-directory: _Build/_Gcc + shell: cmd + - name: Copy Qt dependency DLLs + run: | + $src = Resolve-Path "${env:Qt5_DIR}\bin" + $dest = "_Build\_Gcc\_bin" + Copy-Item "${src}\libwinpthread-1.dll" -Destination $dest + Copy-Item "${src}\libstdc++-6.dll" -Destination $dest + Copy-Item "${src}\libgcc_s_seh-1.dll" -Destination $dest + - name: ZIP Kyty + uses: TheDoctor0/zip-release@main + with: + type: 'zip' + path: .\_Build\_Gcc\_bin\* + filename: Kyty-${{ env.version }}.zip + + - name: GH Release + uses: ncipollo/release-action@v1 + with: + artifacts: "Kyty-${{ env.version }}.zip" + generateReleaseNotes: true + name: Release ${{ env.version }} + tag: ${{ env.version }} + token: ${{ secrets.GITHUB_TOKEN }} diff --git a/source/launcher/forms/configuration_edit_dialog.ui b/source/launcher/forms/configuration_edit_dialog.ui index 53d2df2..2706bb4 100644 --- a/source/launcher/forms/configuration_edit_dialog.ui +++ b/source/launcher/forms/configuration_edit_dialog.ui @@ -268,7 +268,7 @@ - Screen resoultion: + Screen resolution: @@ -289,7 +289,7 @@ - Optimize shaders for code size or performance + Optimize shaders for code size or May decrease performance if enabled. @@ -303,7 +303,7 @@ - Dump shaders to file or console window. If enabled may decrease emulator performance + Dump shaders to file or console window. May decrease performance if enabled. @@ -351,7 +351,7 @@ - Print logs to file or console window. If enabled may decrease emulator performance + Print logs to file or console window. May decrease performance if enabled. @@ -382,7 +382,7 @@ - Enable/disable profiler. If enabled may decrease emulator performance + Enable/disable profiler. May decrease performance if enabled. diff --git a/source/launcher/ts/launcher_ru_RU.ts b/source/launcher/ts/launcher_ru_RU.ts index fac8cbb..be7980e 100644 --- a/source/launcher/ts/launcher_ru_RU.ts +++ b/source/launcher/ts/launcher_ru_RU.ts @@ -36,7 +36,7 @@ - Screen resoultion: + Screen resolution: @@ -106,7 +106,7 @@ - Dump shaders to file or console window. If enabled may decrease emulator performance + Dump shaders to file or console window. May decrease performance if enabled. @@ -121,7 +121,7 @@ - Print logs to file or console window. If enabled may decrease emulator performance + Print logs to file or console window. May decrease performance if enabled. @@ -131,7 +131,7 @@ - Enable/disable profiler. If enabled may decrease emulator performance + Enable/disable profiler. May decrease performance if enabled.