From f21755723638b4fe9b8a279af04947837681e86f Mon Sep 17 00:00:00 2001 From: VocalFan <45863583+Mou-Ikkai@users.noreply.github.com> Date: Mon, 26 Sep 2022 10:04:20 -0400 Subject: [PATCH 1/9] Fixed typo and wording. --- source/launcher/ts/launcher_ru_RU.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/launcher/ts/launcher_ru_RU.ts b/source/launcher/ts/launcher_ru_RU.ts index d72c156..f5bed86 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. From fa8e66a8c13f4bdccb266720e8699a1587e5118c Mon Sep 17 00:00:00 2001 From: VocalFan <45863583+Mou-Ikkai@users.noreply.github.com> Date: Mon, 26 Sep 2022 10:06:08 -0400 Subject: [PATCH 2/9] Fixed typo and wording. --- source/launcher/forms/configuration_edit_dialog.ui | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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. From 990fb951d060d78e1c6888e3caeab0003a56cb32 Mon Sep 17 00:00:00 2001 From: VocalFan <45863583+Mou-Ikkai@users.noreply.github.com> Date: Mon, 26 Sep 2022 13:29:06 -0400 Subject: [PATCH 3/9] External building (No Release, just Artifact) --- .github/workflows/{ci.yml => external.yml} | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) rename .github/workflows/{ci.yml => external.yml} (94%) diff --git a/.github/workflows/ci.yml b/.github/workflows/external.yml similarity index 94% rename from .github/workflows/ci.yml rename to .github/workflows/external.yml index 435ac64..2b6044f 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: @@ -36,7 +38,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 From 8436f222ba8febe04cac4078f44f4388ea2a10d0 Mon Sep 17 00:00:00 2001 From: VocalFan <45863583+Mou-Ikkai@users.noreply.github.com> Date: Mon, 26 Sep 2022 13:38:59 -0400 Subject: [PATCH 4/9] Main Compilation (Releases with ZIP download.) --- .github/workflows/main.yml | 57 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..f613bec --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,57 @@ +name: Main Compilation + +on: + push: + branches: [ "main" ] + +env: + version: v0.${{ github.run_number }}.0 + +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@v2 + with: + arch: win64_mingw81 + - 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 }} From 333ee59918720625e9743df55bd5fb1815de8fb6 Mon Sep 17 00:00:00 2001 From: VocalFan <45863583+Mou-Ikkai@users.noreply.github.com> Date: Mon, 26 Sep 2022 14:57:52 -0400 Subject: [PATCH 5/9] Let's try this... --- source/launcher/src/MainDialog.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/launcher/src/MainDialog.cpp b/source/launcher/src/MainDialog.cpp index 3993442..63f981f 100644 --- a/source/launcher/src/MainDialog.cpp +++ b/source/launcher/src/MainDialog.cpp @@ -284,11 +284,11 @@ void MainDialog::RunInterpreter(QProcess* process, Kyty::Configuration* info, bo if (con_emu) { process->setProgram(CONEMU_EXE); - process->setArguments({"-run", /*CMD_EXE, "/K", */ interpreter, lua_file_name}); + process->setArguments({"-run", /*CMD_EXE, "/K", */ \"\"interpreter\"\", \"\"lua_file_name\"\"}); } else { process->setProgram(CMD_EXE); - process->setArguments({"/K", interpreter, lua_file_name}); + process->setArguments({"/K", \"\"interpreter\"\", lua_file_name}); } process->setWorkingDirectory(dir.path()); process->setCreateProcessArgumentsModifier( From e9fe7074cb5101f1f6ca73cd72b5ffbfe598725c Mon Sep 17 00:00:00 2001 From: VocalFan <45863583+Mou-Ikkai@users.noreply.github.com> Date: Mon, 26 Sep 2022 15:33:16 -0400 Subject: [PATCH 6/9] Revert "Let's try this..." This reverts commit 333ee59918720625e9743df55bd5fb1815de8fb6. --- source/launcher/src/MainDialog.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/launcher/src/MainDialog.cpp b/source/launcher/src/MainDialog.cpp index 63f981f..3993442 100644 --- a/source/launcher/src/MainDialog.cpp +++ b/source/launcher/src/MainDialog.cpp @@ -284,11 +284,11 @@ void MainDialog::RunInterpreter(QProcess* process, Kyty::Configuration* info, bo if (con_emu) { process->setProgram(CONEMU_EXE); - process->setArguments({"-run", /*CMD_EXE, "/K", */ \"\"interpreter\"\", \"\"lua_file_name\"\"}); + process->setArguments({"-run", /*CMD_EXE, "/K", */ interpreter, lua_file_name}); } else { process->setProgram(CMD_EXE); - process->setArguments({"/K", \"\"interpreter\"\", lua_file_name}); + process->setArguments({"/K", interpreter, lua_file_name}); } process->setWorkingDirectory(dir.path()); process->setCreateProcessArgumentsModifier( From d1bb7b3ea41428f4b4a72e6aa11967192ea7dfe4 Mon Sep 17 00:00:00 2001 From: VocalFan <45863583+Mou-Ikkai@users.noreply.github.com> Date: Tue, 27 Sep 2022 08:51:15 -0400 Subject: [PATCH 7/9] Proper Versioning --- .github/workflows/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f613bec..b1bc6f5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,7 +5,9 @@ on: branches: [ "main" ] env: - version: v0.${{ github.run_number }}.0 + major: 0 + minor: 2 + version: v${{ env.major }}.${{ env.minor }}.${{ github.run_number }} concurrency: ci-${{ github.ref }} jobs: From 635c21ef248fa598caa8b632a77853fad62fb041 Mon Sep 17 00:00:00 2001 From: VocalFan <45863583+Mou-Ikkai@users.noreply.github.com> Date: Tue, 27 Sep 2022 08:59:28 -0400 Subject: [PATCH 8/9] Update QT Installer. --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b1bc6f5..4bed0c6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,9 +22,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% From 35b9673ce625a85c6ad998190725fc5daaa41ac5 Mon Sep 17 00:00:00 2001 From: VocalFan <45863583+Mou-Ikkai@users.noreply.github.com> Date: Tue, 27 Sep 2022 09:00:01 -0400 Subject: [PATCH 9/9] Updated QT Installer --- .github/workflows/external.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/external.yml b/.github/workflows/external.yml index 2b6044f..db1f9d2 100644 --- a/.github/workflows/external.yml +++ b/.github/workflows/external.yml @@ -21,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%