Skip to content

jenkins: don't skip osx release sources build for 10.x #2282

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.

Sign up for GitHub

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

Merged
rvagg merged 1 commit into from
Apr 12, 2020
Merged

jenkins: don't skip osx release sources build for 10.x #2282

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions jenkins/scripts/VersionSelectorScript.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def buildExclusions = [

// OSX ---------------------------------------------------
[ /^osx1010/, testType, gte(11) ],
[ /^osx1010/, releaseType, allVer ],
[ /^osx1010(?!-release-sources)/, releaseType, allVer ],
[ /^osx1011/, testType, gte(14) ],
[ /^osx1011/, releaseType, allVer ],
// osx1015 enabled for all, and builds all releases to support notarization
Expand All @@ -116,8 +116,6 @@ def buildExclusions = [

// Source / headers / docs -------------------------------
[ /^osx1010-release-sources$/, releaseType, gte(11) ],
[ /^osx1011-release-sources$/, releaseType, lt(11) ],
[ /^osx1011-release-sources$/, releaseType, gte(12) ],

@richardlau richardlau Apr 10, 2020

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.

Unless we've removed osx1011-release-sources from the job in the release CI, do we not need to still exclude ^osx1011-release-sources$ for Node.js 12+ to prevent two source jobs running on 12+ (one on osx1011-release-sources and one on centos7-release-sources)?

@BethGriggs BethGriggs Apr 10, 2020

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.

@richardlau I can confirm that osx1011-release-sources is still a tick-able configuration in release build job (if that helps, I'm aware that you cannot access it to check.)

@rvagg rvagg Apr 12, 2020

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

@richardlau food-gun again, this one certainly does support flipping from exclude to include!

I've removed all the osx1011 labels (cc @AshCripps) from iojs+release and the pkg & tar labels for osx1010, leaving only osx1010-release-sources.

https://github.com/nodejs/jenkins-config-release/commit/93d3ad13a52a108dea7e37e1463848d1bf4b6405

-        <string>osx1010-release-pkg</string>
         <string>osx1010-release-sources</string>
-        <string>osx1010-release-tar</string>
-        <string>osx1011-release-pkg</string>
-        <string>osx1011-release-sources</string>
-        <string>osx1011-release-tar</string>
         <string>osx1015-release-pkg</string>
         <string>osx1015-release-tar</string>

[ /^centos7-release-sources$/, releaseType, lt(12) ],

// -------------------------------------------------------
Expand Down