Skip to content

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

Merged
dbkr merged 4 commits intodevelopfrom
dbkr/non_layered_on_master_2
Feb 26, 2026
Merged

Do non-layered builds when running on master (second version)#32624
dbkr merged 4 commits intodevelopfrom
dbkr/non_layered_on_master_2

Conversation

@dbkr
Copy link
Copy Markdown
Member

@dbkr dbkr commented Feb 24, 2026

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 #32623

Checklist

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 #32623
fi

# Also set up matrix-analytics-events for branch with matching name
if [ "$analytics_events_dep" = "github:matrix-org/matrix-analytics-events#develop" ]; then
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this ever happens. TBH I think we should just nuke this branch match.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, I did wonder

js_sdk_dep=`jq -r '.dependencies["matrix-js-sdk"]' < package.json`
analytics_events_dep=`jq -r '.dependencies["@matrix-org/analytics-events"]' < package.json`

# Set up the js-sdk first (unless package.json pins a specific version)
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# Set up the js-sdk first (unless package.json pins a specific version)
# Set up the js-sdk (unless package.json pins a specific version)

if [ -d matrix-analytics-events ]; then
pushd matrix-analytics-events
js_sdk_dep=`jq -r '.dependencies["matrix-js-sdk"]' < package.json`
analytics_events_dep=`jq -r '.dependencies["@matrix-org/analytics-events"]' < package.json`
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unused?

@dbkr dbkr added this pull request to the merge queue Feb 26, 2026
Merged via the queue into develop with commit d584b8b Feb 26, 2026
42 checks passed
@dbkr dbkr deleted the dbkr/non_layered_on_master_2 branch February 26, 2026 09:23
@t3chguy t3chguy added T-Task Tasks for the team like planning and removed T-Defect labels Mar 3, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

T-Task Tasks for the team like planning

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants