Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: snapshot support #151

Merged
merged 5 commits into from
May 29, 2018
Merged

WIP: snapshot support #151

merged 5 commits into from
May 29, 2018

Conversation

annevk
Copy link
Member

@annevk annevk commented May 15, 2018

This supports whatwg/wattsi#70.

annevk added a commit to whatwg/html that referenced this pull request May 15, 2018
See whatwg/html-build#151 and whatwg/wattsi#70.

We should probably change wattsi such that everything annotated w-nohtml does not always have to be annotated with w-nosnap...
@annevk annevk force-pushed the annevk/snapshots branch from 76ccc88 to 3840359 Compare May 16, 2018 07:37
@annevk
Copy link
Member Author

annevk commented May 17, 2018

Remaining:

The only thing left is iterating over changed review-drafts resources and calling processSource on them.
@annevk
Copy link
Member Author

annevk commented May 17, 2018

I wonder if we should do more drastic changes such that publishing an RD alone won't also public all other HTML drafts. I need to look again at the setup we have for non-HTML and compare I guess.

build.sh Outdated
perl .post-process-partial-backlink-generator.pl "$HTML_TEMP/wattsi-output/index-snap" > "$COMMIT_DIR/index.html";

cp -p entities/out/entities.json "$HTML_OUTPUT"
cp -p "$HTML_TEMP/wattsi-output/xrefs.json" "$HTML_OUTPUT"
Copy link
Member

Choose a reason for hiding this comment

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

I suppose at some point it may be a good idea to give the snapshots their own copy of all the supporting resources, here and below. But that can be a followup.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah, I was wondering about that. We'll also need to change the source document for that though as currently it assumes everything is relative to the root. And not doing that will require changes to multipage deployments.

@@ -48,20 +47,18 @@ echo "Deploying build output..."
# --chmod=D755,F644 means read-write for user, read-only for others.
rsync --rsh="ssh -o UserKnownHostsFile=known_hosts" \
--archive --chmod=D755,F644 --compress --verbose \
--delete --exclude="$COMMITS_DIR" --exclude=print.pdf \
--delete --exclude="$COMMITS_DIR" --exclude="$REVIEW_DR" \
Copy link
Member

Choose a reason for hiding this comment

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

Typo "DR"

build.sh Outdated
$QUIET || echo
$QUIET || echo "Local wattsi is not present; trying the build server..."

# TODO fix build server
Copy link
Member

Choose a reason for hiding this comment

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

You'll need to pass it the git sha, right? You can assume a sha parameter. Should we also have a build type parameter, or should the server always do default?

Copy link
Member Author

Choose a reason for hiding this comment

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

We'll also need a build type parameter. Unless the server is not used by Travis.

@annevk
Copy link
Member Author

annevk commented May 18, 2018

Note that I haven't tested the Docker scripts myself. If someone is able to do that (after I fix the above nits) it'd be much appreciated.

@annevk
Copy link
Member Author

annevk commented May 18, 2018

I used a "build" parameter for the server btw.

annevk added a commit to whatwg/whatwg.org that referenced this pull request May 18, 2018
domenic added a commit to whatwg/build.whatwg.org that referenced this pull request May 22, 2018
domenic added a commit to whatwg/build.whatwg.org that referenced this pull request May 22, 2018
@domenic
Copy link
Member

domenic commented May 22, 2018

So I realized this requires people building the spec to build it twice every time, once for the living standard and once for the commit snapshot. I was hoping we could have build.sh only build once, and take arguments that allow you to switch between them, and have inside-container.sh call build.sh twice.

Do you think that's doable?

@domenic
Copy link
Member

domenic commented May 22, 2018

Actually, I don't understand how commit snapshots work here at all... the only places COMMIT_DIR shows up is in generateBacklinks, but we never actually do a wattsi build into that directory?

@domenic
Copy link
Member

domenic commented May 22, 2018

Sorry for the stream of consciousness. I see now. Since snapshot is just another variant, like multipage, it gets produced by wattsi. I hope that doesn't add too much to the build times, but it totally makes sense given our current architecture.

domenic added a commit to whatwg/build.whatwg.org that referenced this pull request May 29, 2018
annevk added a commit to whatwg/wattsi that referenced this pull request May 29, 2018
See whatwg/meta#92 for details. And whatwg/html-build#151 and whatwg/html#3689 for changes that are needed as well.
@annevk annevk merged commit c38c237 into master May 29, 2018
@annevk annevk deleted the annevk/snapshots branch May 29, 2018 14:06
annevk added a commit to whatwg/html that referenced this pull request May 29, 2018
See whatwg/meta#92 for details. And whatwg/html-build#151 and whatwg/wattsi#70 for changes that are needed as well.
alice pushed a commit to alice/html that referenced this pull request Jan 8, 2019
See whatwg/meta#92 for details. And whatwg/html-build#151 and whatwg/wattsi#70 for changes that are needed as well.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants