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

Update expected assets for v10.x and add v14.x #2278

Merged
merged 3 commits into from
Apr 13, 2020

Conversation

richardlau
Copy link
Member

cc @nodejs/releasers

`docs/apilinks.json` was added in v10.15.3.

Refs: nodejs/node#25019
Refs: nodejs#1673

Signed-off-by: Richard Lau <riclau@uk.ibm.com>
Signed-off-by: Richard Lau <riclau@uk.ibm.com>
@rvagg
Copy link
Member

rvagg commented Apr 9, 2020

@BethGriggs can you confirm you're getting a warning when releasing for apilinks.json being there when it shouldn't?

Running this on the server and pretending that the dist directory is the staging directory, which is not going to be exactly what the releaser sees ("already promoted") but does show the unexpected apilinks.json:

$ node /home/staging/tools/promote/check_assets.js /home/dist/nodejs/release/v10.20.0/ /home/dist/nodejs/release/v10.20.0/
... Checking assets
... Expecting a total of 40 assets for v10.x
... 0 assets waiting in staging
... 41 assets already promoted
 ✓  Complete set of expected assets in place for v10.x
 ✖  The following assets were already promoted but are not expected for v10.x:
    • docs/apilinks.json
    Does the expected assets list for v10.x need to be updated?
    https://github.com/nodejs/build/tree/master/ansible/www-standalone/tools/promote/expected_assets/v10.x
    Promote if you are certain this is the the correct course of action

@BethGriggs
Copy link
Member

@rvagg yes I remember querying this warning last year and being told the release was good to promote (cannot remember the medium, GitHub/IRC). Since then it has become BAU expecting it (just assuming it was a v10.x quirk) and with v10.x releases having a larger cadence it looks like I dropped the ball on updating the expected assets, sorry! Will raise PR's/issues for any future warnings so they don't fall into the trap of becoming BAU again.

@rvagg
Copy link
Member

rvagg commented Apr 9, 2020

Thanks @BethGriggs, good to know it works at least.

We may need to wait for resolution on sunos builds for the 14.x expected assets as per discussion in #2168. Will need a VersionSelectorScript change to cement it.

@richardlau
Copy link
Member Author

Removed smartos binaries from the v14.x expected assets as per #2283 and discussion in #2168.

@BethGriggs
Copy link
Member

BethGriggs commented Apr 12, 2020

FWIW this is what I see today:

# Promoting v10.20.1...
... Checking assets
... Expecting a total of 40 assets for v10.x
... 42 assets waiting in staging
... 0 assets already promoted
 ✓  Complete set of expected assets in place for v10.x
 ✖  The following assets were found in staging but are not expected for v10.x:
    • docs/apilinks.json
    • docs/previous-versions.json
    Does the expected assets list for v10.x need to be updated?
    https://github.com/nodejs/build/tree/master/ansible/www-standalone/tools/promote/expected_assets/v10.x
    Promote if you are certain this is the the correct course of action

I think this is both a timing issue and that I didn't pull nodejs/node#32728 into the v10.20.0 rebuild v10.20.1 means docs/previous-versions.json has now appeared. Can I manually remove docs/previous-versions.json from staging?

@richardlau
Copy link
Member Author

FWIW this is what I see today:

# Promoting v10.20.1...
... Checking assets
... Expecting a total of 40 assets for v10.x
... 42 assets waiting in staging
... 0 assets already promoted
 ✓  Complete set of expected assets in place for v10.x
 ✖  The following assets were found in staging but are not expected for v10.x:
    • docs/apilinks.json
    • docs/previous-versions.json
    Does the expected assets list for v10.x need to be updated?
    https://github.com/nodejs/build/tree/master/ansible/www-standalone/tools/promote/expected_assets/v10.x
    Promote if you are certain this is the the correct course of action

I think this is both a timing issue and that I didn't pull nodejs/node#32728 into the v10.20.0 rebuild v10.20.1 means docs/previous-versions.json has now appeared. Can I manually remove docs/previous-versions.json from staging?

Yes, manually removing that file will be fine.

@BethGriggs
Copy link
Member

Ran the following:

dist@infra-digitalocean-ubuntu1604-x64-1:/home/staging/nodejs/release/v10.20.1$ ls -al docs/previous-versions.json 
-rw-rw-r-- 1 staging staging 201 Apr 12 12:00 docs/previous-versions.json
dist@infra-digitalocean-ubuntu1604-x64-1:/home/staging/nodejs/release/v10.20.1$ rm docs/previous-versions.json

Now get the following, as expected until this is merged:

# Promoting v10.20.1...
... Checking assets
... Expecting a total of 40 assets for v10.x
... 41 assets waiting in staging
... 0 assets already promoted
 ✓  Complete set of expected assets in place for v10.x
 ✖  The following assets were found in staging but are not expected for v10.x:
    • docs/apilinks.json
    Does the expected assets list for v10.x need to be updated?
    https://github.com/nodejs/build/tree/master/ansible/www-standalone/tools/promote/expected_assets/v10.x
    Promote if you are certain this is the the correct course of action
Are you sure you want to promote the v10.20.1 assets? [y/n] 

@rvagg rvagg merged commit 2c43856 into nodejs:master Apr 13, 2020
@BethGriggs
Copy link
Member

When I promoted 14.x this didn't seem to take effect - does a clone somewhere need to be updated?

# Promoting v14.0.0...
... Checking assets
 ⚠  No expected asset list is available for v14.x, using the list for v13.x instead
    Should a new list be created for v14.x?
    https://github.com/nodejs/build/tree/master/ansible/www-standalone/tools/promote/expected_assets/v14.x
... Expecting a total of 39 assets for v14.x
... 37 assets waiting in staging
... 0 assets already promoted
 ⚠  The following assets are expected for v14.x but are currently missing from staging:
    • node-v14.0.0-sunos-x64.tar.gz
    • node-v14.0.0-sunos-x64.tar.xz
    Promote if you are certain this is the the correct course of action

@rvagg
Copy link
Member

rvagg commented Apr 22, 2020

whoops, it's one thing to change it here, it's another to have it changed on the server! I've synced that directory now and it should be good for future releases

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.

5 participants