Make the choice of layout runtime setting

Co-authored-by: Samson <16504129+sagudev@users.noreply.github.com>

.github/workflows/mac.yml

@@ -3,9 +3,6 @@ name: Mac workflow
 on:
   workflow_call:
     inputs:
-      layout:
-        required: true
-        type: string
       unit-tests:
         required: false
         default: false
@@ -19,10 +16,6 @@ on:
         type: string
   workflow_dispatch:
     inputs:
-      layout:
-        required: true
-        type: choice
-        options: ["2013", "2020"]
       unit-tests:
         required: false
         default: false
@@ -37,8 +30,6 @@ on:
 env:
   RUST_BACKTRACE: 1
   SHELL: /bin/bash
-  LAYOUT: "${{ contains(inputs.layout, '2020') && 'layout-2020' || 'layout-2013' }}"
-  PACKAGE: "${{ contains(inputs.layout, '2020') && 'mac-layout2020' || 'mac' }}"
   SCCACHE_GHA_ENABLED: "true"
   RUSTC_WRAPPER: "sccache"
   CCACHE: "sccache"
@@ -60,35 +51,35 @@ jobs:
           python3 ./mach bootstrap
       - name: Release build
         run: |
-          python3 ./mach build --release --with-${{ env.LAYOUT }}
+          python3 ./mach build --release
       - name: Smoketest
         run: python3 ./mach smoketest
       - name: Script tests
         run: ./mach test-scripts
       - name: Unit tests
         if: ${{ inputs.unit-tests || github.ref_name == 'try-mac' }}
-        run: python3 ./mach test-unit --release --with-${{ env.LAYOUT }}
+        run: python3 ./mach test-unit --release
       - name: Package
         run: python3 ./mach package --release
       - name: Package smoketest
         run: ./etc/ci/macos_package_smoketest.sh target/release/servo-tech-demo.dmg
       - name: Rename build timing
-        run: cp -r target/cargo-timings target/cargo-timings-macos-${{ env.LAYOUT }}
+        run: cp -r target/cargo-timings target/cargo-timings-macos
       - name: Archive build timing
         uses: actions/upload-artifact@v3
         with:
           name: cargo-timings
           # Using a wildcard here ensures that the archive includes the path.
-          path: target/cargo-timings-*-${{ env.LAYOUT }}
+          path: target/cargo-timings-*
       - name: Upload package
         uses: actions/upload-artifact@v3
         with:
-          name: ${{ env.PACKAGE }}
+          name: mac
           path: target/release/servo-tech-demo.dmg
       - name: Upload
         if: ${{ inputs.upload }}
         run: |
-          python3 ./mach upload-nightly ${{ env.PACKAGE }} --secret-from-environment \
+          python3 ./mach upload-nightly mac --secret-from-environment \
             --github-release-id ${{ inputs.github-release-id }}
         env:
           S3_UPLOAD_CREDENTIALS: ${{ secrets.S3_UPLOAD_CREDENTIALS }}
@@ -100,7 +91,7 @@ jobs:
       - name: Archive binary
         uses: actions/upload-artifact@v3
         with:
-          name: release-${{ env.LAYOUT }}-binary-macos
+          name: release-binary-macos
           path: target.tar.gz
 
   # mac-wpt: