From cd6bf79d1ffff5cd57b29ad5c61411d6a69c10b6 Mon Sep 17 00:00:00 2001 From: "D. Quan" <60545346+sudoker0@users.noreply.github.com> Date: Sun, 22 Mar 2026 11:07:57 +0700 Subject: [PATCH 1/7] Building test with Windows/Linux --- .github/workflows/build.yml | 70 ++++++++++++++++++++++++++++++++++++ .github/workflows/codeql.yml | 46 ++---------------------- 2 files changed, 72 insertions(+), 44 deletions(-) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..426f1ec --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,70 @@ +name: "build: linux" + +on: + push: + branches: ["main", "ci-cd"] + pull_request: + branches: ["main", "ci-cd"] + schedule: + - cron: "19 2 * * 1" + +jobs: + build-linux: + name: Build Linux version + runs-on: 'ubuntu-latest' + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + submodules: recursive + + - name: Build + shell: bash + run: | + sudo add-apt-repository ppa:xmake-io/xmake + sudo apt-get update + sudo apt-get install -y \ + libx11-dev \ + libxrandr-dev \ + libxinerama-dev \ + libxcursor-dev \ + libxi-dev \ + libgl1-mesa-dev \ + mesa-common-dev \ + xmake + xmake build --all -y + + - name: Upload artifact + uses: actions/upload-artifact@v4 + with: + name: linux-build + path: build/linux/x86_64/debug/ # adjust to your xmake output path + if-no-files-found: error + retention-days: 7 + build-windows: + name: Build Windows version + runs-on: windows-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + submodules: recursive + + - name: Install xmake + uses: xmake-io/github-action-setup-xmake@v1 + with: + xmake-version: latest + + - name: Build + shell: pwsh + run: xmake build --all -y + + - name: Upload artifact + uses: actions/upload-artifact@v4 + with: + name: windows-build + path: build/windows/x64/release/ + if-no-files-found: error + retention-days: 7 \ No newline at end of file diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index f5e6193..18a0ca0 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -1,32 +1,16 @@ -# For most projects, this workflow file will not need changing; you simply need -# to commit it to your repository. -# -# You may wish to alter this file to override the set of languages analyzed, -# or to provide custom queries or build logic. -# -# ******** NOTE ******** -# We have attempted to detect the languages in your repository. Please check -# the `language` matrix defined below to confirm you have the correct set of -# supported CodeQL languages. -# name: "CodeQL Advanced" on: push: - branches: ["main", "tgui-fresh"] + branches: ["main"] pull_request: - branches: ["main", "tgui-fresh"] + branches: ["main"] schedule: - cron: "19 2 * * 1" jobs: analyze: name: Analyze (${{ matrix.language }}) - # Runner size impacts CodeQL analysis time. To learn more, please see: - # - https://gh.io/recommended-hardware-resources-for-running-codeql - # - https://gh.io/supported-runners-and-hardware-resources - # - https://gh.io/using-larger-runners (GitHub.com only) - # Consider using larger runners or machines with greater resources for possible analysis time improvements. runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }} permissions: # required for all workflows @@ -45,14 +29,6 @@ jobs: include: - language: c-cpp build-mode: manual - # CodeQL supports the following values keywords for 'language': 'actions', 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'rust', 'swift' - # Use `c-cpp` to analyze code written in C, C++ or both - # Use 'java-kotlin' to analyze code written in Java, Kotlin or both - # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both - # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis, - # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning. - # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how - # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages steps: - name: Checkout repository uses: actions/checkout@v4 @@ -60,31 +36,13 @@ jobs: fetch-depth: 0 submodules: recursive - # Add any setup steps before running the `github/codeql-action/init` action. - # This includes steps like installing compilers or runtimes (`actions/setup-node` - # or others). This is typically only required for manual builds. - # - name: Setup runtime (example) - # uses: actions/setup-example@v1 - # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL uses: github/codeql-action/init@v4 with: languages: ${{ matrix.language }} build-mode: ${{ matrix.build-mode }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - - # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs - # queries: security-extended,security-and-quality - # If the analyze step fails for one of the languages you are analyzing with - # "We were unable to automatically build your code", modify the matrix above - # to set the build mode to "manual" for that language. Then modify this step - # to build your code. - # ℹī¸ Command-line programs to run using the OS shell. - # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun - name: Run manual build steps if: matrix.build-mode == 'manual' shell: bash From 0de61c6e2940471b8726488f90b1b71ac39f10d4 Mon Sep 17 00:00:00 2001 From: "D. Quan" <60545346+sudoker0@users.noreply.github.com> Date: Sun, 22 Mar 2026 11:09:54 +0700 Subject: [PATCH 2/7] Adjusted path for Windows build --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 426f1ec..b13ada6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -65,6 +65,6 @@ jobs: uses: actions/upload-artifact@v4 with: name: windows-build - path: build/windows/x64/release/ + path: build/windows/x64/debug/ if-no-files-found: error retention-days: 7 \ No newline at end of file From adad908c844104e76c6fe4a76d82dad4b4d6ca13 Mon Sep 17 00:00:00 2001 From: "D. Quan" <60545346+sudoker0@users.noreply.github.com> Date: Sun, 22 Mar 2026 11:12:20 +0700 Subject: [PATCH 3/7] Added MacOS --- .github/workflows/build.yml | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b13ada6..0620665 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: "build: linux" +name: "Build RPG++" on: push: @@ -10,7 +10,7 @@ on: jobs: build-linux: - name: Build Linux version + name: "build: linux" runs-on: 'ubuntu-latest' steps: - name: Checkout repository @@ -43,7 +43,7 @@ jobs: if-no-files-found: error retention-days: 7 build-windows: - name: Build Windows version + name: "build: windows" runs-on: windows-latest steps: - name: Checkout repository @@ -67,4 +67,29 @@ jobs: name: windows-build path: build/windows/x64/debug/ if-no-files-found: error + retention-days: 7 + + build-macos: + name: "build: macos" + runs-on: macos-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + submodules: recursive + + - name: Install xmake + uses: xmake-io/github-action-setup-xmake@v1 + + - name: Build + shell: bash + run: xmake build --all -y + + - name: Upload artifact + uses: actions/upload-artifact@v4 + with: + name: macos-build + path: build/macos/x86_64/release/ + if-no-files-found: error retention-days: 7 \ No newline at end of file From d7a3b67884e257c7c399cecaeca72df7c98a3720 Mon Sep 17 00:00:00 2001 From: "D. Quan" <60545346+sudoker0@users.noreply.github.com> Date: Sun, 22 Mar 2026 11:20:24 +0700 Subject: [PATCH 4/7] Attempt number 1 at getting macos version to work --- .github/workflows/build.yml | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0620665..f692ac4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,10 +8,18 @@ on: schedule: - cron: "19 2 * * 1" +env: + BUILD_DIR: build + RETENTION_DAYS: 7 + BUILD_TYPE: debug + jobs: build-linux: name: "build: linux" runs-on: 'ubuntu-latest' + env: + PLATFORM: linux + ARCH: x86_64 steps: - name: Checkout repository uses: actions/checkout@v4 @@ -19,7 +27,7 @@ jobs: fetch-depth: 0 submodules: recursive - - name: Build + - name: Install packages shell: bash run: | sudo add-apt-repository ppa:xmake-io/xmake @@ -33,18 +41,25 @@ jobs: libgl1-mesa-dev \ mesa-common-dev \ xmake + + - name: Build + shell: bash + run: | xmake build --all -y - name: Upload artifact uses: actions/upload-artifact@v4 with: name: linux-build - path: build/linux/x86_64/debug/ # adjust to your xmake output path + path: ${{ env.BUILD_DIR }}/${{ env.PLATFORM }}/${{ env.ARCH }}/${{ env.BUILD_TYPE }}/ # adjust to your xmake output path if-no-files-found: error retention-days: 7 build-windows: name: "build: windows" runs-on: windows-latest + env: + PLATFORM: windows + ARCH: x64 steps: - name: Checkout repository uses: actions/checkout@v4 @@ -65,13 +80,16 @@ jobs: uses: actions/upload-artifact@v4 with: name: windows-build - path: build/windows/x64/debug/ + path: ${{ env.BUILD_DIR }}/${{ env.PLATFORM }}/${{ env.ARCH }}/${{ env.BUILD_TYPE }}/ if-no-files-found: error retention-days: 7 build-macos: name: "build: macos" runs-on: macos-latest + env: + PLATFORM: macos + ARCH: arm64 steps: - name: Checkout repository uses: actions/checkout@v4 @@ -90,6 +108,6 @@ jobs: uses: actions/upload-artifact@v4 with: name: macos-build - path: build/macos/x86_64/release/ + path: ${{ env.BUILD_DIR }}/${{ env.PLATFORM }}/${{ env.ARCH }}/${{ env.BUILD_TYPE }}/ if-no-files-found: error retention-days: 7 \ No newline at end of file From 4a72e711368c06c7c64f806d2625c5333ecf07d5 Mon Sep 17 00:00:00 2001 From: "D. Quan" <60545346+sudoker0@users.noreply.github.com> Date: Sun, 22 Mar 2026 11:25:04 +0700 Subject: [PATCH 5/7] Attempt 2 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f692ac4..4dccd43 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -89,7 +89,7 @@ jobs: runs-on: macos-latest env: PLATFORM: macos - ARCH: arm64 + ARCH: x86_64 steps: - name: Checkout repository uses: actions/checkout@v4 From 0aa86b8a996f051b74bd9e1cf086cdb4b1857144 Mon Sep 17 00:00:00 2001 From: "D. Quan" <60545346+sudoker0@users.noreply.github.com> Date: Sun, 22 Mar 2026 11:31:45 +0700 Subject: [PATCH 6/7] Attempt 3 --- .github/workflows/build.yml | 10 +++++----- xmake.lua | 5 +++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4dccd43..a1b563f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -53,7 +53,7 @@ jobs: name: linux-build path: ${{ env.BUILD_DIR }}/${{ env.PLATFORM }}/${{ env.ARCH }}/${{ env.BUILD_TYPE }}/ # adjust to your xmake output path if-no-files-found: error - retention-days: 7 + retention-days: ${{ env.RETENTION_DAYS }} build-windows: name: "build: windows" runs-on: windows-latest @@ -82,14 +82,14 @@ jobs: name: windows-build path: ${{ env.BUILD_DIR }}/${{ env.PLATFORM }}/${{ env.ARCH }}/${{ env.BUILD_TYPE }}/ if-no-files-found: error - retention-days: 7 + retention-days: ${{ env.RETENTION_DAYS }} build-macos: name: "build: macos" runs-on: macos-latest env: - PLATFORM: macos - ARCH: x86_64 + PLATFORM: macosx + ARCH: arm64 steps: - name: Checkout repository uses: actions/checkout@v4 @@ -110,4 +110,4 @@ jobs: name: macos-build path: ${{ env.BUILD_DIR }}/${{ env.PLATFORM }}/${{ env.ARCH }}/${{ env.BUILD_TYPE }}/ if-no-files-found: error - retention-days: 7 \ No newline at end of file + retention-days: ${{ env.RETENTION_DAYS }} \ No newline at end of file diff --git a/xmake.lua b/xmake.lua index 0eb63d0..87965f1 100644 --- a/xmake.lua +++ b/xmake.lua @@ -161,4 +161,9 @@ after_build(function(target) -- remove this line to test if the configuration file changes os.cp("$(curdir)/rpgpp.ini", "$(builddir)/$(plat)/$(arch)/$(mode)/", { copy_if_different = true }) print("Pro tip: Check whether translations are up to date with `xmake check_translation`!") + print("Environment:") + print(" builddir: " .. "$(builddir)") + print(" plat: " .. "$(plat)") + print(" arch: " .. "$(arch)") + print(" mode: " .. "$(mode)") end) From 26f899b3c4a7407e7501a79d3ecc8456dca0e68f Mon Sep 17 00:00:00 2001 From: "D. Quan" <60545346+sudoker0@users.noreply.github.com> Date: Sun, 22 Mar 2026 12:18:54 +0700 Subject: [PATCH 7/7] Update checkout and upload-artifact to version 6 --- .github/workflows/build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a1b563f..50ecc14 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ jobs: ARCH: x86_64 steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: fetch-depth: 0 submodules: recursive @@ -48,7 +48,7 @@ jobs: xmake build --all -y - name: Upload artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: linux-build path: ${{ env.BUILD_DIR }}/${{ env.PLATFORM }}/${{ env.ARCH }}/${{ env.BUILD_TYPE }}/ # adjust to your xmake output path @@ -62,7 +62,7 @@ jobs: ARCH: x64 steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: fetch-depth: 0 submodules: recursive @@ -77,7 +77,7 @@ jobs: run: xmake build --all -y - name: Upload artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: windows-build path: ${{ env.BUILD_DIR }}/${{ env.PLATFORM }}/${{ env.ARCH }}/${{ env.BUILD_TYPE }}/ @@ -92,7 +92,7 @@ jobs: ARCH: arm64 steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: fetch-depth: 0 submodules: recursive @@ -105,7 +105,7 @@ jobs: run: xmake build --all -y - name: Upload artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: macos-build path: ${{ env.BUILD_DIR }}/${{ env.PLATFORM }}/${{ env.ARCH }}/${{ env.BUILD_TYPE }}/