From 36f36d9d00775c3d63b3c6b33d5e0800eeb85ddd Mon Sep 17 00:00:00 2001 From: James Chen Date: Tue, 19 Nov 2024 12:56:59 +0800 Subject: [PATCH] Update ci yml --- .github/workflows/generate-oh-sdk-cache.yml | 12 +----------- .github/workflows/native-compile-platforms.yml | 10 ++++++---- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/.github/workflows/generate-oh-sdk-cache.yml b/.github/workflows/generate-oh-sdk-cache.yml index dca1017a9e0..2761f5852ec 100644 --- a/.github/workflows/generate-oh-sdk-cache.yml +++ b/.github/workflows/generate-oh-sdk-cache.yml @@ -2,12 +2,6 @@ name: Generate OH SDK Cache on: workflow_dispatch: - inputs: - oh_sdk_version: - description: 'Openharmony SDK version' - type: string - default: '9' - required: true jobs: generate_oh_sdk_cache: @@ -34,15 +28,11 @@ jobs: id: cache-oh-sdk uses: actions/cache@v4 env: - cache-name: cache-oh-sdk-${{ github.event.inputs.oh_sdk_version }} + cache-name: cache-oh-sdk-12 with: path: ${{ steps.oh-sdk-cache-dir-path.outputs.dir }} key: ${{ runner.os }}-build-${{ env.cache-name }} - - name: Add package.json - run: | - echo "{}" > package.json - echo "{\"name\": \"tests\",\"lockfileVersion\": 3,\"requires\": true,\"packages\": {}}" > package-lock.json - uses: actions/setup-node@v4 with: node-version: 14 diff --git a/.github/workflows/native-compile-platforms.yml b/.github/workflows/native-compile-platforms.yml index df96e21780c..fe15d60dcb4 100644 --- a/.github/workflows/native-compile-platforms.yml +++ b/.github/workflows/native-compile-platforms.yml @@ -263,10 +263,10 @@ jobs: path: ${{ steps.oh-sdk-cache-dir-path.outputs.dir }} key: ${{ runner.os }}-build-${{ env.cache-name }} - - name: Add package.json - run: | - echo "{}" > package.json - echo "{\"name\": \"tests\",\"lockfileVersion\": 3,\"requires\": true,\"packages\": {}}" > package-lock.json + # - name: Add package.json + # run: | + # echo "{}" > package.json + # echo "{\"name\": \"tests\",\"lockfileVersion\": 3,\"requires\": true,\"packages\": {}}" > package-lock.json - uses: actions/setup-node@v4 with: node-version: 14 @@ -344,6 +344,8 @@ jobs: echo "=============== Do not import game.ts for cocos_worker.ts ===============" sed -i '/<% if(!useV8) { %>/,/<% } %>/d' ./entry/src/main/ets/workers/cocos_worker.ts + sed -i '/<% if(useV8) { %>/,/<% } %>/d' ./entry/src/main/ets/workers/cocos_worker.ts + ls -l ./entry/src/main/ets/workers/cocos_worker.ts echo "=============== EXECUTE hvigorw ===============" hvigorw clean -i