diff --git a/.github/actions/test-ios-helloworld/action.yml b/.github/actions/test-ios-helloworld/action.yml index 66d4ee84791b..6a136b8ab76e 100644 --- a/.github/actions/test-ios-helloworld/action.yml +++ b/.github/actions/test-ios-helloworld/action.yml @@ -26,7 +26,10 @@ runs: - name: Set nightly Hermes versions shell: bash run: | - node ./scripts/releases/use-hermes-nightly.js + HERMES_VERSION=$(sed -n 's/^HERMES_VERSION_NAME=//p' packages/react-native/sdks/hermes-engine/version.properties) + if [ "$HERMES_VERSION" == "1000.0.0" ]; then + node ./scripts/releases/use-hermes-nightly.js + fi - name: Run yarn install again, with the correct hermes version uses: ./.github/actions/yarn-install - name: Download ReactNativeDependencies diff --git a/.github/actions/test-ios-rntester/action.yml b/.github/actions/test-ios-rntester/action.yml index 3d6d83b3b6e7..6f5e2ad91403 100644 --- a/.github/actions/test-ios-rntester/action.yml +++ b/.github/actions/test-ios-rntester/action.yml @@ -35,7 +35,10 @@ runs: - name: Set nightly Hermes versions shell: bash run: | - node ./scripts/releases/use-hermes-nightly.js + HERMES_VERSION=$(sed -n 's/^HERMES_VERSION_NAME=//p' packages/react-native/sdks/hermes-engine/version.properties) + if [ "$HERMES_VERSION" == "1000.0.0" ]; then + node ./scripts/releases/use-hermes-nightly.js + fi - name: Run yarn install again, with the correct hermes version uses: ./.github/actions/yarn-install - name: Prepare IOS Tests diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index f8d3b0f8d96a..703ea863904b 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -29,7 +29,6 @@ jobs: prebuild_react_native_core: uses: ./.github/workflows/prebuild-ios-core.yml with: - use-hermes-nightly: true version-type: nightly secrets: inherit needs: [prebuild_apple_dependencies] diff --git a/.github/workflows/prebuild-ios-core.yml b/.github/workflows/prebuild-ios-core.yml index ce2f6b88c30b..3dac6b9a21b9 100644 --- a/.github/workflows/prebuild-ios-core.yml +++ b/.github/workflows/prebuild-ios-core.yml @@ -8,11 +8,6 @@ on: type: string required: false default: '' - use-hermes-nightly: - description: 'Whether to use the hermes nightly build or read the version from the versions.properties file' - type: boolean - required: false - default: false jobs: build-rn-slice: @@ -47,12 +42,9 @@ jobs: - name: Set Hermes version shell: bash run: | - if [ "${{ inputs.use-hermes-nightly }}" == "true" ]; then - # We are not publishing nightly versions of Hermes V1 yet. - # For now, we can use the latest version of Hermes V1 published on maven and npm. + HERMES_VERSION=$(sed -n 's/^HERMES_V1_VERSION_NAME=//p' packages/react-native/sdks/hermes-engine/version.properties) + if [ "$HERMES_VERSION" == "1000.0.0" ]; then HERMES_VERSION="latest-v1" - else - HERMES_VERSION=$(sed -n 's/^HERMES_V1_VERSION_NAME=//p' packages/react-native/sdks/hermes-engine/version.properties) fi echo "Using Hermes version: $HERMES_VERSION" echo "HERMES_VERSION=$HERMES_VERSION" >> $GITHUB_ENV diff --git a/.github/workflows/test-all.yml b/.github/workflows/test-all.yml index 2e1f876bc0a4..23de6e68eecb 100644 --- a/.github/workflows/test-all.yml +++ b/.github/workflows/test-all.yml @@ -96,8 +96,6 @@ jobs: prebuild_react_native_core: uses: ./.github/workflows/prebuild-ios-core.yml - with: - use-hermes-nightly: ${{ !endsWith(github.ref_name, '-stable') }} secrets: inherit needs: [prebuild_apple_dependencies]