Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ktlint.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"owner": "ktlint",
"pattern": [
{
"regexp": "(.*?):(\\d+):(\\d+): (.*?) \\(([-\\w]+)\\)$",
"regexp": "^(.*?):(\\d+):(\\d+): (.*?) \\(([\\w:-]+)\\)$",
"file": 1,
"line": 2,
"column": 3,
Expand Down
19 changes: 0 additions & 19 deletions .github/minitest.json

This file was deleted.

17 changes: 0 additions & 17 deletions .github/rubocop.json

This file was deleted.

14 changes: 4 additions & 10 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,8 @@ jobs:
- name: CocoaPods
if: ${{ runner.os == 'macOS' }}
run: |
echo "::add-matcher::.github/rubocop.json"
yarn lint:rb
echo "::remove-matcher owner=rubocop::"
echo "::add-matcher::.github/minitest.json"
yarn test:rb
echo "::remove-matcher owner=minitest::"
working-directory: packages/app
node --run lint:rb -- --format github
yarn workspace react-native-test-app test:rb
- name: Populate Gradle cache
uses: ./.github/actions/gradle
with:
Expand Down Expand Up @@ -131,14 +126,13 @@ jobs:
run: |
brew install ktlint
echo "::add-matcher::.github/ktlint.json"
yarn lint:kt
node --run lint:kt
echo "::remove-matcher owner=ktlint::"
working-directory: packages/app
- name: SwiftFormat
if: ${{ github.event_name == 'pull_request' && runner.os == 'macOS' }}
run: |
echo "::add-matcher::.github/swiftformat.json"
yarn format:swift --lint
node --run format:swift -- --lint
echo "::remove-matcher owner=swiftformat::"
working-directory: packages/app
- name: SwiftLint
Expand Down
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,11 @@
"scripts": {
"format": "nx run-many --target format:c,format:js,format:swift",
"format:js": "oxfmt '**/README.md' '**/package.json' '*.{cjs,cts,js,mjs,mts,ts,tsx,yml}' '.github/**/*.json' 'CONTRIBUTING.md' 'nx.json' '!packages/app/package.json'",
"lint": "nx run-many --target lint:js,lint:kt,lint:rb,lint:swift",
"lint": "nx run-many --target lint:js,lint:swift && nx run-many --target lint:kt,lint:rb --projects @microsoft/root",
"lint:commit": "git log --format='%s' origin/trunk..HEAD | tail -1 | npx @rnx-kit/commitlint-lite@2.0.0",
"lint:js": "oxlint $(git ls-files 'scripts/*.[cm][jt]s' 'scripts/*.[jt]s')",
"lint:kt": "ktlint --relative 'packages/app/android/app/src/**/*.kt'",
"lint:rb": "bundle exec rubocop packages/app",
"release-notes": "node scripts/release-notes.ts",
"rnx-align-deps": "rnx-align-deps --exclude-packages @microsoft/root,@rnx-kit/react-native-template-web,react-native-test-app",
"show-affected": "node scripts/affected.ts"
Expand Down
4 changes: 2 additions & 2 deletions packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@
"generate:docs": "node scripts/internal/generate-manifest-docs.mts",
"generate:schema": "node scripts/internal/generate-schema.mts",
"lint:js": "oxlint -c ../../oxlint.config.ts $(git ls-files '*.[cm][jt]s' '*.[jt]s' '*.tsx' ':!:*.config.js') && tsc && tsc --project tsconfig.cjs.json",
"lint:kt": "ktlint --relative 'android/app/src/**/*.kt'",
"lint:rb": "bundle exec rubocop",
"lint:kt": "yarn workspace @microsoft/root lint:kt",
"lint:rb": "yarn workspace @microsoft/root lint:rb",
"lint:swift": "swiftlint",
"prepack": "node scripts/internal/pack.mts pre",
"postpack": "node scripts/internal/pack.mts post",
Expand Down
Loading