Skip to content

Commit

Permalink
Merge branch 'main' into update-peer-next
Browse files Browse the repository at this point in the history
  • Loading branch information
jcesarmobile authored Nov 13, 2023
2 parents 574be25 + c5f7fbb commit 6448f50
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 2 deletions.
32 changes: 32 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,39 @@ jobs:
with:
files: ${{ steps.catjson.outputs.FILES_JSON }}

lint-scripts:
runs-on: macos-13
timeout-minutes: 30
needs:
- setup
steps:
- uses: actions/setup-node@v3
with:
node-version: 18.x
- name: NPM ^9.5.0
run: npm i -g npm@^9.5.0 --registry=https://registry.npmjs.org
- uses: actions/checkout@v3
- name: Restore Dependency Cache
id: cache-modules
uses: actions/cache@v3
with:
path: |
node_modules
*/node_modules
key: ${{ runner.os }}-dependency-caching-${{ hashFiles('package.json', '*/package.json') }}
- run: npm install
- run: npm run lint

lint:
runs-on: macos-13
timeout-minutes: 30
needs:
- setup
- lint-scripts
if: needs.setup.outputs.plugins != '[]'
strategy:
matrix:
plugin: ${{ fromJson(needs.setup.outputs.plugins) }}
steps:
- uses: actions/setup-node@v3
with:
Expand All @@ -72,6 +100,7 @@ jobs:
key: ${{ runner.os }}-dependency-caching-${{ hashFiles('package.json', '*/package.json') }}
- run: npm install
- run: npm run lint
working-directory: ${{ matrix.plugin }}

verify-ios:
runs-on: macos-13
Expand All @@ -80,6 +109,7 @@ jobs:
needs:
- setup
- lint
- lint-scripts
strategy:
matrix:
xcode:
Expand Down Expand Up @@ -112,6 +142,7 @@ jobs:
needs:
- setup
- lint
- lint-scripts
strategy:
matrix:
plugin: ${{ fromJson(needs.setup.outputs.plugins) }}
Expand Down Expand Up @@ -147,6 +178,7 @@ jobs:
needs:
- setup
- lint
- lint-scripts
strategy:
matrix:
plugin: ${{ fromJson(needs.setup.outputs.plugins) }}
Expand Down
4 changes: 3 additions & 1 deletion keyboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
"android/src/main/",
"android/build.gradle",
"dist/",
"ios/Plugin/",
"ios/Sources",
"ios/Tests",
"Package.swift",
"CapacitorKeyboard.podspec"
],
"author": "Ionic <[email protected]>",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"scripts": {
"build": "lerna run build",
"watch": "lerna run --parallel --stream watch",
"lint": "npm run scripts:prettier -- --check && lerna run lint",
"lint": "npm run scripts:prettier -- --check",
"fmt": "npm run scripts:prettier -- --write && lerna run fmt",
"scripts:prettier": "npx prettier \"scripts/**/*.mjs\"",
"apply-patches": "node ./scripts/apply-patches.mjs",
Expand Down

0 comments on commit 6448f50

Please sign in to comment.