From c6365785af58b9362b5674b8f120f5608464ffd0 Mon Sep 17 00:00:00 2001 From: gxz Date: Tue, 28 Nov 2023 16:27:39 +0800 Subject: [PATCH] chore: ci --- .github/workflows/generate-code.yml | 4 +--- scripts/terra/package.json | 6 +++--- scripts/terra/terra-types.sh | 1 - scripts/terra/yarn.lock | 29 ++++++++++++++++++++++++----- 4 files changed, 28 insertions(+), 12 deletions(-) diff --git a/.github/workflows/generate-code.yml b/.github/workflows/generate-code.yml index 1a06fbd..a3fc246 100644 --- a/.github/workflows/generate-code.yml +++ b/.github/workflows/generate-code.yml @@ -29,11 +29,9 @@ jobs: generate-code: true generate-comment: false generate-code-command: | + echo ${LLVM_DOWNLOAD_URL} sh terra-types.sh sh terra-binding.sh - env: - LLVM_DOWNLOAD_URL: | - https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/clang+llvm-15.0.6-x86_64-linux-gnu-ubuntu-18.04.tar.xz - name: Create PR uses: AgoraIO-Extensions/actions/.github/actions/pr@main diff --git a/scripts/terra/package.json b/scripts/terra/package.json index 31774ad..a936b5c 100644 --- a/scripts/terra/package.json +++ b/scripts/terra/package.json @@ -12,9 +12,9 @@ "terra-binding": "sh terra-binding.sh" }, "dependencies": { - "@agoraio-extensions/cxx-parser": "git@github.com:AgoraIO-Extensions/terra.git#head=main&workspace=cxx-parser", - "@agoraio-extensions/terra": "git@github.com:AgoraIO-Extensions/terra.git#head=main&workspace=terra", - "@agoraio-extensions/terra-core": "git@github.com:AgoraIO-Extensions/terra.git#head=main&workspace=terra-core", + "@agoraio-extensions/cxx-parser": "git@github.com:AgoraIO-Extensions/terra.git#head=dev/ci-test&workspace=cxx-parser", + "@agoraio-extensions/terra": "git@github.com:AgoraIO-Extensions/terra.git#head=dev/ci-test&workspace=terra", + "@agoraio-extensions/terra-core": "git@github.com:AgoraIO-Extensions/terra.git#head=dev/ci-test&workspace=terra-core", "@agoraio-extensions/terra_shared_configs": "git@github.com:AgoraIO-Extensions/terra_shared_configs.git#head=main", "@types/js-yaml": "^4.0.8", "@types/node": "^18.17.9", diff --git a/scripts/terra/terra-types.sh b/scripts/terra/terra-types.sh index ef80b3f..6a3f474 100644 --- a/scripts/terra/terra-types.sh +++ b/scripts/terra/terra-types.sh @@ -3,7 +3,6 @@ set -e set -x MY_PATH=$(realpath $(dirname "$0")) OUTPUT_DIR=$(realpath ${MY_PATH}/../../packages/@iris/rtc/generate) -echo ${LLVM_DOWNLOAD_URL} find ${OUTPUT_DIR} -type f -delete # packages/@iris/rtc/generate diff --git a/scripts/terra/yarn.lock b/scripts/terra/yarn.lock index f6ec283..5bc9ba6 100644 --- a/scripts/terra/yarn.lock +++ b/scripts/terra/yarn.lock @@ -5,6 +5,18 @@ __metadata: version: 8 cacheKey: 10c0 +"@agoraio-extensions/cxx-parser@git@github.com:AgoraIO-Extensions/terra.git#head=dev/ci-test&workspace=cxx-parser": + version: 0.1.9 + resolution: "@agoraio-extensions/cxx-parser@git@github.com:AgoraIO-Extensions/terra.git#workspace=cxx-parser&commit=f5f19611ea6c4206bc2d1e1cca1218aa7c59a4e0" + dependencies: + glob: "npm:^10.3.4" + yaml: "npm:^2.1.3" + peerDependencies: + "@agoraio-extensions/terra-core": "*" + checksum: dc7ae569e5da94068c20c614f67b4980f4506f3dd5735cdb3c2bb8c71de3c77fb2f0f51ea6a9bf257fcc19bb7ff0c1fc655c1556587b43e49af83335aff0d751 + languageName: node + linkType: hard + "@agoraio-extensions/cxx-parser@git@github.com:AgoraIO-Extensions/terra.git#head=main&workspace=cxx-parser": version: 0.1.9 resolution: "@agoraio-extensions/cxx-parser@git@github.com:AgoraIO-Extensions/terra.git#workspace=cxx-parser&commit=b6d59859e4a771a417f177ec0c6775aea4a454e6" @@ -17,6 +29,13 @@ __metadata: languageName: node linkType: hard +"@agoraio-extensions/terra-core@git@github.com:AgoraIO-Extensions/terra.git#head=dev/ci-test&workspace=terra-core": + version: 0.1.5 + resolution: "@agoraio-extensions/terra-core@git@github.com:AgoraIO-Extensions/terra.git#workspace=terra-core&commit=f5f19611ea6c4206bc2d1e1cca1218aa7c59a4e0" + checksum: d7113225ab004b2ff09de3c3718262925dc335f5ffb8ac2800bb96bfb2ad67a307063a425bd14654356d804586a785efe3856462e1087472463eb233a6793e44 + languageName: node + linkType: hard + "@agoraio-extensions/terra-core@git@github.com:AgoraIO-Extensions/terra.git#head=main&workspace=terra-core": version: 0.1.5 resolution: "@agoraio-extensions/terra-core@git@github.com:AgoraIO-Extensions/terra.git#workspace=terra-core&commit=b6d59859e4a771a417f177ec0c6775aea4a454e6" @@ -24,9 +43,9 @@ __metadata: languageName: node linkType: hard -"@agoraio-extensions/terra@git@github.com:AgoraIO-Extensions/terra.git#head=main&workspace=terra": +"@agoraio-extensions/terra@git@github.com:AgoraIO-Extensions/terra.git#head=dev/ci-test&workspace=terra": version: 0.1.5 - resolution: "@agoraio-extensions/terra@git@github.com:AgoraIO-Extensions/terra.git#workspace=terra&commit=b6d59859e4a771a417f177ec0c6775aea4a454e6" + resolution: "@agoraio-extensions/terra@git@github.com:AgoraIO-Extensions/terra.git#workspace=terra&commit=f5f19611ea6c4206bc2d1e1cca1218aa7c59a4e0" dependencies: commander: "npm:^9.4.1" mustache: "npm:^4.2.0" @@ -479,9 +498,9 @@ __metadata: version: 0.0.0-use.local resolution: "terra-generate@workspace:." dependencies: - "@agoraio-extensions/cxx-parser": "git@github.com:AgoraIO-Extensions/terra.git#head=main&workspace=cxx-parser" - "@agoraio-extensions/terra": "git@github.com:AgoraIO-Extensions/terra.git#head=main&workspace=terra" - "@agoraio-extensions/terra-core": "git@github.com:AgoraIO-Extensions/terra.git#head=main&workspace=terra-core" + "@agoraio-extensions/cxx-parser": "git@github.com:AgoraIO-Extensions/terra.git#head=dev/ci-test&workspace=cxx-parser" + "@agoraio-extensions/terra": "git@github.com:AgoraIO-Extensions/terra.git#head=dev/ci-test&workspace=terra" + "@agoraio-extensions/terra-core": "git@github.com:AgoraIO-Extensions/terra.git#head=dev/ci-test&workspace=terra-core" "@agoraio-extensions/terra_shared_configs": "git@github.com:AgoraIO-Extensions/terra_shared_configs.git#head=main" "@types/js-yaml": "npm:^4.0.8" "@types/node": "npm:^18.17.9"