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

build: avoid /docs/api and /docs/doc/api upload #12957

Closed
wants to merge 1 commit into
base: master
from

Conversation

Projects
None yet
7 participants
@rvagg
Member

rvagg commented May 11, 2017

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.

@rvagg

This comment has been minimized.

Show comment
Hide comment
@rvagg

rvagg May 11, 2017

Member

/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.

Member

rvagg commented May 11, 2017

/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

This comment has been minimized.

Show comment
Hide comment
@rvagg

rvagg May 11, 2017

Member

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.

Member

rvagg commented May 11, 2017

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.

@joaocgreis

LGTM

@mhdawson

LGTM

@joaocgreis

This comment has been minimized.

Show comment
Hide comment
@joaocgreis

joaocgreis May 23, 2017

Member

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

Member

joaocgreis commented May 23, 2017

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

@addaleax

This comment has been minimized.

Show comment
Hide comment
@addaleax

addaleax May 23, 2017

Member

Landed in 7a1dc1f

Member

addaleax commented May 23, 2017

Landed in 7a1dc1f

@addaleax addaleax closed this May 23, 2017

addaleax added a commit that referenced this pull request May 23, 2017

build: avoid /docs/api and /docs/doc/api upload
Fixes: #12833
PR-URL: #12957
Reviewed-By: João Reis <reis@janeasystems.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Michael Dawson <mhdawson@ibm.com>

jasnell added a commit that referenced this pull request May 24, 2017

build: avoid /docs/api and /docs/doc/api upload
Fixes: #12833
PR-URL: #12957
Reviewed-By: João Reis <reis@janeasystems.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Michael Dawson <mhdawson@ibm.com>

jasnell added a commit that referenced this pull request May 28, 2017

build: avoid /docs/api and /docs/doc/api upload
Fixes: #12833
PR-URL: #12957
Reviewed-By: João Reis <reis@janeasystems.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Michael Dawson <mhdawson@ibm.com>

@jasnell jasnell referenced this pull request May 28, 2017

Closed

8.0.0 Release Proposal #12220

@gibfahn gibfahn referenced this pull request Jun 15, 2017

Closed

Auditing for 6.11.1 #230

2 of 3 tasks complete

MylesBorins added a commit that referenced this pull request Jul 17, 2017

build: avoid /docs/api and /docs/doc/api upload
Fixes: #12833
PR-URL: #12957
Reviewed-By: João Reis <reis@janeasystems.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Michael Dawson <mhdawson@ibm.com>

MylesBorins added a commit that referenced this pull request Jul 17, 2017

build: avoid /docs/api and /docs/doc/api upload
Fixes: #12833
PR-URL: #12957
Reviewed-By: João Reis <reis@janeasystems.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Michael Dawson <mhdawson@ibm.com>

@MylesBorins MylesBorins referenced this pull request Jul 18, 2017

Merged

v6.11.2 proposal #14356

@MylesBorins MylesBorins referenced this pull request Sep 20, 2017

Closed

v4.8.5 proposal #15507

MylesBorins added a commit that referenced this pull request Oct 25, 2017

build: avoid /docs/api and /docs/doc/api upload
Fixes: #12833
PR-URL: #12957
Reviewed-By: João Reis <reis@janeasystems.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Michael Dawson <mhdawson@ibm.com>

@MylesBorins MylesBorins referenced this pull request Oct 25, 2017

Merged

v4.8.6 proposal #16500

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment