From 6e312e7e5365a62da10d84e59c8c208f09f7da24 Mon Sep 17 00:00:00 2001 From: Denys Panchenko Date: Thu, 28 Jul 2022 00:18:16 +0200 Subject: [PATCH 01/11] Set Java version 11 --- .github/workflows/react-native-code-push-ci.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/react-native-code-push-ci.yml b/.github/workflows/react-native-code-push-ci.yml index 7bc37e089..e9cbb0446 100644 --- a/.github/workflows/react-native-code-push-ci.yml +++ b/.github/workflows/react-native-code-push-ci.yml @@ -14,7 +14,12 @@ jobs: api-level: [27] steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 + - name: Setup Java + uses: actions/setup-java@v3 + with: + distribution: 'microsoft' + java-version: '11' - name: Start adb server run: adb devices - name: Download system image "android-${{ matrix.api-level }}" From 42328ef683f1f4b0efad24c44adf925205231437 Mon Sep 17 00:00:00 2001 From: Denys Panchenko Date: Tue, 26 Jul 2022 19:30:05 +0200 Subject: [PATCH 02/11] Fix pipeline tests --- .github/workflows/react-native-code-push-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/react-native-code-push-ci.yml b/.github/workflows/react-native-code-push-ci.yml index e9cbb0446..50176aea6 100644 --- a/.github/workflows/react-native-code-push-ci.yml +++ b/.github/workflows/react-native-code-push-ci.yml @@ -36,6 +36,8 @@ jobs: run: npm install - name: Install react-native-cli run: npm install react-native-cli + - name: Install react-native + run: npm install react-native - name: test:android run: npm run test:android From d6bc94ac5fe04faf1d07d4ff54a477e3f79720ca Mon Sep 17 00:00:00 2001 From: Denys Panchenko Date: Thu, 28 Jul 2022 00:23:55 +0200 Subject: [PATCH 03/11] Move Java version to later stage --- .github/workflows/react-native-code-push-ci.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/react-native-code-push-ci.yml b/.github/workflows/react-native-code-push-ci.yml index 50176aea6..2c9f8890a 100644 --- a/.github/workflows/react-native-code-push-ci.yml +++ b/.github/workflows/react-native-code-push-ci.yml @@ -15,11 +15,6 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 - - name: Setup Java - uses: actions/setup-java@v3 - with: - distribution: 'microsoft' - java-version: '11' - name: Start adb server run: adb devices - name: Download system image "android-${{ matrix.api-level }}" @@ -38,6 +33,11 @@ jobs: run: npm install react-native-cli - name: Install react-native run: npm install react-native + - name: Setup Java + uses: actions/setup-java@v3 + with: + distribution: 'microsoft' + java-version: '11' - name: test:android run: npm run test:android @@ -51,6 +51,8 @@ jobs: run: npm install - name: Install react-native-cli run: npm install react-native-cli + - name: Install reacti-native + run: npm install react-native - name: Build tests run: npm run build:tests - name: Setup tests From c44282a6ba6aa88af8c1ac1b2c00c79ed4314f0e Mon Sep 17 00:00:00 2001 From: Denys Panchenko Date: Thu, 28 Jul 2022 00:25:36 +0200 Subject: [PATCH 04/11] Fix indentation --- .github/workflows/react-native-code-push-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/react-native-code-push-ci.yml b/.github/workflows/react-native-code-push-ci.yml index 2c9f8890a..712f7e573 100644 --- a/.github/workflows/react-native-code-push-ci.yml +++ b/.github/workflows/react-native-code-push-ci.yml @@ -33,11 +33,11 @@ jobs: run: npm install react-native-cli - name: Install react-native run: npm install react-native - - name: Setup Java - uses: actions/setup-java@v3 - with: - distribution: 'microsoft' - java-version: '11' + - name: Setup Java + uses: actions/setup-java@v3 + with: + distribution: 'microsoft' + java-version: '11' - name: test:android run: npm run test:android From 6f00aa55c4097f69902c8a9b3a7df9d835849fc9 Mon Sep 17 00:00:00 2001 From: Denys Panchenko Date: Thu, 16 Jun 2022 15:43:24 +0200 Subject: [PATCH 05/11] Add terminating separator to avoid path escaping --- .../src/main/java/com/microsoft/codepush/react/FileUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/app/src/main/java/com/microsoft/codepush/react/FileUtils.java b/android/app/src/main/java/com/microsoft/codepush/react/FileUtils.java index babed5ea2..45de5b744 100644 --- a/android/app/src/main/java/com/microsoft/codepush/react/FileUtils.java +++ b/android/app/src/main/java/com/microsoft/codepush/react/FileUtils.java @@ -124,7 +124,7 @@ public static String readFileToString(String filePath) throws IOException { } private static String validateFileName(String fileName, File destinationFolder) throws IOException { - String destinationFolderCanonicalPath = destinationFolder.getCanonicalPath(); + String destinationFolderCanonicalPath = destinationFolder.getCanonicalPath() + File.separator; File file = new File(destinationFolderCanonicalPath, fileName); String canonicalPath = file.getCanonicalPath(); From 468038e2410b03c72888787ee4caedec240bf970 Mon Sep 17 00:00:00 2001 From: Denys Panchenko Date: Thu, 28 Jul 2022 08:52:41 +0200 Subject: [PATCH 06/11] Fix metro error --- .github/workflows/react-native-code-push-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/react-native-code-push-ci.yml b/.github/workflows/react-native-code-push-ci.yml index 712f7e573..0cfda6a6d 100644 --- a/.github/workflows/react-native-code-push-ci.yml +++ b/.github/workflows/react-native-code-push-ci.yml @@ -11,7 +11,7 @@ jobs: runs-on: macos-latest strategy: matrix: - api-level: [27] + api-level: [ 27 ] steps: - name: Checkout uses: actions/checkout@v3 @@ -29,10 +29,10 @@ jobs: - run: adb shell settings put global animator_duration_scale 0.0 - name: Package Installation run: npm install - - name: Install react-native-cli - run: npm install react-native-cli - name: Install react-native run: npm install react-native + - name: Install react-native-cli + run: npm install -i --force react-native-cli - name: Setup Java uses: actions/setup-java@v3 with: From be291ff00f6e81ee2a08cb9aa779f3e8b49fcd83 Mon Sep 17 00:00:00 2001 From: Denys Panchenko Date: Thu, 28 Jul 2022 09:14:30 +0200 Subject: [PATCH 07/11] Revert "Fix metro error" This reverts commit 468038e2410b03c72888787ee4caedec240bf970. --- .github/workflows/react-native-code-push-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/react-native-code-push-ci.yml b/.github/workflows/react-native-code-push-ci.yml index 0cfda6a6d..712f7e573 100644 --- a/.github/workflows/react-native-code-push-ci.yml +++ b/.github/workflows/react-native-code-push-ci.yml @@ -11,7 +11,7 @@ jobs: runs-on: macos-latest strategy: matrix: - api-level: [ 27 ] + api-level: [27] steps: - name: Checkout uses: actions/checkout@v3 @@ -29,10 +29,10 @@ jobs: - run: adb shell settings put global animator_duration_scale 0.0 - name: Package Installation run: npm install + - name: Install react-native-cli + run: npm install react-native-cli - name: Install react-native run: npm install react-native - - name: Install react-native-cli - run: npm install -i --force react-native-cli - name: Setup Java uses: actions/setup-java@v3 with: From 6bd45e9ec3255e391d61628472bab90675351459 Mon Sep 17 00:00:00 2001 From: Denys Panchenko Date: Thu, 28 Jul 2022 09:14:31 +0200 Subject: [PATCH 08/11] Revert "Fix indentation" This reverts commit c44282a6ba6aa88af8c1ac1b2c00c79ed4314f0e. --- .github/workflows/react-native-code-push-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/react-native-code-push-ci.yml b/.github/workflows/react-native-code-push-ci.yml index 712f7e573..2c9f8890a 100644 --- a/.github/workflows/react-native-code-push-ci.yml +++ b/.github/workflows/react-native-code-push-ci.yml @@ -33,11 +33,11 @@ jobs: run: npm install react-native-cli - name: Install react-native run: npm install react-native - - name: Setup Java - uses: actions/setup-java@v3 - with: - distribution: 'microsoft' - java-version: '11' + - name: Setup Java + uses: actions/setup-java@v3 + with: + distribution: 'microsoft' + java-version: '11' - name: test:android run: npm run test:android From a52f7ea7dad002fa9d0c60c63d77ff27d1a1fb63 Mon Sep 17 00:00:00 2001 From: Denys Panchenko Date: Thu, 28 Jul 2022 09:14:31 +0200 Subject: [PATCH 09/11] Revert "Move Java version to later stage" This reverts commit d6bc94ac5fe04faf1d07d4ff54a477e3f79720ca. --- .github/workflows/react-native-code-push-ci.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/react-native-code-push-ci.yml b/.github/workflows/react-native-code-push-ci.yml index 2c9f8890a..50176aea6 100644 --- a/.github/workflows/react-native-code-push-ci.yml +++ b/.github/workflows/react-native-code-push-ci.yml @@ -15,6 +15,11 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 + - name: Setup Java + uses: actions/setup-java@v3 + with: + distribution: 'microsoft' + java-version: '11' - name: Start adb server run: adb devices - name: Download system image "android-${{ matrix.api-level }}" @@ -33,11 +38,6 @@ jobs: run: npm install react-native-cli - name: Install react-native run: npm install react-native - - name: Setup Java - uses: actions/setup-java@v3 - with: - distribution: 'microsoft' - java-version: '11' - name: test:android run: npm run test:android @@ -51,8 +51,6 @@ jobs: run: npm install - name: Install react-native-cli run: npm install react-native-cli - - name: Install reacti-native - run: npm install react-native - name: Build tests run: npm run build:tests - name: Setup tests From 338339d957a95dca239a7f48da2788e4aaddd94b Mon Sep 17 00:00:00 2001 From: Denys Panchenko Date: Thu, 28 Jul 2022 09:14:31 +0200 Subject: [PATCH 10/11] Revert "Fix pipeline tests" This reverts commit 42328ef683f1f4b0efad24c44adf925205231437. --- .github/workflows/react-native-code-push-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/react-native-code-push-ci.yml b/.github/workflows/react-native-code-push-ci.yml index 50176aea6..e9cbb0446 100644 --- a/.github/workflows/react-native-code-push-ci.yml +++ b/.github/workflows/react-native-code-push-ci.yml @@ -36,8 +36,6 @@ jobs: run: npm install - name: Install react-native-cli run: npm install react-native-cli - - name: Install react-native - run: npm install react-native - name: test:android run: npm run test:android From 39e53fdf49ab628f4ee1f75ae82961498afeca50 Mon Sep 17 00:00:00 2001 From: Denys Panchenko Date: Thu, 28 Jul 2022 09:14:32 +0200 Subject: [PATCH 11/11] Revert "Set Java version 11" This reverts commit 6e312e7e5365a62da10d84e59c8c208f09f7da24. --- .github/workflows/react-native-code-push-ci.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/react-native-code-push-ci.yml b/.github/workflows/react-native-code-push-ci.yml index e9cbb0446..7bc37e089 100644 --- a/.github/workflows/react-native-code-push-ci.yml +++ b/.github/workflows/react-native-code-push-ci.yml @@ -14,12 +14,7 @@ jobs: api-level: [27] steps: - name: Checkout - uses: actions/checkout@v3 - - name: Setup Java - uses: actions/setup-java@v3 - with: - distribution: 'microsoft' - java-version: '11' + uses: actions/checkout@v2 - name: Start adb server run: adb devices - name: Download system image "android-${{ matrix.api-level }}"