diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 97b8fa26c..084766cb8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,10 @@ on: jobs: lint: - runs-on: ubuntu-latest + strategy: + matrix: + platform: [ ubuntu, windows ] + runs-on: ${{ matrix.platform }}-latest steps: - name: Checkout uses: actions/checkout@v3 @@ -30,7 +33,10 @@ jobs: run: yarn typecheck test: - runs-on: ubuntu-latest + strategy: + matrix: + platform: [ ubuntu, windows ] + runs-on: ${{ matrix.platform }}-latest steps: - name: Checkout uses: actions/checkout@v3 @@ -42,7 +48,10 @@ jobs: run: yarn test --maxWorkers=2 --coverage build-library: - runs-on: ubuntu-latest + strategy: + matrix: + platform: [ ubuntu, windows ] + runs-on: ${{ matrix.platform }}-latest steps: - name: Checkout uses: actions/checkout@v3 diff --git a/.prettierrc b/.prettierrc index 670761058..cc18f267f 100644 --- a/.prettierrc +++ b/.prettierrc @@ -3,5 +3,6 @@ "singleQuote": true, "tabWidth": 2, "trailingComma": "es5", - "useTabs": false + "useTabs": false, + "endOfLine": "auto" } diff --git a/.yarnrc.yml b/.yarnrc.yml index 63f676010..d6817f4ff 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -1,3 +1,4 @@ +checksumBehavior: ignore nodeLinker: node-modules nmHoistingLimits: workspaces diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index 1062dd821..3aa32ff79 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -405,7 +405,7 @@ PODS: - React-jsinspector (0.72.5) - React-logger (0.72.5): - glog - - react-native-agora (4.2.3): + - react-native-agora (4.2.4): - AgoraIrisRTC_iOS (= 4.2.3-build.4) - AgoraRtcEngine_iOS (= 4.2.3) - RCT-Folly (= 2021.07.22.00) @@ -781,7 +781,7 @@ SPEC CHECKSUMS: React-jsiexecutor: ff70a72027dea5cc7d71cfcc6fad7f599f63987a React-jsinspector: aef73cbd43b70675f572214d10fa438c89bf11ba React-logger: 2e4aee3e11b3ec4fa6cfd8004610bbb3b8d6cca4 - react-native-agora: b59d2656b3c5b7a05dade5c86fa91ec7616ccf7d + react-native-agora: 38f534bb58937768025bd7055d8e296785db920f react-native-agora-rawdata: 097895cdccd8fcf3cff5dffe23372f5d3c89fd31 react-native-image-tools: 88218449791389bbf550a2c475a3b564c8233c8b react-native-safe-area-context: 7aa8e6d9d0f3100a820efb1a98af68aa747f9284 diff --git a/scripts/bootstrap.cjs b/scripts/bootstrap.cjs index 18f68a2d7..15bef5580 100644 --- a/scripts/bootstrap.cjs +++ b/scripts/bootstrap.cjs @@ -16,8 +16,6 @@ module.exports = { if ( child_process.spawnSync('yarn', ['patch-package'], { - cwd: project.cwd, - env: process.env, stdio: 'inherit', encoding: 'utf-8', shell: true, @@ -28,14 +26,12 @@ module.exports = { if ( child_process.spawnSync('yarn', ['example', 'patch-package'], { - cwd: project.cwd, - env: process.env, stdio: 'inherit', encoding: 'utf-8', shell: true, }).status !== 0 ) { - throw new Error('Failed to run patch-package'); + throw new Error('Failed to run patch-package at example'); } if ( @@ -43,8 +39,6 @@ module.exports = { 'yarn', ['ts-interface-builder', 'src/*.ts', '-o', 'src/ti/'], { - cwd: project.cwd, - env: process.env, stdio: 'inherit', encoding: 'utf-8', shell: true, diff --git a/scripts/pod-install.cjs b/scripts/pod-install.cjs index 654c92297..e1a9b7416 100644 --- a/scripts/pod-install.cjs +++ b/scripts/pod-install.cjs @@ -6,6 +6,10 @@ module.exports = { return { hooks: { afterAllInstalled(project, options) { + if (process.platform !== 'darwin') { + return; + } + if (process.env.POD_INSTALL === '0') { return; } diff --git a/yarn.lock b/yarn.lock index 69e1acf15..b1ef8070a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13539,12 +13539,12 @@ __metadata: "react-native-agora-rawdata@github:AgoraLibrary/react-native-agora-rawdata": version: 0.1.0 - resolution: "react-native-agora-rawdata@https://github.com/AgoraLibrary/react-native-agora-rawdata.git#commit=7fa07cc6308808f5f7e1c2e56502835471323707" + resolution: "react-native-agora-rawdata@https://github.com/AgoraLibrary/react-native-agora-rawdata.git#commit=15ecaa324f74a228a7cc2ba4686893e76954e0f8" peerDependencies: react: "*" react-native: "*" react-native-agora: ">=4.1.0" - checksum: bc6259546e34ac7083f27a87e50bb1a9383ce40b64ead8cc7d4ddd247f92102a28213c225d29aea8086bc98453dcc885cf8d4737aff176fb09b1bcd77c29721b + checksum: 6b573e4097de2efbe8243e2cf669130cd460b5b9807add657446eb227821c85ce133dd8529a81866267d54c2160b6df9ee1dd7bb5707868cb07d90fce80e828c languageName: node linkType: hard