Revert "@W-19323372 Update OMS branch with develop (#3134)" (#3140)

This reverts commit 335f392.

Author: sf-deepali-bharmal

.github/actions/e2e_generate_app/action.yml

@@ -10,24 +10,14 @@ inputs:
     required: false
     type: string
 
-outputs:
-  project_path:
-    description: Path to the generated project directory
-    value: ${{ steps.generate_project.outputs.project_path }}
-
 runs:
   using: composite
   steps:
   - name: Generate new project based on project-key
-    id: generate_project
     run: |
       COMMAND="node e2e/scripts/generate-project.js --project-key ${{ inputs.PROJECT_KEY }}"
       if [[ -n "${{ inputs.TEMPLATE_VERSION }}" ]]; then
         COMMAND="$COMMAND --templateVersion ${{ inputs.TEMPLATE_VERSION }}"
       fi
       $COMMAND
-
-      # Return path to the generated project
-      GENERATED_PROJECTS_DIR=$(node -e "console.log(require('./e2e/config.js').GENERATED_PROJECTS_DIR)")
-      echo "project_path=$GENERATED_PROJECTS_DIR/${{ inputs.PROJECT_KEY }}" >> $GITHUB_OUTPUT
     shell: bash

.github/actions/generate_app/action.yml

@@ -22,11 +22,6 @@ inputs:
   project_dir:
     description: Project Directory
 
-outputs:
-  project_path:
-    description: Path to the generated project directory
-    value: ${{ steps.generate_project.outputs.project_path }}
-
 runs:
   using: composite
   steps:
@@ -36,20 +31,20 @@ runs:
       run: |
         use_extensibility_input="${{ inputs.use_extensibility }}"
         if [ "use_extensibility_input" = "true" ]; then
-         use_extensibility_value=1
-        else
          use_extensibility_value=2
+        else
+         use_extensibility_value=1
         fi
-        echo "USE_EXTENSIBILITY_VALUE=$use_extensibility_value" >> $GITHUB_ENV
-
+        echo "USE_EXTENSIBILITY_VALUE=$use_extensibility_value" >> $GITHUB_ENV 
+        
         is_private_client_input="${{ inputs.is_private_client }}"
         if [ "$is_private_client_input" = "true" ]; then
          is_private_client_value=1
         else
           is_private_client_value=2
         fi
         echo "IS_PRIVATE_CLIENT_VALUE=$is_private_client_value" >> $GITHUB_ENV
-
+        
         setup_hybrid_input="${{ inputs.setup_hybrid }}"
         if [ "$setup_hybrid_input" = "true" ]; then
           setup_hybrid_value=2
@@ -58,8 +53,6 @@ runs:
         fi
         echo "SETUP_HYBRID_VALUE=$setup_hybrid_value" >> $GITHUB_ENV
 
-    # TODO: update this to use the standard input feature that Ben created recently
-    # TODO: this action does not finish successfully because of a dirty-workspace error, due to creating this generator-responses.json
     - name: Build project generator inputs
       id: build_generator_inputs
       shell: bash
@@ -114,16 +107,11 @@ runs:
       run: |
         cat generator-responses.json
         node e2e/scripts/generate-project.js --project-config "$(jq -c . generator-responses.json)"
-
-        # Return path to the generated project
-        GENERATED_PROJECTS_DIR=$(node -e "console.log(require('./e2e/config.js').GENERATED_PROJECTS_DIR)")
-        echo "project_path=$GENERATED_PROJECTS_DIR/${{ inputs.project_dir }}" >> $GITHUB_OUTPUT
       shell: bash
 
-    # TODO: I think we can safely delete this step. We already install the dependencies in the previous step.
     - name: Build generated project
       id: build_generated_project
-      working-directory: ${{ steps.generate_project.outputs.project_path }}
+      working-directory: ../generated-projects/${{ inputs.project_dir }}
       run: |-
         npm ci
         npm run build

.github/actions/push_to_mrt/action.yml

@@ -6,26 +6,20 @@ inputs:
   TARGET:
     description: MRT target environment
   FLAGS:
-    description: The rest of the flags for the push command
+    description: Push flags
   PROJECT:
     description: MRT target project
     default: "scaffold-pwa"
   MESSAGE:
     description: Bundle message / name
     default: "build ${{ github.run_id }} on ${{ github.ref }} (${{ github.sha }})"
-  CLOUD_ORIGIN:
-    description: 'MRT Cloud origin'
-    default: 'https://cloud.mobify.com'
-  CREDENTIALS_FILE_PATH:
-    description: 'Path to the credentials file'
-    default: '~/.mobify'
 runs:
   using: composite
   steps:
     - name: Push Bundle to MRT
       run: |-
         cd ${{ inputs.CWD }}
         if [[ ${{ inputs.TARGET }} ]]; then
-          npm run push -- --projectSlug ${{ inputs.PROJECT }} --message "${{ inputs.MESSAGE }}" --target ${{ inputs.TARGET }} --cloud-origin ${{ inputs.CLOUD_ORIGIN }} --credentialsFile ${{ inputs.CREDENTIALS_FILE_PATH }} ${{ inputs.FLAGS }}
+          npm run push -- -s ${{ inputs.PROJECT }} --message "${{ inputs.MESSAGE }}" --target ${{ inputs.TARGET }} ${{ inputs.FLAGS }}
         fi
       shell: bash

.github/workflows/agent_checkout_rebase_action.yml

@@ -13,15 +13,15 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       IS_LATEST_RELEASE: ${{ steps.checkRelease.outputs.IS_LATEST_RELEASE }}
-    steps:
+    steps:  
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Check if latest release
         uses: ./.github/actions/check_if_latest_release
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-
+      
       - name: Update Github Outputs
         id: checkRelease
         run: |-
@@ -45,15 +45,13 @@ jobs:
             project: pwa-kit
             mobify_user: MOBIFY_STG_CLIENT_USER
             mobify_api_key: MOBIFY_STG_CLIENT_API_KEY
-            cloud_origin: https://cloud-testing.mobify-staging.com
-            flags: --wait
+            flags: --cloud-origin https://cloud-testing.mobify-staging.com -c ~/.mobify --wait
           - name: demo-site
             project_key: retail-react-app-demo-site
             target: production
             project: scaffold-pwa
             mobify_user: MOBIFY_CLIENT_USER
             mobify_api_key: MOBIFY_CLIENT_API_KEY
-            cloud_origin: https://cloud.mobify.com
             flags: --wait
     steps:
       - name: Checkout
@@ -72,7 +70,6 @@ jobs:
           node ./scripts/gtime.js monorepo_install npm ci
 
       - name: Generate Retail App Demo
-        id: generate_app
         uses: ./.github/actions/e2e_generate_app
         with:
           PROJECT_KEY: ${{ matrix.environment.project_key }}
@@ -97,9 +94,8 @@ jobs:
       - name: Push Bundle to MRT (${{matrix.environment.name}})
         uses: "./.github/actions/push_to_mrt"
         with:
-          CWD: ${{ steps.generate_app.outputs.project_path }}
+          CWD: "../generated-projects/${{ matrix.environment.project_key }}"
           TARGET: ${{ matrix.environment.target }}
           PROJECT: ${{ matrix.environment.project }}
           MESSAGE: ${{ env.BUNDLE_NAME }})
-          CLOUD_ORIGIN: ${{ matrix.environment.cloud_origin }}
           FLAGS: ${{ matrix.environment.flags }}

.github/workflows/bundle-size.yml

@@ -64,7 +64,6 @@ jobs:
                   echo "retail_app_template_version=$version" >> "$GITHUB_ENV"
 
             - name: Generate Retail App Private Client
-              id: generate_app
               if: ${{ env.SKIP_WORKFLOW != 'true' }}
               uses: ./.github/actions/e2e_generate_app
               with:
@@ -90,7 +89,7 @@ jobs:
               if: ${{ env.SKIP_WORKFLOW != 'true' }}
               uses: './.github/actions/push_to_mrt'
               with:
-                  CWD: ${{ steps.generate_app.outputs.project_path }}
+                  CWD: '../generated-projects/retail-app-no-ext'
                   # TODO: Use the MRT target ID from the target lock step above.
                   TARGET: e2e-tests-pwa-kit
                   FLAGS: --wait

.github/workflows/deploy_latest_release.yml

@@ -114,7 +114,6 @@ jobs:
           echo "retail_app_template_version=$version" >> "$GITHUB_ENV"
 
       - name: Generate Retail App Without Extensibility
-        id: generate_app_no_ext
         uses: ./.github/actions/e2e_generate_app
         with:
           PROJECT_KEY: "retail-app-no-ext"
@@ -135,7 +134,7 @@ jobs:
       - name: Push Bundle to MRT (E2E Test PWA Kit)
         uses: "./.github/actions/push_to_mrt"
         with:
-          CWD: ${{ steps.generate_app_no_ext.outputs.project_path }}
+          CWD: "../generated-projects/retail-app-no-ext"
           TARGET: e2e-tests-pwa-kit
           FLAGS: --wait
 
@@ -232,7 +231,6 @@ jobs:
           echo "retail_app_template_version=$version" >> "$GITHUB_ENV"
 
       - name: Generate Retail App With Extensibility
-        id: generate_app_ext
         uses: ./.github/actions/e2e_generate_app
         with:
           PROJECT_KEY: "retail-app-ext"
@@ -253,7 +251,7 @@ jobs:
       - name: Push Bundle to MRT (E2E Test PWA Kit)
         uses: "./.github/actions/push_to_mrt"
         with:
-          CWD: ${{ steps.generate_app_ext.outputs.project_path }}
+          CWD: "../generated-projects/retail-app-ext"
           TARGET: e2e-tests-pwa-kit
           FLAGS: --wait
 
@@ -348,7 +346,6 @@ jobs:
           echo "retail_app_template_version=$version" >> "$GITHUB_ENV"
 
       - name: Generate Retail App Private Client
-        id: generate_app_private_client
         uses: ./.github/actions/e2e_generate_app
         with:
           PROJECT_KEY: "retail-app-private-client"
@@ -369,7 +366,7 @@ jobs:
       - name: Push Bundle to MRT
         uses: "./.github/actions/push_to_mrt"
         with:
-          CWD: ${{ steps.generate_app_private_client.outputs.project_path }}
+          CWD: "../generated-projects/retail-app-private-client"
           TARGET: e2e-pwa-kit-private
           FLAGS: --wait