From 5860394458b8c7694508f257904f85492f8b1894 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=A6n=20Hansen?= Date: Tue, 16 Jul 2024 12:51:31 +0200 Subject: [PATCH 1/2] Adding "realm:lint-android" npm script --- .../environments/react-native-test-app/package.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/integration-tests/environments/react-native-test-app/package.json b/integration-tests/environments/react-native-test-app/package.json index a788bfbd5c..20c4ddb99c 100644 --- a/integration-tests/environments/react-native-test-app/package.json +++ b/integration-tests/environments/react-native-test-app/package.json @@ -7,13 +7,14 @@ "build:android": "react-native bundle --entry-file index.js --platform android --dev true --bundle-output dist/main.android.jsbundle --assets-dest dist/res", "build:ios": "react-native bundle --entry-file index.js --platform ios --dev true --bundle-output dist/main.ios.jsbundle --assets-dest dist", "ios": "react-native run-ios", - "lint": "eslint .", + "lint": "eslint . && npm run realm:lint-android", "start": "react-native start", "test:android": "wireit", "test:ios": "wireit", "pod-install": "wireit", "realm:build-android:debug": "wireit", "realm:build-android:release": "wireit", + "realm:lint-android": "wireit", "metro": "react-native start --reset-cache", "runner": "node harness/runner.js", "logcat": "adb logcat -v color --pid=$(adb shell pidof -s com.microsoft.reacttestapp)" @@ -127,6 +128,12 @@ "dependencies": [ "../../../packages/realm/:bindgen:jsi" ] + }, + "realm:lint-android": { + "command": "cd android && ./gradlew realm:lint", + "dependencies": [ + "../../../packages/realm/:bindgen:jsi" + ] } }, "dependencies": { From 69fee2ad81e0452b652663d65025c94e6c077236 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=A6n=20Hansen?= Date: Tue, 16 Jul 2024 13:43:14 +0200 Subject: [PATCH 2/2] Adding Java to the lint workflow --- .github/workflows/pr-linting.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/pr-linting.yml b/.github/workflows/pr-linting.yml index f47d797942..751fd49fe6 100644 --- a/.github/workflows/pr-linting.yml +++ b/.github/workflows/pr-linting.yml @@ -16,6 +16,12 @@ jobs: - uses: actions/setup-node@v4 with: node-version: 20 + # Java is needed to run the "./gradlew lint" command in the test app + - name: Setup Java + uses: actions/setup-java@v3 + with: + distribution: 'zulu' + java-version: 17 - name: Install root package dependencies run: npm ci - name: Check types