From 8830ebbad49d846a4bcad350f2e6e8e9d8e8a018 Mon Sep 17 00:00:00 2001 From: Riccardo Cipolleschi Date: Thu, 17 Jul 2025 12:21:05 +0100 Subject: [PATCH] [RN][CI]Fix Windows CI --- .github/actions/build-hermesc-windows/action.yml | 16 ++++++++-------- .github/workflows/nightly.yml | 6 +++--- .github/workflows/publish-release.yml | 6 +++--- .github/workflows/test-all.yml | 6 +++--- .../kotlin/com/facebook/react/utils/OsTest.kt | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/actions/build-hermesc-windows/action.yml b/.github/actions/build-hermesc-windows/action.yml index 7b80fbc9929615..1dcaebb2fb930c 100644 --- a/.github/actions/build-hermesc-windows/action.yml +++ b/.github/actions/build-hermesc-windows/action.yml @@ -14,23 +14,23 @@ runs: uses: actions/download-artifact@v4 with: name: hermes-workspace - path: 'D:\tmp\hermes' + path: 'C:\tmp\hermes' - name: Set up workspace shell: powershell run: | - mkdir -p D:\tmp\hermes\osx-bin + mkdir -p C:\tmp\hermes\osx-bin mkdir -p .\packages\react-native\sdks\hermes - cp -r -Force D:\tmp\hermes\hermes\* .\packages\react-native\sdks\hermes\. + cp -r -Force C:\tmp\hermes\hermes\* .\packages\react-native\sdks\hermes\. cp -r -Force .\packages\react-native\sdks\hermes-engine\utils\* .\packages\react-native\sdks\hermes\. - name: Windows cache uses: actions/cache@v4 with: key: v3-hermes-${{ github.job }}-windows-${{ inputs.hermes-version }}-${{ inputs.react-native-version }} path: | - D:\tmp\hermes\win64-bin\ - D:\tmp\hermes\hermes\icu\ - D:\tmp\hermes\hermes\deps\ - D:\tmp\hermes\hermes\build_release\ + C:\tmp\hermes\win64-bin\ + C:\tmp\hermes\hermes\icu\ + C:\tmp\hermes\hermes\deps\ + C:\tmp\hermes\hermes\build_release\ - name: setup-msbuild uses: microsoft/setup-msbuild@v1.3.2 - name: Set up workspace @@ -83,4 +83,4 @@ runs: uses: actions/upload-artifact@v4.3.4 with: name: hermes-win64-bin - path: D:\tmp\hermes\win64-bin\ + path: C:\tmp\hermes\win64-bin\ diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 2b494041a009c8..24177338f9558f 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -128,9 +128,9 @@ jobs: runs-on: windows-2025 needs: prepare_hermes_workspace env: - HERMES_WS_DIR: 'D:\tmp\hermes' - HERMES_TARBALL_ARTIFACTS_DIR: 'D:\tmp\hermes\hermes-runtime-darwin' - HERMES_OSXBIN_ARTIFACTS_DIR: 'D:\tmp\hermes\osx-bin' + HERMES_WS_DIR: 'C:\tmp\hermes' + HERMES_TARBALL_ARTIFACTS_DIR: 'C:\tmp\hermes\hermes-runtime-darwin' + HERMES_OSXBIN_ARTIFACTS_DIR: 'C:\tmp\hermes\osx-bin' ICU_URL: "https://github.com/unicode-org/icu/releases/download/release-64-2/icu4c-64_2-Win64-MSVC2017.zip" MSBUILD_DIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin' CMAKE_DIR: 'C:\Program Files\CMake\bin' diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 2410cb49a3251e..8f356720f0b955 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -125,9 +125,9 @@ jobs: runs-on: windows-2025 needs: prepare_hermes_workspace env: - HERMES_WS_DIR: 'D:\tmp\hermes' - HERMES_TARBALL_ARTIFACTS_DIR: 'D:\tmp\hermes\hermes-runtime-darwin' - HERMES_OSXBIN_ARTIFACTS_DIR: 'D:\tmp\hermes\osx-bin' + HERMES_WS_DIR: 'C:\tmp\hermes' + HERMES_TARBALL_ARTIFACTS_DIR: 'C:\tmp\hermes\hermes-runtime-darwin' + HERMES_OSXBIN_ARTIFACTS_DIR: 'C:\tmp\hermes\osx-bin' ICU_URL: "https://github.com/unicode-org/icu/releases/download/release-64-2/icu4c-64_2-Win64-MSVC2017.zip" MSBUILD_DIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin' CMAKE_DIR: 'C:\Program Files\CMake\bin' diff --git a/.github/workflows/test-all.yml b/.github/workflows/test-all.yml index dd6ee0968dca70..06200dbdec2a1b 100644 --- a/.github/workflows/test-all.yml +++ b/.github/workflows/test-all.yml @@ -382,9 +382,9 @@ jobs: runs-on: windows-2025 needs: prepare_hermes_workspace env: - HERMES_WS_DIR: 'D:\tmp\hermes' - HERMES_TARBALL_ARTIFACTS_DIR: 'D:\tmp\hermes\hermes-runtime-darwin' - HERMES_OSXBIN_ARTIFACTS_DIR: 'D:\tmp\hermes\osx-bin' + HERMES_WS_DIR: 'C:\tmp\hermes' + HERMES_TARBALL_ARTIFACTS_DIR: 'C:\tmp\hermes\hermes-runtime-darwin' + HERMES_OSXBIN_ARTIFACTS_DIR: 'C:\tmp\hermes\osx-bin' ICU_URL: "https://github.com/unicode-org/icu/releases/download/release-64-2/icu4c-64_2-Win64-MSVC2017.zip" MSBUILD_DIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin' CMAKE_DIR: 'C:\Program Files\CMake\bin' diff --git a/packages/gradle-plugin/shared/src/test/kotlin/com/facebook/react/utils/OsTest.kt b/packages/gradle-plugin/shared/src/test/kotlin/com/facebook/react/utils/OsTest.kt index bf535ade745533..85b8dc28dafc0c 100644 --- a/packages/gradle-plugin/shared/src/test/kotlin/com/facebook/react/utils/OsTest.kt +++ b/packages/gradle-plugin/shared/src/test/kotlin/com/facebook/react/utils/OsTest.kt @@ -55,7 +55,7 @@ class OsTest { @Test fun unixifyPath_withAWindowsPath_convertsItCorrectly() { - val aWindowsPath = "D:\\just\\a\\windows\\path\\" + val aWindowsPath = "C:\\just\\a\\windows\\path\\" assertThat("/D/just/a/windows/path/").isEqualTo(aWindowsPath.unixifyPath()) }