Merge branch 'v3.6.0' into develop_merge_v3.6

.github/workflows/build-problem-matcher.json

@@ -2,7 +2,7 @@
 {
     "problemMatcher": [
         {
-            "owner": "circular-reference-check",
+            "owner": "<Web> build",
             "pattern": [
                 {
                     "regexp": "^Circular dependency: (.*)$",

.github/workflows/get-native-external-version.js

@@ -0,0 +1,8 @@
+const path = require('path');
+const fs = require('fs');
+
+const configJsonPath = path.join(__dirname, '../../native/external-config.json');
+const configData = fs.readFileSync(configJsonPath);
+const config = JSON.parse(configData);
+const externalVersion = config.from.checkout;
+console.log(externalVersion);

.github/workflows/native-bindings.yml

@@ -3,6 +3,9 @@ name: <Native> Glue
 on:
   pull_request_target:
     types: [closed]
+    paths:
+    - 'templates/**'
+    - 'native/**'
 
 jobs:
   generate-jsb:
@@ -12,11 +15,17 @@ jobs:
       - uses: actions/checkout@v2
       - name: Download external libraries
         run: |
-          EXT_VERSION=`grep version native/external-config.json  |awk -F'"' '{print $4}'`
+          EXT_VERSION=`node ./.github/workflows/get-native-external-version.js`
           git clone --branch $EXT_VERSION --depth 1 https://github.com/cocos-creator/engine-native-external native/external
           rm -rf native/external/.git
-
+      - uses: nttld/setup-ndk@v1
+        id: setup-ndk
+        with:
+          ndk-version: r21e
+          add-to-path: false
       - name: Run genbindings.py
+        env:
+          ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
         run: |
           python3 -m pip install PyYAML==5.4.1 Cheetah3
           python3 ./native/tools/tojs/genbindings.py
@@ -34,6 +43,7 @@ jobs:
             title: '[ci skip][AUTO]: Automated PR to generate code'
             body: |
               Automated PR to genbindings & built resources
+              [X] does not change any runtime related code or build configuration
             committer: cocos-robot <[email protected]>
             author: cocos-robot <[email protected]>
             commit-message: "[ci skip][AUTO]: Automated code generating update: ${{ github.event.pull_request.head.sha }}  (#${{ github.event.number }})"
@@ -42,7 +52,6 @@ jobs:
             branch: t/bot/genbindings
             branch-suffix: short-commit-hash
             delete-branch: true
-            milestone: 1
 
       #- name: Make PR
       #  run: |

.github/workflows/native-clang-format.yml

@@ -4,6 +4,9 @@ name: <Native> Apply clang format
 on:
   pull_request_target:
     types: [closed]
+    paths:
+    - 'templates/**'
+    - 'native/**'
 
 jobs:
   Clang-Format:
@@ -50,4 +53,3 @@ jobs:
           branch: t/bot/fix-format
           branch-suffix: short-commit-hash
           delete-branch: true
-          milestone: 1

.github/workflows/native-compile-linux.yml

@@ -1,19 +1,37 @@
 name: <Native> Linux
 
-on: [pull_request]
+on:
+  pull_request:
+    paths:
+    - 'templates/**'
+    - 'native/**'
+
+# github.head_ref is only defined on pull_request events
+concurrency:
+  group: ${{ github.workflow }}-${{ github.actor }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
 
 jobs:
   compile_linux:
     name: "Linux-Ubuntu"
+    if: 
+      (! contains(github.event.pull_request.body, '[X] does not change any runtime related code or build configuration'))
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - name: Download external libraries
         shell: bash
         run: |
-          EXT_VERSION=`grep version native/external-config.json  |awk -F'"' '{print $4}'`
+          EXT_VERSION=`node ./.github/workflows/get-native-external-version.js`
           git clone --branch $EXT_VERSION --depth 1 https://github.com/cocos-creator/engine-native-external native/external
+      - uses: nttld/setup-ndk@v1
+        id: setup-ndk
+        with:
+          ndk-version: r21e
+          add-to-path: false
       - name: Generate bindings
+        env:
+          ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
         run: |
           python3 -m pip install PyYAML==5.4.1 Cheetah3
           python3 ./native/tools/tojs/genbindings.py
@@ -27,9 +45,9 @@ jobs:
         env:
           COCOS_ENGINE_DEV: 1
         run: |
-          COCOS2DX_ROOT=$GITHUB_WORKSPACE/native
+          NATIVE_ROOT=$GITHUB_WORKSPACE/native
           echo "Compiling Linux ... "
-          cd  $COCOS2DX_ROOT/templates/linux
+          cd  $GITHUB_WORKSPACE/templates/linux
           mkdir -p build-linux/proj
           touch build-linux/proj/cfg.cmake
           echo "set(CC_USE_VULKAN OFF)" >> build-linux/proj/cfg.cmake
@@ -41,8 +59,8 @@ jobs:
           echo "set(USE_PHYSICS_PHYSX OFF)" >> build-linux/proj/cfg.cmake
           mkdir build-linux/assets
 
-          RES_DIR=$COCOS2DX_ROOT/templates/linux/build-linux
+          RES_DIR=$GITHUB_WORKSPACE/templates/linux/build-linux
           cd build-linux
-          cmake ../ -GNinja -DRES_DIR=$RES_DIR -DCOCOS_X_PATH=$COCOS2DX_ROOT
+          cmake ../ -GNinja -DRES_DIR=$RES_DIR -DCOCOS_X_PATH=$NATIVE_ROOT
           set +e
           cmake --build .