Merge branch 'master' into dev

trustwallet · Oct 15, 2024 · 5d6f5b9 · 5d6f5b9
2 parents b1f4543 + 90ac739
commit 5d6f5b9
Show file tree

Hide file tree

Showing 17 changed files with 13 additions and 2,119 deletions.
diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml
@@ -18,7 +18,7 @@ jobs:
     - uses: actions/checkout@v3
     - name: Install system dependencies
       run: |
-        tools/install-sys-dependencies-linux ci
+        tools/install-sys-dependencies-linux
         tools/install-rust-dependencies
     - name: Cache internal dependencies
       id: internal_cache

diff --git a/.github/workflows/linux-sampleapp-ci.yml b/.github/workflows/linux-sampleapp-ci.yml
@@ -18,7 +18,7 @@ jobs:
     - uses: actions/checkout@v3
     - name: Install system dependencies
       run: |
-        tools/install-sys-dependencies-linux ci
+        tools/install-sys-dependencies-linux
         tools/install-rust-dependencies
     - name: Cache internal dependencies
       id: internal_cache
@@ -61,13 +61,6 @@ jobs:
       env:
         CC: /usr/bin/clang
         CXX: /usr/bin/clang++
-    - name: Build, run, and test devconsole.ts
-      run: |
-        cd samples/typescript/devconsole.ts
-        npm install
-        npm run build
-        echo -e "help() \n .exit" | npm run start
-        npm run test
     - name: Install Go
       env:
         GO_VERSION: 1.19

diff --git a/codegen/lib/code_generator.rb b/codegen/lib/code_generator.rb
@@ -136,7 +136,7 @@ def render_kotlin_jni_c
   def render(file, locals = {})
     @locals = locals
     path = File.expand_path(file, File.join(File.dirname(__FILE__), 'templates'))
-    template = ERB.new(File.read(path), nil, '-')
+    template = ERB.new(File.read(path), trim_mode: '-')
     template.result(binding)
   end
 

diff --git a/samples/typescript/devconsole.ts/.gitignore b/samples/typescript/devconsole.ts/.gitignore
diff --git a/samples/typescript/devconsole.ts/README.md b/samples/typescript/devconsole.ts/README.md