This is an automated email from the ASF dual-hosted git repository.
erisu 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 4994749e chore(ci): update & clean workflow (#1673)
4994749e is described below
commit 4994749e553d57cfbe967f55a4699fcd025cf70e
Author: エリス <[email protected]>
AuthorDate: Wed Jul 1 13:08:33 2026 +0900
chore(ci): update & clean workflow (#1673)
* chore(workflow): update actions & cleanup
* Use latest actions
* Move version number comment's inline
* Add node-26 to test matrix
* Set checkout persist-credentials to false
* chore: remove .ratignore, ci can use .rat-excludes
* chore(workflow): drop macos-15 & extract codeql
* chore: update default simulator for 'npm run test:xcode' to iPhone 17
---
.github/workflows/ci.yml | 89 ++++++++++++++++++++-----------------
.github/workflows/docs.yml | 13 +++---
.github/workflows/draft-release.yml | 3 +-
.github/workflows/release-audit.yml | 10 ++---
.rat-excludes | 2 -
.ratignore | 26 -----------
package.json | 2 +-
7 files changed, 64 insertions(+), 81 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a8e7839e..98510c10 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,27 +25,53 @@ on:
branches:
- '*'
-permissions:
- contents: read
- security-events: write
-
jobs:
+ codeql:
+ name: CodeQL Analysis
+ runs-on: ubuntu-latest
+
+ permissions:
+ contents: read
+ security-events: write
+
+ steps:
+ - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 #
v7.0.0
+ with:
+ persist-credentials: false
+ fetch-depth: 1
+
+ - uses:
github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
+ with:
+ languages: javascript
+ queries: security-and-quality
+ config: |
+ paths-ignore:
+ - coverage
+ - node_modules
+ - templates/project/www/cordova.js
+
+ - uses:
github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
+
darwin:
name: NodeJS ${{ matrix.node-version }} on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
+
+ permissions:
+ contents: read
+
strategy:
matrix:
- node-version: [20.x, 22.x, 24.x]
- os: [macos-15]
- include:
- - os: macos-26
- node-version: 24.x
+ node-version: [20.x, 22.x, 24.x, 26.x]
+ os: [macos-26]
env:
- CDV_IOS_SIM: ${{ matrix.os == 'macos-26' && 'iPhone 17' || 'iPhone 16e'
}}
+ CDV_IOS_SIM: iPhone 17
steps:
- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #
v6.0.2
+ - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 #
v7.0.0
+ with:
+ persist-credentials: false
+ fetch-depth: 1
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e #
v6.4.0
@@ -58,16 +84,6 @@ jobs:
npm --version
xcodebuild -version
- - uses:
github/codeql-action/init@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5
- with:
- languages: javascript
- queries: security-and-quality
- config: |
- paths-ignore:
- - coverage
- - node_modules
- - templates/project/www/cordova.js
-
- name: Boot iOS simulator
run: |
xcrun simctl boot "$CDV_IOS_SIM"
@@ -80,10 +96,7 @@ jobs:
env:
CI: true
- - uses:
github/codeql-action/analyze@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5
-
- # v4.6.0
- - uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238
+ - uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f
# v7.0.0
if: success()
with:
name: ${{ runner.os }} node.js ${{ matrix.node-version }} (darwin)
@@ -93,13 +106,20 @@ jobs:
non-darwin:
name: NodeJS ${{ matrix.node-version }} on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
+
+ permissions:
+ contents: read
+
strategy:
matrix:
- node-version: [20.x, 22.x, 24.x]
+ node-version: [20.x, 22.x, 24.x, 26.x]
os: [ubuntu-latest, windows-latest]
steps:
- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #
v6.0.2
+ - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 #
v7.0.0
+ with:
+ persist-credentials: false
+ fetch-depth: 1
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e #
v6.4.0
@@ -111,16 +131,6 @@ jobs:
node --version
npm --version
- - uses:
github/codeql-action/init@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5
- with:
- languages: javascript
- queries: security-and-quality
- config: |
- paths-ignore:
- - coverage
- - node_modules
- - templates/project/www/cordova.js
-
- name: npm install and test
timeout-minutes: 40
run: |
@@ -130,10 +140,7 @@ jobs:
env:
CI: true
- - uses:
github/codeql-action/analyze@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5
-
- # v4.6.0
- - uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238
+ - uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f
# v7.0.0
if: success()
with:
name: ${{ runner.os }} node.js ${{ matrix.node-version }}
(non-darwin)
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 73f92631..dea195a1 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -34,16 +34,19 @@ concurrency:
jobs:
deploy:
- runs-on: macos-15
+ runs-on: macos-26
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
steps:
- - uses: actions/checkout@v6
+ - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 #
v7.0.0
+ with:
+ persist-credentials: false
+ fetch-depth: 1
- id: pages
- uses: actions/configure-pages@v5
+ uses: actions/configure-pages@45bfe0192ca1faeb007ade9deae92b16b8254a0d
# v6.0.0
- name: Build DocC
working-directory: ./CordovaLib
@@ -56,9 +59,9 @@ jobs:
echo "<script>window.location.href +=
\"/documentation/cordova\"</script>" > docs/index.html;
- - uses: actions/upload-pages-artifact@v4
+ - uses:
actions/upload-pages-artifact@fc324d3547104276b827a68afc52ff2a11cc49c9 # v5.0.0
with:
path: 'CordovaLib/docs'
- id: deployment
- uses: actions/deploy-pages@v4
+ uses: actions/deploy-pages@cd2ce8fcbc39b97be8ca5fce6e763baed58fa128 #
v5.0.0
diff --git a/.github/workflows/draft-release.yml
b/.github/workflows/draft-release.yml
index a04a9bda..9f11b553 100644
--- a/.github/workflows/draft-release.yml
+++ b/.github/workflows/draft-release.yml
@@ -31,10 +31,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #
v6.0.2
+ - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 #
v7.0.0
with:
persist-credentials: false
fetch-depth: 1
+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e #
v6.4.0
with:
node-version: 24
diff --git a/.github/workflows/release-audit.yml
b/.github/workflows/release-audit.yml
index d3d7067c..3156baa9 100644
--- a/.github/workflows/release-audit.yml
+++ b/.github/workflows/release-audit.yml
@@ -34,13 +34,13 @@ jobs:
runs-on: ubuntu-latest
steps:
# Checkout project
- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #
v6.0.2
+ - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 #
v7.0.0
with:
persist-credentials: false
fetch-depth: 1
- # Check license headers (v2.0.0)
- - uses: erisu/apache-rat-action@46fb01ce7d8f76bdcd7ab10e7af46e1ea95ca01c
+ # Check license headers
+ - uses: erisu/apache-rat-action@30c94d10ed21e6f6fd5590dc5c158f58cae7a0dd
# v3.0.0
# Setup environment with node
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e #
v6.4.0
@@ -51,8 +51,8 @@ jobs:
- name: npm install packages
run: npm ci
- # Check node package licenses (v2.0.1)
- - uses:
erisu/license-checker-action@99cffa11264fe545fd0baa6c13bca5a00ae608f2
+ # Check node package licenses
+ - uses:
erisu/license-checker-action@04511f4c052b5773f11e1c65b42cda88235c62ae # v2.1.0
with:
license-config: 'licence_checker.yml'
include-asf-category-a: true
diff --git a/.rat-excludes b/.rat-excludes
index 2861c9ea..c3bfe973 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -15,8 +15,6 @@
# specific language governing permissions and limitations
# under the License.
-# This file used by ATR
-
.git/
coverage/
node_modules/
diff --git a/.ratignore b/.ratignore
deleted file mode 100644
index 216cfd83..00000000
--- a/.ratignore
+++ /dev/null
@@ -1,26 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# This file used by release audit workflow
-
-.git/
-coverage/
-node_modules/
-
-# Files that do not support comments
-**/*.txt
-**/*.xctestplan
diff --git a/package.json b/package.json
index a676a411..e6ce51bb 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
"pretest": "npm run lint",
"test": "npm run cover && npm run test:xcode",
"test:unit": "jasmine --config=tests/spec/unit.json",
- "test:xcode": "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'`\"",
+ "test:xcode": "xcodebuild -quiet test -workspace
tests/cordova-ios.xcworkspace -scheme CordovaTestApp -destination
\"platform=iOS Simulator,name=${CDV_IOS_SIM:-iPhone 17}\" -destination-timeout
300 -derivedDataPath \"`mktemp -d 2>/dev/null || mktemp -d -t 'cordova-ios'`\"",
"cover": "c8 npm run test:unit",
"lint": "eslint .",
"lint:fix": "npm run lint -- --fix"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
