labels: fix lib/src bucket for src/ changes

This makes the `lib / src` bucket label also include files changes in `src/`. Previously it only was exclusive for `lib/` files.

Author: phillipj

lib/node-labels.js

@@ -130,19 +130,19 @@ const exclusiveLabelsMap = new Map([
 [/^benchmark\//,'benchmark']
 ])
 
-functionresolveLabels(filepathsChanged,baseBranch,limitLib=true){
+functionresolveLabels(filepathsChanged,baseBranch,limitLabels=true){
 constexclusiveLabels=matchExclusiveSubSystem(filepathsChanged)
 
 if(typeofbaseBranch!=='string'){
 if(typeofbaseBranch==='boolean'){
-limitLib=baseBranch
+limitLabels=baseBranch
 }
 baseBranch=''
 }
 
 constlabels=(exclusiveLabels.length>0)
  ? exclusiveLabels
- : matchAllSubSystem(filepathsChanged,limitLib)
+ : matchAllSubSystem(filepathsChanged,limitLabels)
 
 // Add version labels if PR is made against a version branch
 constm=/^(v\d+\.(?:\d+|x))(?:-staging|$)/.exec(baseBranch)
@@ -195,13 +195,13 @@ function matchExclusiveSubSystem (filepathsChanged){
 returnisExclusive ? labels : []
 }
 
-functionmatchAllSubSystem(filepathsChanged,limitLib){
+functionmatchAllSubSystem(filepathsChanged,limitLabels){
 returnmatchSubSystemsByRegex(
-subSystemLabelsMap,filepathsChanged,limitLib)
+subSystemLabelsMap,filepathsChanged,limitLabels)
 }
 
-functionmatchSubSystemsByRegex(rxLabelsMap,filepathsChanged,limitLib){
-constjsLabelCount=[]
+functionmatchSubSystemsByRegex(rxLabelsMap,filepathsChanged,limitLabels){
+constlabelCount=[]
 // by putting matched labels into a map, we avoid duplicate labels
 constlabelsMap=filepathsChanged.reduce((map,filepath)=>{
 constmappedSubSystems=mappedSubSystemsForFile(rxLabelsMap,filepath)
@@ -213,16 +213,17 @@ function matchSubSystemsByRegex (rxLabelsMap, filepathsChanged, limitLib){
 
 for(vari=0;i<mappedSubSystems.length;++i){
 constmappedSubSystem=mappedSubSystems[i]
-if(limitLib&&hasJsSubsystemChanges(filepathsChanged,mappedSubSystem)){
-if(jsLabelCount.length>=4){
-for(constjsLabelofjsLabelCount){
-deletemap[jsLabel]
+if(limitLabels&&hasLibOrSrcChanges(filepathsChanged)){
+if(labelCount.length>=4){
+for(constlabeloflabelCount){
+// don't delete the c++ label as we always want that if it has matched
+if(label!=='c++')deletemap[label]
 }
 map['lib / src']=true
 // short-circuit
 returnmap
 }else{
-jsLabelCount.push(mappedSubSystem)
+labelCount.push(mappedSubSystem)
 }
 }
 
@@ -235,9 +236,8 @@ function matchSubSystemsByRegex (rxLabelsMap, filepathsChanged, limitLib){
 returnObject.keys(labelsMap)
 }
 
-functionhasJsSubsystemChanges(filepathsChanged,mappedSubSystem){
-consthasLibChanges=filepathsChanged.some((filepath)=>filepath.startsWith('lib/'))
-returnhasLibChanges&&jsSubsystemList.includes(mappedSubSystem)
+functionhasLibOrSrcChanges(filepathsChanged){
+returnfilepathsChanged.some((filepath)=>filepath.startsWith('lib/')||filepath.startsWith('src/'))
 }
 
 functionmappedSubSystemsForFile(labelsMap,filepath){

test/unit/node-labels.test.js

@@ -235,6 +235,39 @@ tap.test('label: "lib / src" when 5 or more JS sub-systems have been changed', (
 t.end()
 })
 
+// https://github.com/nodejs/node/pull/12366 should have been labelled "lib / src"
+// https://github.com/nodejs/github-bot/issues/137
+tap.test('label: "lib / src" when 5 or more native files have been changed',(t)=>{
+constlabels=nodeLabels.resolveLabels([
+'node.gyp',
+'src/cares_wrap.cc',
+'src/fs_event_wrap.cc',
+'src/node.cc',
+'src/node_api.cc',
+'src/node_buffer.cc',
+'src/node_config.cc',
+'src/node_constants.cc',
+'src/node_contextify.cc',
+'src/node_file.cc',
+'src/node_file.h',
+'src/node_http_parser.cc',
+'src/node_http_parser.h',
+'src/node_i18n.cc',
+'src/node_revert.cc',
+'src/node_serdes.cc',
+'src/node_zlib.cc',
+'src/process_wrap.cc',
+'src/signal_wrap.cc',
+'src/string_bytes.cc',
+'src/timer_wrap.cc',
+'src/uv.cc'
+])
+
+t.same(labels,['c++','lib / src'])
+
+t.end()
+})
+
 // https://github.com/nodejs/node/pull/7488 wrongfully labelled with "lib / src"
 tap.test('label: not "lib / src" when only deps have been changed',(t)=>{
 constlabels=nodeLabels.resolveLabels([