Merge branch 'release/2.x' into dev

Author: halx99

.github/workflows/build.yml

@@ -10,6 +10,7 @@ on:
       - '**/*.md.in'
       - 'docs/**'
       - '.github/workflows/publish.yml'
+      - '.github/workflows/debian.yml'
       - 'tools/ci/make-pkg.ps1'
   pull_request:
     types: [opened, synchronize, reopened]

.github/workflows/debian.yml

@@ -0,0 +1,39 @@
+# This workflow require self-hosted by @halx99 personal machine, so only support trigger manually
+name: debian
+
+on:
+  push:
+    branches:
+      - dev
+      - release/*
+    paths:
+      - '.github/workflows/debian.yml'
+  workflow_dispatch:
+    inputs:
+      cxxstd:
+        # actions run ID
+        description: 'Please input cxxstd, example: 20'
+        # Default value if no value is explicitly provided
+        default: '20'
+        # Input has to be provided for the workflow to run
+        required: false
+
+env:
+  __1K_CXXSTD: '${{ inputs.cxxstd }}'
+
+run-name: 'build@c++${{ inputs.cxxstd || 20 }}'
+
+jobs:
+  debian-ogl:
+    runs-on: debian-12
+    steps:
+    - uses: actions/checkout@v6
+
+    - name: Install dependencies
+      run: |
+        AX_ROOT=`pwd`
+        echo -e "y" | pwsh $AX_ROOT/setup.ps1
+
+    - name: Build
+      shell: pwsh
+      run: ./tools/cmdline/axmol -p linux -a x64 -t 'cpp-tests,lua-tests' && ./tools/cmdline/axmol run -p linux -a x64 -t unit-tests -wait

.github/workflows/genbindings.yml

@@ -11,6 +11,7 @@ on:
       - 'docs/**'
       - '.github/workflows/publish.yml'
       - 'tools/ci/make-pkg.ps1'
+      - '.github/workflows/debian.yml'
 
   workflow_dispatch:
 jobs:

.github/workflows/publish.yml

@@ -28,36 +28,21 @@ jobs:
     steps:
     - uses: actions/checkout@v6
 
-    - name: Check release ver from input
-      if: ${{ github.event.inputs.version != '' }}
+    - name: Check release version
       id: check_ver
       shell: pwsh
       run: |
-        $release_ver = '${{ github.event.inputs.version }}'
-        echo "release_ver=$release_ver" >> ${env:GITHUB_OUTPUT}
-        echo "release_ver=$release_ver" >> ${env:GITHUB_ENV}
-
-    - name: Check release ver from commits
-      if: ${{ steps.check_ver.outputs.release_ver == '' }}
-      shell: pwsh
-      run: |
-        # commit message template: Version 2.7.0
+        # commit message template: Version 1.8.0
         $commit_msg = "$(git show -s --format=%s)"
-        echo "commit_msg: $commit_msg"
-        $matchInfo = [Regex]::Match($commit_msg, 'Version\s(\d+\.)+(-)?(\*|\d+)')
-        if ($matchInfo.Success) { $matchInfo = [Regex]::Match($matchInfo.Value, '(\d+\.)+(-)?(\*|\d+)') }
-        $release_ver = if($matchInfo.Success) { $matchInfo.Value.TrimStart('Version ') }
-        echo "release_ver=$release_ver" >> ${env:GITHUB_ENV}
-
-    - name: Forward release ver to step make_pkg
-      id: forward_ver
-      shell: pwsh
-      run: |
-        echo "Forwarding release_ver=$env:release_ver ..."
-        echo "release_ver=$env:release_ver" >> ${env:GITHUB_OUTPUT}
+        echo "Parsing release version from commit message: $commit_msg"
+        $matchInfo = [Regex]::Match($commit_msg, '^Version\s+(?<ver>\d+\.\d+\.\d+)$')
+        if(!$matchInfo.Success) { $matchInfo = [Regex]::Match('${{github.event.inputs.version}}', '^(?<ver>\d+\.\d+\.\d+(-\w+)?)$') }
+        if($matchInfo.Success) { $release_ver = $matchInfo.Groups['ver'].Value } else { $release_ver='' }
+        echo "release_ver=$release_ver"
+        echo "release_ver=$release_ver" >> ${env:GITHUB_OUTPUT}
 
     - name: Make package
-      if: ${{ steps.forward_ver.outputs.release_ver != '' }}
+      if: ${{ steps.check_ver.outputs.release_ver != '' }}
       id: make_pkg
       # Some projects don't allow in-source building, so create a separate build directory
       # We'll use this as our working directory for all subsequent commands
@@ -69,7 +54,7 @@ jobs:
         axmol -xc '-DAX_WITH_LZ4=ON,-DAX_WITH_CARES=ON,-DAX_WITH_YAML_CPP=ON,-DAX_WITH_KCP=ON' -c
         $input_commitish = "${{ github.event.inputs.commitish }}"
         if (!$input_commitish) { $input_commitish = $(git -C $AX_ROOT branch --show-current) }
-        ./tools/ci/publish.ps1 -version "${{ steps.forward_ver.outputs.release_ver }}" -commitish $input_commitish
+        ./tools/ci/publish.ps1 -version "${{ steps.check_ver.outputs.release_ver }}" -commitish $input_commitish
         echo "commitish=$input_commitish" >> ${env:GITHUB_OUTPUT}
 
     - name: Publish to github release page
@@ -78,7 +63,7 @@ jobs:
       with:
         tag_name: ${{ steps.make_pkg.outputs.release_tag }}
         name: ${{ steps.make_pkg.outputs.release_tag }}
-        files: steps.make_pkg.outputs.release_pkg }}
+        files: ${{ steps.make_pkg.outputs.release_pkg }}
         body_path: ${{ steps.make_pkg.outputs.release_note }}
         prerelease: ${{ steps.make_pkg.outputs.prerelease }}
         target_commitish: ${{ steps.make_pkg.outputs.commitish }}

1k/1kiss.ps1

@@ -1177,7 +1177,7 @@ function setup_nasm() {
         }
         elseif ($IsLinux) {
             if ($(which dpkg)) {
-                sudo apt install nasm
+                sudo apt-get install -y nasm
             }
         }
         elseif ($IsMacOS) {
@@ -1226,7 +1226,7 @@ function setup_unzip() {
     if (!$unzip_cmd_info) {
         if ($IsLinux) {
             if ($(which dpkg)) {
-                sudo apt install unzip
+                sudo apt-get install -y unzip
             }
             elseif($(which pacman)) {
                 sudo pacman -S --needed --noconfirm unzip
@@ -1259,7 +1259,7 @@ function setup_7z() {
             $1k.addpath($7z_bin)
         }
         elseif ($IsLinux) {
-            if ($(which dpkg)) { sudo apt install p7zip-full }
+            if ($(which dpkg)) { sudo apt-get install -y p7zip-full }
         }
         elseif ($IsMacOS) {
             brew install p7zip