From 195c30d561c2536d0cf4d45385d259c32ca4cecb Mon Sep 17 00:00:00 2001 From: Arthas <15215604969@163.com> Date: Thu, 9 Nov 2023 12:54:29 +0800 Subject: [PATCH] chore: upgrade to iris 4.2.6-build.1 (#1102) * [AUTO] Update dependencies * chore: wip * chore: wip * chore: wip * chore: wip * chore: wip --------- Co-authored-by: LichKing-2234 --- .github/actions/setup/action.yml | 5 +++++ .github/workflows/build.yml | 11 +++++++++-- .github/workflows/terra.yml | 2 +- package.json | 8 ++++---- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index d677bc5c4..6fca2be0a 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -9,6 +9,11 @@ runs: with: node-version-file: .nvmrc + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: 3.11.5 + - name: Cache dependencies id: yarn-cache uses: actions/cache@v3 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ad7c92a9c..ec517cbb0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,5 +1,9 @@ name: Build API Example / Addon +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + on: workflow_call: inputs: @@ -20,9 +24,12 @@ on: - sdk release: types: [ published ] + pull_request: + types: [labeled, synchronize] jobs: build-jenkins: + if: ${{ inputs.type == 'sdk' }} runs-on: ubuntu-latest steps: - name: Build @@ -34,7 +41,7 @@ jobs: -d "{\"branch\": \"${{github.ref_name}}\", \"type\": \"${type}\"}" build-windows: - if: ${{ inputs.type == 'demo' }} + if: ${{ inputs.type == 'demo' || contains(github.event.pull_request.labels.*.name, 'ci:dep-update') }} strategy: matrix: arch: [ ia32, x64 ] @@ -72,7 +79,7 @@ jobs: build-mac: - if: ${{ inputs.type == 'demo' }} + if: ${{ inputs.type == 'demo' || contains(github.event.pull_request.labels.*.name, 'ci:dep-update') }} runs-on: macos-latest steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/terra.yml b/.github/workflows/terra.yml index 2e249f315..a6ee815be 100644 --- a/.github/workflows/terra.yml +++ b/.github/workflows/terra.yml @@ -38,7 +38,7 @@ jobs: - name: Generate ts interface run: | - yarn ts_interface_builder + yarn build:ts-interface - name: Generate comments uses: ./.github/actions/doc diff --git a/package.json b/package.json index b04accb3d..0938b295e 100644 --- a/package.json +++ b/package.json @@ -36,8 +36,8 @@ "install": "cross-env-shell gulp NPM_Install \\\"--INIT_CWD=$INIT_CWD\\\"", "release": "release-it", "example": "yarn --cwd example", - "bootstrap": "yarn config set agora-electron-sdk-pre-built 0 && yarn example && yarn install && yarn patch-package && yarn ts_interface_builder && yarn totalBuild && yarn link && yarn example link agora-electron-sdk && yarn config delete agora-electron-sdk-pre-built", - "ts_interface_builder": "ts-interface-builder ts/Private/*.ts -o ts/Private/ti/" + "bootstrap": "yarn config set agora-electron-sdk-pre-built 0 && yarn example && yarn install && yarn patch-package && yarn build:ts-interface && yarn totalBuild && yarn link && yarn example link agora-electron-sdk && yarn config delete agora-electron-sdk-pre-built", + "build:ts-interface": "ts-interface-builder ts/Private/*.ts -o ts/Private/ti/" }, "keywords": [ "electron", @@ -135,7 +135,7 @@ "yuv-canvas": "1.2.6" }, "agora_electron": { - "iris_sdk_win": "https://download.agora.io/sdk/release/iris_4.2.3-build.4_DCG_Windows_Video_20231019_0355.zip", - "iris_sdk_mac": "https://download.agora.io/sdk/release/iris_4.2.3-build.4_DCG_Mac_Video_20231019_0355.zip" + "iris_sdk_win": "https://download.agora.io/sdk/release/iris_4.2.6-build.1_DCG_Windows_Video_20231107_0433.zip", + "iris_sdk_mac": "https://download.agora.io/sdk/release/iris_4.2.6-build.1_DCG_Mac_Video_20231107_0433.zip" } }