diff --git a/.github/workflows/native-compile-platforms.yml b/.github/workflows/native-compile-platforms.yml index 48369b44dc..9c969f5913 100644 --- a/.github/workflows/native-compile-platforms.yml +++ b/.github/workflows/native-compile-platforms.yml @@ -37,7 +37,7 @@ jobs: with: vulkan-query-version: 1.2.189.0 vulkan-components: Vulkan-Headers, Vulkan-Loader - vulkan-use-cache: true + vulkan-use-cache: false - name: Compile win64 shell: bash env: @@ -332,7 +332,6 @@ jobs: - uses: actions/setup-node@v4 with: node-version: 14 - cache: 'npm' - if: ${{ steps.cache-oh-sdk.outputs.cache-hit != 'true' }} name: No Cache found, install oh sdk diff --git a/.github/workflows/native-simulator.yml b/.github/workflows/native-simulator.yml index 1705ffdc97..d6daa307ce 100644 --- a/.github/workflows/native-simulator.yml +++ b/.github/workflows/native-simulator.yml @@ -38,7 +38,7 @@ jobs: with: vulkan-query-version: 1.2.189.0 vulkan-components: Vulkan-Headers, Vulkan-Loader - vulkan-use-cache: true + vulkan-use-cache: false - name: gen simulator run: | npx gulp gen-simulator diff --git a/.github/workflows/web-interface-check.yml b/.github/workflows/web-interface-check.yml index 78b4dee4be..20e095ee2d 100644 --- a/.github/workflows/web-interface-check.yml +++ b/.github/workflows/web-interface-check.yml @@ -11,10 +11,17 @@ env: PR_NUMBER: ${{ github.event.pull_request.number }} jobs: - interface_check: + dts-and-size: if: (! contains(github.event.pull_request.body, '[X] does not change any runtime related code or build configuration')) runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + config: + - { target: base } + - { target: head } + steps: - uses: actions/setup-node@v4 with: @@ -24,7 +31,7 @@ jobs: uses: dumganhar/setup-emsdk@997d2cde2deabda085a11f98e86e842915b0e846 with: version: 3.1.41 - actions-cache-folder: 'emsdk-cache-3.1.41' + # actions-cache-folder: 'emsdk-cache-3.1.41' - name: Verify run: | @@ -44,214 +51,32 @@ jobs: - uses: actions/checkout@v4 name: Checkout Base Ref + if: ${{ matrix.config.target == 'base' }} with: repository: ${{ github.event.pull_request.base.repo.full_name }} ref: ${{ github.base_ref }} - path: './engine' - - name: Get Base Ref - working-directory: ./engine - run: | - echo "BASE_REF=$(git rev-parse HEAD)" >> $GITHUB_ENV + - uses: actions/checkout@v4 + name: Checkout Head Ref for using the latest .github/workflows for base + if: ${{ matrix.config.target == 'base' }} + with: + path: './engine-HEAD' - uses: actions/checkout@v4 name: Checkout Head Ref - with: - ref: 'refs/pull/${{ github.event.pull_request.number }}/head' - path: './engine-HEAD' - fetch-depth: 0 - - - name: Head merges base - working-directory: ./engine-HEAD - run: | - git config user.name "Cocos CI" - git config user.email "cocos-ci@cocos.com" - echo "BASE_REF: ${{ env.BASE_REF }}" - HEAD_REF=$(git rev-parse HEAD) - echo "HEAD_REF: $HEAD_REF" - echo "--------------------------------------------------------" - echo "HEAD LOG:" - git --no-pager log -3 - echo "--------------------------------------------------------" - git fetch origin ${{ env.BASE_REF }} - git reset --hard ${{ env.BASE_REF }} - echo "--------------------------------------------------------" - echo "BASE LOG:" - git --no-pager log -3 - echo "--------------------------------------------------------" - CURRENT_REF=$(git rev-parse HEAD) - echo "---- $CURRENT_REF merges $HEAD_REF ----" - git merge $HEAD_REF - echo "--------------------------------------------------------" - echo "MERGED LOG:" - git --no-pager log -5 - echo "--------------------------------------------------------" + if: ${{ matrix.config.target == 'head' }} - name: Show Refs run: | - cd ./engine - echo "BASE LOG:" + echo "Commit log:" git --no-pager log -3 - cd ../engine-HEAD - echo "HEAD LOG:" - git --no-pager log -3 - - - name: Check for SPINE_VERSION in CMakeLists.txt (BASE) - run: | - cd ./engine/native/cocos/editor-support/spine-wasm - if grep -q "SPINE_VERSION" CMakeLists.txt; then - echo "FOUND_SPINE_VERSION_BASE=true" - echo "FOUND_SPINE_VERSION_BASE=true" >> $GITHUB_ENV - else - echo "FOUND_SPINE_VERSION_BASE=false" - echo "FOUND_SPINE_VERSION_BASE=false" >> $GITHUB_ENV - fi - - - run: | - echo "EXT_VERSION=$(node ./engine/.github/workflows/get-native-external-version.js)" >> $GITHUB_ENV - - - uses: actions/checkout@v4 - name: Download external - with: - repository: cocos/cocos-engine-external - path: './engine/native/external' - ref: "${{ env.EXT_VERSION }}" - fetch-depth: 1 - - - name: Apply emscripten patches (BASE) - run: | - echo "--------------------------------- Save bind.cpp ---------------------------------" - cp $EMSDK/upstream/emscripten/system/lib/embind/bind.cpp $EMSDK/upstream/emscripten/system/lib/embind/bind.cpp.bak - echo "--------------------------------- Apply embind bind.cpp patches ---------------------------------" - cp -f ./engine/.github/workflows/emscripten-patches/embind/bind.cpp $EMSDK/upstream/emscripten/system/lib/embind/ - echo "--------------------------------- Apply patches DONE! ---------------------------------" - cat $EMSDK/upstream/emscripten/system/lib/embind/bind.cpp - - - name: Build Spine 3.8 WASM (BASE) - run: | - cd ./engine/native/cocos/editor-support/spine-wasm - rm -rf build-wasm - mkdir build-wasm - cd build-wasm - emcmake cmake .. -GNinja - ninja - ls -l - - - name: Build Spine 3.8 ASMJS (BASE) - run: | - cd ./engine/native/cocos/editor-support/spine-wasm - sed -i 's/set(BUILD_WASM 1)/set(BUILD_WASM 0)/g' CMakeLists.txt - rm -rf build-asmjs - mkdir build-asmjs - cd build-asmjs - emcmake cmake .. -GNinja - ninja - ls -l - - - name: Copy Spine 3.8 files to external directory (BASE) - run: | - if [[ $FOUND_SPINE_VERSION_BASE ]]; then - SPINE_VERSION="3.8" - fi - DIST_PATH="dist/3.8" - rm -rf $DIST_PATH - mkdir -p $DIST_PATH - cp ./engine/native/cocos/editor-support/spine-wasm/build-wasm/spine.wasm ./$DIST_PATH/ - cp ./engine/native/cocos/editor-support/spine-wasm/build-wasm/spine.js ./$DIST_PATH/spine.wasm.js - cp ./engine/native/cocos/editor-support/spine-wasm/build-asmjs/spine.js.mem ./$DIST_PATH/ - cp ./engine/native/cocos/editor-support/spine-wasm/build-asmjs/spine.js ./$DIST_PATH/spine.asm.js - mkdir -p ./engine/native/external/emscripten/spine/$SPINE_VERSION - echo "-------- Before replace spine wasm -----------" - ls -l ./engine/native/external/emscripten/spine/$SPINE_VERSION - cp -f ./$DIST_PATH/* ./engine/native/external/emscripten/spine/$SPINE_VERSION - echo "-------- After replace spine wasm ------------" - ls -l ./engine/native/external/emscripten/spine/$SPINE_VERSION - echo "-----------------------------------------------" - cd ./engine/native/external + echo "git status" git status - - name: Build Spine 4.2 WASM (BASE) - if: env.FOUND_SPINE_VERSION_BASE == 'true' - run: | - cd ./engine/native/cocos/editor-support/spine-wasm - sed -i 's/set(BUILD_WASM 0)/set(BUILD_WASM 1)/g' CMakeLists.txt - sed -i 's/set(SPINE_VERSION "3.8")/set(SPINE_VERSION "4.2")/g' CMakeLists.txt - rm -rf build-wasm - mkdir build-wasm - cd build-wasm - emcmake cmake .. -GNinja - ninja - ls -l - - - name: Build Spine 4.2 ASMJS (BASE) - if: env.FOUND_SPINE_VERSION_BASE == 'true' - run: | - cd ./engine/native/cocos/editor-support/spine-wasm - sed -i 's/set(SPINE_VERSION "3.8")/set(SPINE_VERSION "4.2")/g' CMakeLists.txt - sed -i 's/set(BUILD_WASM 1)/set(BUILD_WASM 0)/g' CMakeLists.txt - rm -rf build-asmjs - mkdir build-asmjs - cd build-asmjs - emcmake cmake .. -GNinja - ninja - ls -l - - - name: Copy Spine 4.2 files to external directory (BASE) - if: env.FOUND_SPINE_VERSION_BASE == 'true' - run: | - DIST_PATH="dist/4.2" - rm -rf $DIST_PATH - mkdir -p $DIST_PATH - cp ./engine/native/cocos/editor-support/spine-wasm/build-wasm/spine.wasm ./$DIST_PATH/ - cp ./engine/native/cocos/editor-support/spine-wasm/build-wasm/spine.js ./$DIST_PATH/spine.wasm.js - cp ./engine/native/cocos/editor-support/spine-wasm/build-asmjs/spine.js.mem ./$DIST_PATH/ - cp ./engine/native/cocos/editor-support/spine-wasm/build-asmjs/spine.js ./$DIST_PATH/spine.asm.js - mkdir -p ./engine/native/external/emscripten/spine/4.2/ - echo "-------- Before replace spine wasm -----------" - ls -l ./engine/native/external/emscripten/spine/4.2/ - cp -f ./$DIST_PATH/* ./engine/native/external/emscripten/spine/4.2/ - echo "-------- After replace spine wasm ------------" - ls -l ./engine/native/external/emscripten/spine/4.2/ - echo "-----------------------------------------------" - cd ./engine/native/external - git status - - - name: Build Base Declarations - working-directory: . - run: | - ROOT_DIR=$(pwd) - cd engine - npm install - cd ../engine-HEAD - npm install --ignore-scripts - # Use package-size-check.js in HEAD - node .github/workflows/package-size-check.js "$ROOT_DIR/engine" - - - name: Restore patches (BASE) - run: | - echo "-------------------------- Restore patches ---------------------------------" - rm $EMSDK/upstream/emscripten/system/lib/embind/bind.cpp - mv $EMSDK/upstream/emscripten/system/lib/embind/bind.cpp.bak $EMSDK/upstream/emscripten/system/lib/embind/bind.cpp - echo "-------------------------- Restore patches DONE! ---------------------------------" - cat $EMSDK/upstream/emscripten/system/lib/embind/bind.cpp - - - name: Clear npm Cache - run: | - npm cache clean --force - - - run: | - echo "EXT_VERSION_HEAD=$(node ./engine-HEAD/.github/workflows/get-native-external-version.js)" >> $GITHUB_ENV - - - uses: actions/checkout@v4 - name: Download external - with: - repository: cocos/cocos-engine-external - path: './engine-HEAD/native/external' - ref: "${{ env.EXT_VERSION_HEAD }}" - fetch-depth: 1 - - - name: Apply emscripten patches (HEAD) + - name: Apply emscripten patches (base) + if: ${{ matrix.config.target == 'base' }} run: | + ls -l $EMSDK/upstream/emscripten/ echo "--------------------------------- Save bind.cpp ---------------------------------" cp $EMSDK/upstream/emscripten/system/lib/embind/bind.cpp $EMSDK/upstream/emscripten/system/lib/embind/bind.cpp.bak echo "--------------------------------- Apply embind bind.cpp patches ---------------------------------" @@ -259,49 +84,34 @@ jobs: echo "--------------------------------- Apply patches DONE! ---------------------------------" cat $EMSDK/upstream/emscripten/system/lib/embind/bind.cpp - - name: Build Spine 3.8 WASM (HEAD) + - name: Apply emscripten patches (head) + if: ${{ matrix.config.target == 'head' }} run: | - cd ./engine-HEAD/native/cocos/editor-support/spine-wasm - mkdir build-wasm - cd build-wasm - emcmake cmake .. -GNinja - ninja - ls -l + ls -l $EMSDK/upstream/emscripten/ + echo "--------------------------------- Save bind.cpp ---------------------------------" + cp $EMSDK/upstream/emscripten/system/lib/embind/bind.cpp $EMSDK/upstream/emscripten/system/lib/embind/bind.cpp.bak + echo "--------------------------------- Apply embind bind.cpp patches ---------------------------------" + cp -f .github/workflows/emscripten-patches/embind/bind.cpp $EMSDK/upstream/emscripten/system/lib/embind/ + echo "--------------------------------- Apply patches DONE! ---------------------------------" + cat $EMSDK/upstream/emscripten/system/lib/embind/bind.cpp - - name: Build Spine 3.8 ASMJS (HEAD) - run: | - cd ./engine-HEAD/native/cocos/editor-support/spine-wasm - sed -i 's/set(BUILD_WASM 1)/set(BUILD_WASM 0)/g' CMakeLists.txt - mkdir build-asmjs - cd build-asmjs - emcmake cmake .. -GNinja - ninja - ls -l - - - name: Copy Spine 3.8 files to external directory (HEAD) - run: | - DIST_PATH="dist/3.8" - rm -rf $DIST_PATH - mkdir -p $DIST_PATH - cp ./engine-HEAD/native/cocos/editor-support/spine-wasm/build-wasm/spine.wasm ./$DIST_PATH - cp ./engine-HEAD/native/cocos/editor-support/spine-wasm/build-wasm/spine.js ./$DIST_PATH/spine.wasm.js - cp ./engine-HEAD/native/cocos/editor-support/spine-wasm/build-asmjs/spine.js.mem ./$DIST_PATH/ - cp ./engine-HEAD/native/cocos/editor-support/spine-wasm/build-asmjs/spine.js ./$DIST_PATH/spine.asm.js - echo "-------- Before replace spine wasm -----------" - mkdir -p ./engine-HEAD/native/external/emscripten/spine/3.8 - ls -l ./engine-HEAD/native/external/emscripten/spine/3.8 - cp -f ./$DIST_PATH/* ./engine-HEAD/native/external/emscripten/spine/3.8 - echo "-------- After replace spine wasm ------------" - ls -l ./engine-HEAD/native/external/emscripten/spine/3.8 - echo "-----------------------------------------------" - cd ./engine-HEAD/native/external - git status + - run: | + echo "EXT_VERSION=$(node .github/workflows/get-native-external-version.js)" >> $GITHUB_ENV - - name: Build Spine 4.2 WASM (HEAD) + - uses: actions/checkout@v4 + name: Download external + with: + repository: cocos/cocos-engine-external + path: './native/external' + ref: "${{ env.EXT_VERSION }}" + fetch-depth: 1 + + - name: Build Spine 3.8 WASM run: | - cd ./engine-HEAD/native/cocos/editor-support/spine-wasm + cd ./native/cocos/editor-support/spine-wasm sed -i 's/set(BUILD_WASM 0)/set(BUILD_WASM 1)/g' CMakeLists.txt - sed -i 's/set(SPINE_VERSION "3.8")/set(SPINE_VERSION "4.2")/g' CMakeLists.txt + sed -i 's/set(SPINE_VERSION "4.2")/set(SPINE_VERSION "3.8")/g' CMakeLists.txt + cat CMakeLists.txt rm -rf build-wasm mkdir build-wasm cd build-wasm @@ -309,11 +119,12 @@ jobs: ninja ls -l - - name: Build Spine 4.2 ASMJS (HEAD) + - name: Build Spine 3.8 ASMJS run: | - cd ./engine-HEAD/native/cocos/editor-support/spine-wasm - sed -i 's/set(SPINE_VERSION "3.8")/set(SPINE_VERSION "4.2")/g' CMakeLists.txt + cd ./native/cocos/editor-support/spine-wasm sed -i 's/set(BUILD_WASM 1)/set(BUILD_WASM 0)/g' CMakeLists.txt + sed -i 's/set(SPINE_VERSION "4.2")/set(SPINE_VERSION "3.8")/g' CMakeLists.txt + cat CMakeLists.txt rm -rf build-asmjs mkdir build-asmjs cd build-asmjs @@ -321,38 +132,111 @@ jobs: ninja ls -l - - name: Copy Spine 4.2 files to external directory (HEAD) + - name: Copy Spine 3.8 files to external directory run: | - DIST_PATH="dist/4.2" - rm -rf $DIST_PATH + SPINE_VERSION="3.8" + DIST_PATH="dist-${{ matrix.config.target }}/3.8" mkdir -p $DIST_PATH - cp ./engine-HEAD/native/cocos/editor-support/spine-wasm/build-wasm/spine.wasm ./$DIST_PATH - cp ./engine-HEAD/native/cocos/editor-support/spine-wasm/build-wasm/spine.js ./$DIST_PATH/spine.wasm.js - cp ./engine-HEAD/native/cocos/editor-support/spine-wasm/build-asmjs/spine.js.mem ./$DIST_PATH/ - cp ./engine-HEAD/native/cocos/editor-support/spine-wasm/build-asmjs/spine.js ./$DIST_PATH/spine.asm.js + cp ./native/cocos/editor-support/spine-wasm/build-wasm/spine.wasm ./$DIST_PATH/ + cp ./native/cocos/editor-support/spine-wasm/build-wasm/spine.js ./$DIST_PATH/spine.wasm.js + cp ./native/cocos/editor-support/spine-wasm/build-asmjs/spine.js.mem ./$DIST_PATH/ + cp ./native/cocos/editor-support/spine-wasm/build-asmjs/spine.js ./$DIST_PATH/spine.asm.js + mkdir -p ./native/external/emscripten/spine/$SPINE_VERSION echo "-------- Before replace spine wasm -----------" - mkdir -p ./engine-HEAD/native/external/emscripten/spine/4.2/ - ls -l ./engine-HEAD/native/external/emscripten/spine/4.2/ - cp -f ./$DIST_PATH/* ./engine-HEAD/native/external/emscripten/spine/4.2/ + ls -l ./native/external/emscripten/spine/$SPINE_VERSION + cp -f ./$DIST_PATH/* ./native/external/emscripten/spine/$SPINE_VERSION echo "-------- After replace spine wasm ------------" - ls -l ./engine-HEAD/native/external/emscripten/spine/4.2/ + ls -l ./native/external/emscripten/spine/$SPINE_VERSION echo "-----------------------------------------------" - cd ./engine-HEAD/native/external + cd ./native/external git status - - name: Upload Artifact + - name: Build Spine 4.2 WASM + run: | + cd ./native/cocos/editor-support/spine-wasm + sed -i 's/set(BUILD_WASM 0)/set(BUILD_WASM 1)/g' CMakeLists.txt + sed -i 's/set(SPINE_VERSION "3.8")/set(SPINE_VERSION "4.2")/g' CMakeLists.txt + cat CMakeLists.txt + git status + rm -rf build-wasm + mkdir build-wasm + cd build-wasm + emcmake cmake .. -GNinja + ninja + ls -l + + - name: Build Spine 4.2 ASMJS + run: | + cd ./native/cocos/editor-support/spine-wasm + sed -i 's/set(SPINE_VERSION "3.8")/set(SPINE_VERSION "4.2")/g' CMakeLists.txt + sed -i 's/set(BUILD_WASM 1)/set(BUILD_WASM 0)/g' CMakeLists.txt + cat CMakeLists.txt + git status + rm -rf build-asmjs + mkdir build-asmjs + cd build-asmjs + emcmake cmake .. -GNinja + ninja + ls -l + + - name: Copy Spine 4.2 files to external directory + run: | + DIST_PATH="dist-${{ matrix.config.target }}/4.2" + mkdir -p $DIST_PATH + cp ./native/cocos/editor-support/spine-wasm/build-wasm/spine.wasm ./$DIST_PATH/ + cp ./native/cocos/editor-support/spine-wasm/build-wasm/spine.js ./$DIST_PATH/spine.wasm.js + cp ./native/cocos/editor-support/spine-wasm/build-asmjs/spine.js.mem ./$DIST_PATH/ + cp ./native/cocos/editor-support/spine-wasm/build-asmjs/spine.js ./$DIST_PATH/spine.asm.js + mkdir -p ./native/external/emscripten/spine/4.2/ + echo "-------- Before replace spine wasm -----------" + ls -l ./native/external/emscripten/spine/4.2/ + cp -f ./$DIST_PATH/* ./native/external/emscripten/spine/4.2/ + echo "-------- After replace spine wasm ------------" + ls -l ./native/external/emscripten/spine/4.2/ + echo "-----------------------------------------------" + cd ./native/external + git status + + - name: Upload Spine Artifact uses: actions/upload-artifact@v4 with: - name: spine-emscripten - path: dist + name: spine-emscripten-${{ matrix.config.target }} + path: dist-${{ matrix.config.target }} - - name: Build Head Declarations - working-directory: ./engine-HEAD + - name: Build Declarations (base) + if: ${{ matrix.config.target == 'base' }} run: | + ROOT_DIR=$(pwd) npm install - node ./.github/workflows/package-size-check.js "$(pwd)" + cd ./engine-HEAD + npm install --ignore-scripts + # Use package-size-check.js in HEAD + node .github/workflows/package-size-check.js "$ROOT_DIR" - - name: Restore patches (HEAD) + - name: Build Declarations (head) + if: ${{ matrix.config.target == 'head' }} + run: | + ROOT_DIR=$(pwd) + npm install + node .github/workflows/package-size-check.js "$ROOT_DIR" + + - name: Pack for compare + run: | + mkdir package-for-compare + cp ./bin/.declarations/cc.d.ts ./package-for-compare + cp -r build-cc-out-2d-empty-legacy-pipline ./package-for-compare + cp -r build-cc-out-2d-legacy-pipline ./package-for-compare + cp -r build-cc-out-2d-new-pipline ./package-for-compare + cp -r build-cc-out-all ./package-for-compare + cp -r build-cc-out-all-web ./package-for-compare + + - name: Upload Declarations Artifact + uses: actions/upload-artifact@v4 + with: + name: package-for-compare-${{ matrix.config.target }} + path: package-for-compare + + - name: Restore patches run: | echo "-------------------------- Restore patches ---------------------------------" rm $EMSDK/upstream/emscripten/system/lib/embind/bind.cpp @@ -360,22 +244,45 @@ jobs: echo "-------------------------- Restore patches DONE! ---------------------------------" cat $EMSDK/upstream/emscripten/system/lib/embind/bind.cpp + interface_check: + if: + (! contains(github.event.pull_request.body, '[X] does not change any runtime related code or build configuration')) + runs-on: ubuntu-latest + needs: dts-and-size + + steps: + - uses: actions/setup-node@v4 + with: + node-version: '18.x' + + - uses: actions/checkout@v4 + + - name: Download Artifacts (base) + uses: actions/download-artifact@v4 + with: + name: package-for-compare-base + path: artifacts/package-for-compare-base + + - name: Download Artifacts (head) + uses: actions/download-artifact@v4 + with: + name: package-for-compare-head + path: artifacts/package-for-compare-head + - uses: LouisBrunner/diff-action@v2.0.0 with: - old: ./engine/bin/.declarations/cc.d.ts - new: ./engine-HEAD/bin/.declarations/cc.d.ts + old: ./artifacts/package-for-compare-base/cc.d.ts + new: ./artifacts/package-for-compare-head/cc.d.ts mode: addition tolerance: worse - output: ./engine-HEAD/interface-diff.txt + output: ./interface-diff.txt - name: optimize interface check report - working-directory: ./engine-HEAD run: | cat ./interface-diff.txt node ./.github/workflows/interface-check-report.js - name: After optimize interface check report - working-directory: ./engine-HEAD run: | cat ./interface-diff.txt @@ -399,10 +306,10 @@ jobs: check_diff() { ccbuild_out_folder_name="$1" - if [ -d ./engine/$ccbuild_out_folder_name ]; then - BASE_SIZE=$(du -sb ./engine/$ccbuild_out_folder_name | awk '{print $1}') + if [ -d ./artifacts/package-for-compare-base/$ccbuild_out_folder_name ]; then + BASE_SIZE=$(du -sb ./artifacts/package-for-compare-base/$ccbuild_out_folder_name | awk '{print $1}') fi - HEAD_SIZE=$(du -sb ./engine-HEAD/$ccbuild_out_folder_name | awk '{print $1}') + HEAD_SIZE=$(du -sb ./artifacts/package-for-compare-head/$ccbuild_out_folder_name | awk '{print $1}') DIFF_SIZE=$((HEAD_SIZE - BASE_SIZE)) if [ "$DIFF_SIZE" -gt 0 ]; then ICON="⚠️ +" @@ -443,7 +350,7 @@ jobs: printf "%s\n" "$PACKAGE_SIZE_INFO" - DIFF_FILE_PATH=./engine-HEAD/interface-diff.txt + DIFF_FILE_PATH=./interface-diff.txt ORIGINAL_DIFF_CONTENT=$(cat ${DIFF_FILE_PATH}) echo "Original Diff: " printf "%s\n" "$ORIGINAL_DIFF_CONTENT" @@ -474,4 +381,4 @@ jobs: with: name: interface-diff.txt path: | - ./engine-HEAD/interface-diff.txt + ./interface-diff.txt diff --git a/cocos/audio/audio-manager.ts b/cocos/audio/audio-manager.ts index c6512e9528..cf859c3324 100644 --- a/cocos/audio/audio-manager.ts +++ b/cocos/audio/audio-manager.ts @@ -51,10 +51,13 @@ export class AudioManager { audioInfoList[idx].playTime = performance.now(); return false; } - audioInfoList.push({ + + const audioInfo: AudioInfo = { audio, playTime: performance.now(), - }); + }; + + audioInfoList.push(audioInfo); return true; } public addPlaying (audio: ManagedAudio): void {