Do non-layered builds when running on master (second version) (#32624)

* Do non-layered builds when running on master (second version)

Hopefully this will fix the release as it looks like we've introduced
backwards incompat changes in the js-sdk between the RC and the release,
which have now broken as we were incorrectly using the develop js-sdk for
release builds.

Replaces https://github.com/element-hq/element-web/pull/32623

* remove matrix-analytics-events branch match

* Unused line

scripts/layered.sh

@@ -20,27 +20,21 @@ pnpm install --frozen-lockfile
 export PR_ORG=element-hq
 export PR_REPO=element-web
 
-# Set up the js-sdk first
+js_sdk_dep=`jq -r '.dependencies["matrix-js-sdk"]' < package.json`
-scripts/fetchdep.sh matrix-org matrix-js-sdk develop
-pushd matrix-js-sdk
-[ -n "$JS_SDK_GITHUB_BASE_REF" ] && git fetch --depth 1 origin $JS_SDK_GITHUB_BASE_REF && git checkout $JS_SDK_GITHUB_BASE_REF
-pnpm link
-pnpm install --frozen-lockfile
-popd
 
-# Also set up matrix-analytics-events for branch with matching name
+# Set up the js-sdk first (unless package.json pins a specific version)
-scripts/fetchdep.sh matrix-org matrix-analytics-events
+if [ "$js_sdk_dep" = "github:matrix-org/matrix-js-sdk#develop" ]; then
-# We don't pass a default branch so cloning may fail when we are not in a PR
+    scripts/fetchdep.sh matrix-org matrix-js-sdk develop
-# This is expected as this project does not share a release cycle but we still branch match it
+    pushd matrix-js-sdk
-if [ -d matrix-analytics-events ]; then
+    [ -n "$JS_SDK_GITHUB_BASE_REF" ] && git fetch --depth 1 origin $JS_SDK_GITHUB_BASE_REF && git checkout $JS_SDK_GITHUB_BASE_REF
-    pushd matrix-analytics-events
     pnpm link
     pnpm install --frozen-lockfile
-    pnpm build:ts
     popd
+
+    # Link into into element-web
+    pnpm link matrix-js-sdk
+else
+    echo "Skipping matrix-js-sdk fetch and link as package.json pins $js_sdk_dep"
 fi
 
-# Link the layers into element-web
-pnpm link matrix-js-sdk
-[ -d matrix-analytics-events ] && pnpm link @matrix-org/analytics-events
 pnpm install --frozen-lockfile $@