Skip to content

Create specification/wasm-latest#2064

Merged
tlively merged 3 commits into
mainfrom
wasm-latest-spectec
Feb 2, 2026
Merged

Create specification/wasm-latest#2064
tlively merged 3 commits into
mainfrom
wasm-latest-spectec

Conversation

@tlively
Copy link
Copy Markdown
Member

@tlively tlively commented Jan 30, 2026

To give proposal repos a consistent location to make changes to the
SpecTec source and to simplify merging those proposals back into the
spec repo once they are completed. The new directory is a copy of the
wasm-3.0 directory in its current state, created via a sequence of git
mv and merge operations to preserve the blame history in both
directories.

Also add a new CI script ensuring that the contents of wasm-latest match
the contents of the highest versioned wasm-X.Y directory. This will
ensure that bug fixes are applied in both directories.

@tlively tlively requested a review from rossberg January 30, 2026 19:41
@tlively tlively changed the title temporarily move wasm-3.0 to preserve history Create specification/wasm-latest Jan 30, 2026
@tlively tlively force-pushed the wasm-latest-spectec branch from 876018f to 2e3e94f Compare January 30, 2026 20:00
Copy link
Copy Markdown
Member

@rossberg rossberg left a comment

Choose a reason for hiding this comment

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

Great, thanks!

Two comments:

  • It would be great if the diff check is also invoked locally, e.g., as part of the check target in the specification dir's Makefile. The shell script could live there as well.

  • I just noticed that 6.3-text.modules should be named 6.4-text.modules. This seems like a good time to fix that. :)

uses: actions/checkout@v4
- name: Diff wasm-latest
run: bash .github/workflows/diff-wasm-latest.sh
build-core-spec:
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.

Nit: newline here?

@rossberg
Copy link
Copy Markdown
Member

rossberg commented Feb 2, 2026

Oh, and I think we also want to change which directory is used for the document build. That should always be latest, to make sense on forks.

Oops, sorry, only saw the follow-up now. :)

@tlively
Copy link
Copy Markdown
Member Author

tlively commented Feb 2, 2026

  • It would be great if the diff check is also invoked locally, e.g., as part of the check target in the specification dir's Makefile. The shell script could live there as well.

But we wouldn't want to run this on forks, right? Since a local development could have both WebAssembly/spec and proposal repos as upstreams, I don't think there's a good way to automatically detect whether this check should run or not locally.

@tlively tlively force-pushed the wasm-latest-spectec branch from 2e3e94f to 5a9f3db Compare February 2, 2026 16:49
@tlively
Copy link
Copy Markdown
Member Author

tlively commented Feb 2, 2026

Well the CI script works :) Now I have to figure out how to pull the latest changes to wasm-3.0 into this cursed merge commit structure...

To give proposal repos a consistent location to make changes to the
SpecTec source and to simplify merging those proposals back into the
spec repo once they are completed. The new directory is a copy of the
wasm-3.0 directory in its current state, created via a sequence of git
mv and merge operations to preserve the blame history in both
directories.

Also add a new CI script ensuring that the contents of wasm-latest match
the contents of the highest versioned wasm-X.Y directory. This will
ensure that bug fixes are applied in both directories.

As a drive-by fix, rename 6.3-text.modules.spectec to
6.4-text.modules.spectec.
@tlively tlively force-pushed the wasm-latest-spectec branch from 5a9f3db to 0e2749e Compare February 2, 2026 17:07
@tlively tlively merged commit 76c81e0 into main Feb 2, 2026
13 checks passed
@tlively
Copy link
Copy Markdown
Member Author

tlively commented Feb 2, 2026

Looks like the fancy moves and merges to preserve history didn't survive the PR process :( We could force push this branch to main, but it might not be worth it. Wdyt?

@rossberg
Copy link
Copy Markdown
Member

rossberg commented Feb 2, 2026

No real surprise, I suppose... Yeah, please push it manually. Especially since there are other PRs in flight that touch the spec, so we already need the history now, I think.

tlively added a commit that referenced this pull request Feb 2, 2026
This reverts commit 76c81e0.

The merge commit necessary to preseve git history in both the wasm-3.0
and wasm-latest directories did not survive the PR process. We will try
again, pushing the commits directly to main.
@tlively tlively deleted the wasm-latest-spectec branch February 3, 2026 00:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants