Merge branch 'master' into update_18_3_0

tidev · May 14, 2024 · 9876ba2 · 9876ba2
2 parents 85f5427 + 352d1da
commit 9876ba2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -60,8 +60,8 @@ jobs:
     - run: npm i -g titanium
       name: Install Titanium CLI
 
-    - run: ti sdk install --branch master 12.1.0.v20221229113413 --force
-      name: Install SDK 12.1.0
+    - run: ti sdk install 12.2.1.GA
+      name: Install SDK 12.2.1
 
     - name: Set up Homebrew
       id: set-up-homebrew
@@ -85,7 +85,7 @@ jobs:
       with:
         api-level: 29
         target: playstore
-        script: npm run test:android -- --sdkVersion 12.1.0.v20221229113413
+        script: npm run test:android -- --sdkVersion 12.2.1.GA
         disable-animations: false # defaulting to true, the commands sent to emulator to do this sometimes run too quickly after boot and cause "adb: device offline" failures
 
     - name: Show summary of ccache configuration and statistics counters

diff --git a/.github/workflows/cla.yaml b/.github/workflows/cla.yaml
@@ -8,6 +8,6 @@ jobs:
     name: Verify contributor
 
     steps:
-    - uses: tidev/tidev-cla-action@v1
+    - uses: tidev/tidev-cla-action@v2
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}