You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by dp...@apache.org on 2025/10/14 07:15:29 UTC

(cordova-ios) branch master updated: ci: Try to improve CI reliability (#1570)

This is an automated email from the ASF dual-hosted git repository.

dpogue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-ios.git


The following commit(s) were added to refs/heads/master by this push:
     new 6d6812ac ci: Try to improve CI reliability (#1570)
6d6812ac is described below

commit 6d6812ac9fb3e85fb10a97b1074ee8903449c13e
Author: Darryl Pogue <da...@dpogue.ca>
AuthorDate: Tue Oct 14 00:15:24 2025 -0700

    ci: Try to improve CI reliability (#1570)
    
    * ci: Try to improve CI reliability
    
    This should help by only running macOS 26/Xcode 26 with Node 24 rather
    than for all 3 Node versions.
    
    * ci: Update action steps to latest versions
    
    * ci: Add a 40 minute timeout to CI test runs
    
    * ci: Test pre-booting the simulator for testing
    
    * ci: Fail fast if the simulator doesn't boot in 300 seconds
---
 .github/workflows/ci.yml | 30 +++++++++++++++++++++---------
 package.json             |  3 +--
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8252de55..38f93b5e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,13 +36,19 @@ jobs:
     strategy:
       matrix:
         node-version: [20.x, 22.x, 24.x]
-        os: [macos-15, macos-26]
+        os: [macos-15]
+        include:
+          - os: macos-26
+            node-version: 24.x
+
+    env:
+      CDV_IOS_SIM: iPhone 16e
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version: ${{ matrix.node-version }}
 
@@ -52,7 +58,7 @@ jobs:
           npm --version
           xcodebuild -version
 
-      - uses: github/codeql-action/init@v3
+      - uses: github/codeql-action/init@v4
         with:
           languages: javascript
           queries: security-and-quality
@@ -62,14 +68,19 @@ jobs:
               - node_modules
               - templates/project/www/cordova.js
 
+      - name: Boot iOS simulator
+        run: |
+          xcrun simctl boot "$CDV_IOS_SIM"
+
       - name: npm install and test
+        timeout-minutes: 40
         run: |
           npm i -g ios-deploy
           npm cit
         env:
           CI: true
 
-      - uses: github/codeql-action/analyze@v3
+      - uses: github/codeql-action/analyze@v4
 
       # v4.6.0
       - uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238
@@ -88,10 +99,10 @@ jobs:
         os: [ubuntu-latest, windows-latest]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version: ${{ matrix.node-version }}
 
@@ -100,7 +111,7 @@ jobs:
           node --version
           npm --version
 
-      - uses: github/codeql-action/init@v3
+      - uses: github/codeql-action/init@v4
         with:
           languages: javascript
           queries: security-and-quality
@@ -111,6 +122,7 @@ jobs:
               - templates/project/www/cordova.js
 
       - name: npm install and test
+        timeout-minutes: 40
         run: |
           npm ci
           npm run lint
@@ -118,7 +130,7 @@ jobs:
         env:
           CI: true
 
-      - uses: github/codeql-action/analyze@v3
+      - uses: github/codeql-action/analyze@v4
 
       # v4.6.0
       - uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238
diff --git a/package.json b/package.json
index 730631e2..67f1a5b1 100644
--- a/package.json
+++ b/package.json
@@ -19,8 +19,7 @@
     "test": "npm run coverage && npm run objc-tests",
     "coverage": "c8 jasmine --config=tests/spec/coverage.json",
     "e2e-tests": "jasmine tests/spec/create.spec.js",
-    "objc-tests": "xcodebuild -quiet test -workspace tests/cordova-ios.xcworkspace -scheme CordovaTestApp -destination \"platform=iOS Simulator,name=${CDV_IOS_SIM:-iPhone 16e}\" -derivedDataPath \"`mktemp -d 2>/dev/null || mktemp -d -t 'cordova-ios'`\"",
-    "preobjc-tests": "killall Simulator || true",
+    "objc-tests": "xcodebuild -quiet test -workspace tests/cordova-ios.xcworkspace -scheme CordovaTestApp -destination \"platform=iOS Simulator,name=${CDV_IOS_SIM:-iPhone 16e}\" -destination-timeout 300 -derivedDataPath \"`mktemp -d 2>/dev/null || mktemp -d -t 'cordova-ios'`\"",
     "unit-tests": "jasmine --config=tests/spec/unit.json",
     "lint": "eslint ."
   },


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org