[LOCAL][CI] Fix Helloworld ios jobs

.github/actions/test_ios_helloworld/action.yml

@@ -46,12 +46,13 @@ runs:
     - name: Setup node.js
       uses: ./.github/actions/setup-node
     - name: Create Hermes folder
+      shell: bash
       run: mkdir -p "$HERMES_WS_DIR"
     - name: Download Hermes
       uses: actions/download-artifact@v4
       with:
         name: hermes-darwin-bin-${{ inputs.flavor }}
-        path: $HERMES_WS_DIR/hermes-runtime-darwin/
+        path: /tmp/hermes/hermes-runtime-darwin/
     - name: Print Downloaded hermes
       shell: bash
       run: ls -lR "$HERMES_WS_DIR"
@@ -80,16 +81,27 @@ runs:
           args+=(--jsvm jsc)
           yarn bootstrap ios "${args[@]}" | cat
         else
+          # Tarball is restored with capital flavors suffix, but somehow the tarball name from JS at line 96 returns as lowercased.
+          # Let's ensure that the tarballs have the right names
+
+          if [[ -f "$HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-Debug.tar.gz" ]]; then
+            mv "$HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-Debug.tar.gz" "$HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-debug.tar.gz"
+          fi
+
+          if [[ -f "$HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-Release.tar.gz" ]]; then
+            mv "$HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-Release.tar.gz" "$HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-release.tar.gz"
+          fi
 
           BUILD_TYPE="${{ inputs.flavor }}"
           TARBALL_FILENAME=$(node ../react-native/scripts/hermes/get-tarball-name.js --buildType "$BUILD_TYPE")
-          HERMES_PATH="$HERMES_WS_DIR/hermes-runtime-darwin/hermes-darwin-bin-${{ inputs.flavor }}/$TARBALL_FILENAME"
+          HERMES_PATH="$HERMES_WS_DIR/hermes-runtime-darwin/$TARBALL_FILENAME"
           HERMES_ENGINE_TARBALL_PATH="$HERMES_PATH" yarn bootstrap ios "${args[@]}" | cat
         fi
     - name: Build HelloWorld  project
       shell: bash
       run: |
         cd packages/helloworld
+
         args=()
         if [[ ${{ inputs.flavor }} == "Release" ]]; then
           args+=(--prod)

.github/workflows/nightly.yml

@@ -284,6 +284,8 @@ jobs:
           echo "[HERMES] Creating the universal framework"
           chmod +x ./utils/build-ios-framework.sh
           ./utils/build-ios-framework.sh build_framework
+
+          chmod +x ./destroot/bin/hermesc
       - name: Package the Hermes Apple frameworks
         if: ${{ steps.check_if_apple_artifacts_are_there.outputs.ARTIFACTS_EXIST != 'true' }}
         run: |
@@ -310,7 +312,7 @@ jobs:
           cp ./packages/react-native/sdks/hermes/build_macosx/bin/* /tmp/hermes/osx-bin/${{ matrix.flavor }}
           ls -lR /tmp/hermes/osx-bin/
       - name: Create dSYM archive
-        if: ${{ steps.check_if_apple_artifacts_are_there.outputs.ARTIFACTS_EXIST != true }}
+        if: ${{ steps.check_if_apple_artifacts_are_there.outputs.ARTIFACTS_EXIST != 'true' }}
         run: |
           FLAVOR=${{ matrix.flavor }}
           WORKING_DIR="/tmp/hermes_tmp/dSYM/$FLAVOR"

.github/workflows/publish-release.yml

@@ -281,6 +281,8 @@ jobs:
           echo "[HERMES] Creating the universal framework"
           chmod +x ./utils/build-ios-framework.sh
           ./utils/build-ios-framework.sh build_framework
+
+          chmod +x ./destroot/bin/hermesc
       - name: Package the Hermes Apple frameworks
         if: ${{ steps.check_if_apple_artifacts_are_there.outputs.ARTIFACTS_EXIST != 'true' }}
         run: |
@@ -307,7 +309,7 @@ jobs:
           cp ./packages/react-native/sdks/hermes/build_macosx/bin/* /tmp/hermes/osx-bin/${{ matrix.flavor }}
           ls -lR /tmp/hermes/osx-bin/
       - name: Create dSYM archive
-        if: ${{ steps.check_if_apple_artifacts_are_there.outputs.ARTIFACTS_EXIST != true }}
+        if: ${{ steps.check_if_apple_artifacts_are_there.outputs.ARTIFACTS_EXIST != 'true' }}
         run: |
           FLAVOR=${{ matrix.flavor }}
           WORKING_DIR="/tmp/hermes_tmp/dSYM/$FLAVOR"

.github/workflows/test-all.yml

@@ -206,7 +206,7 @@ jobs:
       - name: Restore Cached Artifacts
         uses: actions/cache/[email protected]
         with:
-          key: v2-hermes-osx-bin-${{ matrix.flavor }}-${{ needs.prepare_hermes_workspace.outputs.hermes-version }}-${{ needs.prepare_hermes_workspace.outputs.react-native-version }}
+          key: v3-hermes-artifacts-${{ matrix.flavor }}-${{ needs.prepare_hermes_workspace.outputs.hermes-version }}-${{ needs.prepare_hermes_workspace.outputs.react-native-version }}
           path: |
             /tmp/hermes/osx-bin/${{ matrix.flavor }}
             /tmp/hermes/dSYM/${{ matrix.flavor }}
@@ -292,6 +292,8 @@ jobs:
           echo "[HERMES] Creating the universal framework"
           chmod +x ./utils/build-ios-framework.sh
           ./utils/build-ios-framework.sh build_framework
+
+          chmod +x ./destroot/bin/hermesc
       - name: Package the Hermes Apple frameworks
         if: ${{ steps.check_if_apple_artifacts_are_there.outputs.ARTIFACTS_EXIST != 'true' }}
         run: |
@@ -318,7 +320,7 @@ jobs:
           cp ./packages/react-native/sdks/hermes/build_macosx/bin/* /tmp/hermes/osx-bin/${{ matrix.flavor }}
           ls -lR /tmp/hermes/osx-bin/
       - name: Create dSYM archive
-        if: ${{ steps.check_if_apple_artifacts_are_there.outputs.ARTIFACTS_EXIST != true }}
+        if: ${{ steps.check_if_apple_artifacts_are_there.outputs.ARTIFACTS_EXIST != 'true' }}
         run: |
           FLAVOR=${{ matrix.flavor }}
           WORKING_DIR="/tmp/hermes_tmp/dSYM/$FLAVOR"
@@ -364,7 +366,7 @@ jobs:
         uses: actions/cache/[email protected]
         if: ${{ github.ref == 'refs/heads/main' || contains(github.ref, '-stable') }} # To avoid that the cache explode.
         with:
-          key: v2-hermes-artifacts-${{ matrix.flavor }}-${{ needs.prepare_hermes_workspace.outputs.hermes-version }}-${{ needs.prepare_hermes_workspace.outputs.react-native-version }}
+          key: v3-hermes-artifacts-${{ matrix.flavor }}-${{ needs.prepare_hermes_workspace.outputs.hermes-version }}-${{ needs.prepare_hermes_workspace.outputs.react-native-version }}
           path: |
             /tmp/hermes/osx-bin/${{ matrix.flavor }}
             /tmp/hermes/dSYM/${{ matrix.flavor }}

scripts/e2e/init-template-e2e.js

@@ -11,6 +11,7 @@
 
 'use strict';
 
+import type {ProjectInfo} from '../utils/monorepo';
 const {retry} = require('../circleci/retry');
 const {REPO_ROOT} = require('../consts');
 const {getPackages} = require('../utils/monorepo');
@@ -172,49 +173,48 @@ async function installProjectUsingProxy(cwd /*: string */) {
   }
 }
 
-function _updateScopedPackages(packages, directory) {
-  console.log('Updating the scoped packagesto match the version published in Verdaccio');
+function _updateScopedPackages(
+  packages /*: ProjectInfo */,
+  directory /*: string */,
+) {
+  console.log(
+    'Updating the scoped packagesto match the version published in Verdaccio',
+  );
 
   // Packages are updated in a lockstep and all with the same version.
   // Pick the version from the first package
   const version = packages[Object.keys(packages)[0]].packageJson.version;
 
   // Update scoped packages which starts with @react-native
-  const appPackageJsonPath = path.join(
-    directory,
-    'package.json',
-  );
+  const appPackageJsonPath = path.join(directory, 'package.json');
   const appPackageJson = JSON.parse(
     fs.readFileSync(appPackageJsonPath, 'utf8'),
   );
 
   for (const [key, _] of Object.entries(appPackageJson.dependencies)) {
     if (key.startsWith('@react-native')) {
-      appPackageJson.dependencies[key] = version
+      appPackageJson.dependencies[key] = version;
     }
   }
   for (const [key, _] of Object.entries(appPackageJson.devDependencies)) {
     if (key.startsWith('@react-native')) {
-      appPackageJson.devDependencies[key] = version
+      appPackageJson.devDependencies[key] = version;
     }
   }
 
-  fs.writeFileSync(
-    appPackageJsonPath,
-    JSON.stringify(appPackageJson, null, 2),
-  );
+  fs.writeFileSync(appPackageJsonPath, JSON.stringify(appPackageJson, null, 2));
 
   console.log('Done ✅');
 }
 
-function _updateReactNativeInTemplateIfNeeded(pathToLocalReactNative, directory) {
+function _updateReactNativeInTemplateIfNeeded(
+  pathToLocalReactNative /*: ?string */,
+  directory /*: string */,
+) {
   if (pathToLocalReactNative != null) {
     console.log('Updating the template version to local react-native');
     // Update template version.
-    const appPackageJsonPath = path.join(
-      directory,
-      'package.json',
-    );
+    const appPackageJsonPath = path.join(directory, 'package.json');
     const appPackageJson = JSON.parse(
       fs.readFileSync(appPackageJsonPath, 'utf8'),
     );

scripts/utils/monorepo.js

@@ -42,7 +42,7 @@ export type PackageInfo = {
   packageJson: PackageJson,
 };
 
-type ProjectInfo = {
+export type ProjectInfo = {
   [packageName: string]: PackageInfo,
 };
 */