Skip to content

Conversation

@rvagg
Copy link
Member

Fixes problem of having /docs/api and /docs/doc/api directories in our distributions, caused by a double (or more) build on CI server prior to promotion as reported and discussed in #12833.

scp -pr out/doc/ server:.../docs/ first sees a missing /docs/ directory so puts the out/doc/ contents into /docs/, second pass it sees an existing directory so makes a new /docs/doc/ directory for the upload.

This fix ensures the directory exists initially and then does an scp of the contents of the out/doc/ directory rather than the directory itself.

Needs to be backported to all active release lines once confirmed working.

@nodejs-github-botnodejs-github-bot added the build Issues and PRs related to build files or the CI. label May 11, 2017
@rvagg
Copy link
MemberAuthor

/cc @nodejs/build

note on the branch name .. that I forgot to change .. initial solution switched to rsync with --delete which is much nicer but I decided to go with a more minimal change in the end.

@rvagg
Copy link
MemberAuthor

tested this @ https://nodejs.org/download/test/v8.0.0-test201705113064a21223/docs/ and it's fine, it's not a perfect replication of a release build as the promotion is automatic so I had to un-promote the docs before running again, also I had to add in the patch in #12958 to get it to build, but I believe it's close enough to realistic.

Copy link
Member

@joaocgreisjoaocgreis left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@mhdawsonmhdawson left a comment

Choose a reason for hiding this comment

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

LGTM

@joaocgreis
Copy link
Member

I can land tomorrow if there's no objection. @rvagg let me know if you want to land this yourself.

@addaleax
Copy link
Member

Landed in 7a1dc1f

addaleax pushed a commit that referenced this pull request May 23, 2017
Fixes: #12833 PR-URL: #12957 Reviewed-By: João Reis <[email protected]> Reviewed-By: Gibson Fahnestock <[email protected]> Reviewed-By: Michael Dawson <[email protected]>
jasnell pushed a commit that referenced this pull request May 24, 2017
Fixes: #12833 PR-URL: #12957 Reviewed-By: João Reis <[email protected]> Reviewed-By: Gibson Fahnestock <[email protected]> Reviewed-By: Michael Dawson <[email protected]>
jasnell pushed a commit that referenced this pull request May 28, 2017
Fixes: #12833 PR-URL: #12957 Reviewed-By: João Reis <[email protected]> Reviewed-By: Gibson Fahnestock <[email protected]> Reviewed-By: Michael Dawson <[email protected]>
@jasnelljasnell mentioned this pull request May 28, 2017
@gibfahngibfahn mentioned this pull request Jun 15, 2017
3 tasks
MylesBorins pushed a commit that referenced this pull request Jul 17, 2017
Fixes: #12833 PR-URL: #12957 Reviewed-By: João Reis <[email protected]> Reviewed-By: Gibson Fahnestock <[email protected]> Reviewed-By: Michael Dawson <[email protected]>
MylesBorins pushed a commit that referenced this pull request Jul 17, 2017
Fixes: #12833 PR-URL: #12957 Reviewed-By: João Reis <[email protected]> Reviewed-By: Gibson Fahnestock <[email protected]> Reviewed-By: Michael Dawson <[email protected]>
@MylesBorinsMylesBorins mentioned this pull request Jul 18, 2017
@MylesBorinsMylesBorins mentioned this pull request Sep 20, 2017
MylesBorins pushed a commit that referenced this pull request Oct 25, 2017
Fixes: #12833 PR-URL: #12957 Reviewed-By: João Reis <[email protected]> Reviewed-By: Gibson Fahnestock <[email protected]> Reviewed-By: Michael Dawson <[email protected]>
@MylesBorinsMylesBorins mentioned this pull request Oct 25, 2017
rvagg added a commit to rvagg/io.js that referenced this pull request Nov 23, 2018
rvagg added a commit that referenced this pull request Nov 28, 2018
PR-URL: #24575 Refs: #24551 Refs: #12958 Refs: #12957 Refs: #8325 Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Daniel Bevenius <[email protected]> Reviewed-By: Richard Lau <[email protected]>
rvagg added a commit that referenced this pull request Nov 28, 2018
PR-URL: #24575 Refs: #24551 Refs: #12958 Refs: #12957 Refs: #8325 Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Daniel Bevenius <[email protected]> Reviewed-By: Richard Lau <[email protected]>
rvagg added a commit that referenced this pull request Nov 28, 2018
PR-URL: #24575 Refs: #24551 Refs: #12958 Refs: #12957 Refs: #8325 Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Daniel Bevenius <[email protected]> Reviewed-By: Richard Lau <[email protected]>
rvagg added a commit that referenced this pull request Nov 28, 2018
PR-URL: #24575 Refs: #24551 Refs: #12958 Refs: #12957 Refs: #8325 Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Daniel Bevenius <[email protected]> Reviewed-By: Richard Lau <[email protected]>
rvagg added a commit that referenced this pull request Nov 28, 2018
PR-URL: #24575 Refs: #24551 Refs: #12958 Refs: #12957 Refs: #8325 Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Daniel Bevenius <[email protected]> Reviewed-By: Richard Lau <[email protected]>
MylesBorins pushed a commit that referenced this pull request Nov 29, 2018
PR-URL: #24575 Refs: #24551 Refs: #12958 Refs: #12957 Refs: #8325 Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Daniel Bevenius <[email protected]> Reviewed-By: Richard Lau <[email protected]>
MylesBorins pushed a commit that referenced this pull request Dec 3, 2018
PR-URL: #24575 Refs: #24551 Refs: #12958 Refs: #12957 Refs: #8325 Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Daniel Bevenius <[email protected]> Reviewed-By: Richard Lau <[email protected]>
MylesBorins pushed a commit that referenced this pull request Dec 26, 2018
PR-URL: #24575 Refs: #24551 Refs: #12958 Refs: #12957 Refs: #8325 Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Daniel Bevenius <[email protected]> Reviewed-By: Richard Lau <[email protected]>
refack pushed a commit to refack/node that referenced this pull request Jan 14, 2019
PR-URL: nodejs#24575 Refs: nodejs#24551 Refs: nodejs#12958 Refs: nodejs#12957 Refs: nodejs#8325 Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Daniel Bevenius <[email protected]> Reviewed-By: Richard Lau <[email protected]>
rvagg added a commit that referenced this pull request Feb 28, 2019
PR-URL: #24575 Refs: #24551 Refs: #12958 Refs: #12957 Refs: #8325 Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Daniel Bevenius <[email protected]> Reviewed-By: Richard Lau <[email protected]>
BethGriggs pushed a commit that referenced this pull request Mar 7, 2019
PR-URL: #24575 Refs: #24551 Refs: #12958 Refs: #12957 Refs: #8325 Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Daniel Bevenius <[email protected]> Reviewed-By: Richard Lau <[email protected]>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

buildIssues and PRs related to build files or the CI.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants

@rvagg@joaocgreis@addaleax@mhdawson@gibfahn@MylesBorins@nodejs-github-bot