chore: config terra to 4.1.1.28

AgoraIO-Extensions · Mar 14, 2024 · 664f9d6 · 664f9d6
1 parent d47f500
commit 664f9d6
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 3,804 deletions.
diff --git a/.github/workflows/terra.yml b/.github/workflows/terra.yml
@@ -23,6 +23,7 @@ jobs:
           generate-code: true
           generate-comment: true
           generate-code-command: |
+            sh generate-prepare.sh
             sh generate-code.sh
           generate-comment-command: |
             sh generate-comment.sh

diff --git a/package.json b/package.json
@@ -136,7 +136,7 @@
     "yuv-canvas": "1.2.6"
   },
   "agora_electron": {
-    "iris_sdk_win": "https://download.agora.io/sdk/release/iris_4.1.1.24-build.1_DCG_Windows_Video_20240108_0107.zip",
-    "iris_sdk_mac": "https://download.agora.io/sdk/release/iris_4.1.1.24-build.1_DCG_Mac_Video_20240108_0107.zip"
+    "iris_sdk_win": "https://download.agora.io/sdk/release/iris_4.1.1.28-build.1_DCG_Windows_Video_20240314_0614.zip",
+    "iris_sdk_mac": "https://download.agora.io/sdk/release/iris_4.1.1.28-build.1_DCG_Mac_Video_20240314_0614.zip"
   }
 }
diff --git a/scripts/terra/.yarnrc.yml b/scripts/terra/.yarnrc.yml
@@ -1,3 +1,4 @@
 nodeLinker: node-modules
+enableImmutableInstalls: false
 
 yarnPath: .yarn/releases/yarn-4.0.1.cjs
diff --git a/scripts/terra/code_config.yaml b/scripts/terra/code_config.yaml
@@ -3,20 +3,20 @@ parsers:
     package: '@agoraio-extensions/terra-legacy-cxx-parser'
     args:
       includeHeaderDirs:
-        - '@agoraio-extensions/terra_shared_configs:headers/rtc_4.1.1.24/include'
+        - '@agoraio-extensions/terra_shared_configs:headers/rtc_4.1.1.28/include'
       parseFiles:
         include:
-          - '@agoraio-extensions/terra_shared_configs:headers/rtc_4.1.1.24/include/*.h'
+          - '@agoraio-extensions/terra_shared_configs:headers/rtc_4.1.1.28/include/*.h'
         exclude:
-          - '@agoraio-extensions/terra_shared_configs:headers/rtc_4.1.1.24/include/AgoraRefPtr.h'
-          - '@agoraio-extensions/terra_shared_configs:headers/rtc_4.1.1.24/include/time_utils.h'
-          - '@agoraio-extensions/terra_shared_configs:headers/rtc_4.1.1.24/include/AgoraOptional.h'
-          - '@agoraio-extensions/terra_shared_configs:headers/rtc_4.1.1.24/include/AgoraRefPtr.h'
-          - '@agoraio-extensions/terra_shared_configs:headers/rtc_4.1.1.24/include/IAgoraH265Transcoder.h'
-          - '@agoraio-extensions/terra_shared_configs:headers/rtc_4.1.1.24/include/IAgoraMediaComponentFactory.h'
-          - '@agoraio-extensions/terra_shared_configs:headers/rtc_4.1.1.24/include/IAgoraParameter.h'
+          - '@agoraio-extensions/terra_shared_configs:headers/rtc_4.1.1.28/include/AgoraRefPtr.h'
+          - '@agoraio-extensions/terra_shared_configs:headers/rtc_4.1.1.28/include/time_utils.h'
+          - '@agoraio-extensions/terra_shared_configs:headers/rtc_4.1.1.28/include/AgoraOptional.h'
+          - '@agoraio-extensions/terra_shared_configs:headers/rtc_4.1.1.28/include/AgoraRefPtr.h'
+          - '@agoraio-extensions/terra_shared_configs:headers/rtc_4.1.1.28/include/IAgoraH265Transcoder.h'
+          - '@agoraio-extensions/terra_shared_configs:headers/rtc_4.1.1.28/include/IAgoraMediaComponentFactory.h'
+          - '@agoraio-extensions/terra_shared_configs:headers/rtc_4.1.1.28/include/IAgoraParameter.h'
       customHeaders:
-        - '@agoraio-extensions/terra_shared_configs:headers/rtc_4.1.1.24/custom_headers/*.h'
+        - '@agoraio-extensions/terra_shared_configs:headers/rtc_4.1.1.28/custom_headers/*.h'
       language: ts
       definesMacros:
         - __ELECTRON__

diff --git a/scripts/terra/generate-prepare.sh b/scripts/terra/generate-prepare.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -e
+set -x
+
+# treated as a completely separate project (not even a workspace), create an empty yarn.lock file in it.
+touch yarn.lock
+rm -rf node_modules
+rm -rf .terra
+yarn install
+rm yarn.lock
diff --git a/scripts/terra/package.json b/scripts/terra/package.json
@@ -12,10 +12,10 @@
     "@types/node": "^20.6.0"
   },
   "dependencies": {
-    "@agoraio-extensions/terra": "[email protected]:AgoraIO-Extensions/terra.git#commit=5dd8149d5ab9f3b472b7715916b6217f9745f066&workspace=terra",
-    "@agoraio-extensions/terra-core": "[email protected]:AgoraIO-Extensions/terra.git#commit=5dd8149d5ab9f3b472b7715916b6217f9745f066&workspace=terra-core",
-    "@agoraio-extensions/terra-legacy-cxx-parser": "[email protected]:AgoraIO-Extensions/terra-legacy-cxx-parser.git#commit=5455afd2c5e29013d9a3cb8d06150c162450a5ed",
-    "@agoraio-extensions/terra_shared_configs": "[email protected]:AgoraIO-Extensions/terra_shared_configs.git#commit=122adde0def096fbd409c394774f1ecbe4d8b215",
+    "@agoraio-extensions/cxx-parser": "[email protected]:AgoraIO-Extensions/terra.git#head=main&workspace=cxx-parser",
+    "@agoraio-extensions/terra": "[email protected]:AgoraIO-Extensions/terra.git#head=main&workspace=terra",
+    "@agoraio-extensions/terra-core": "[email protected]:AgoraIO-Extensions/terra.git#head=main&workspace=terra-core",
+    "@agoraio-extensions/terra_shared_configs": "[email protected]:AgoraIO-Extensions/terra_shared_configs.git#head=main",
     "ts-node": "^10.9.1",
     "typescript": "^5.1.6"
   },