From 041384bdda48eec9a25403e7fad155ac66ea6b90 Mon Sep 17 00:00:00 2001 From: Joe Haddad Date: Thu, 9 Apr 2020 10:23:04 -0400 Subject: [PATCH] Upgrade `ci-info` (#11758) * Upgrade `ci-info` This adds support for Nevercode, GH Actions, and Render. * Repackage compiled deps * Try to fix test --- packages/next/compiled/ci-info/index.js | 2 +- packages/next/package.json | 2 +- test/integration/build-warnings/test/index.test.js | 2 ++ yarn.lock | 14 +++++++++----- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/packages/next/compiled/ci-info/index.js b/packages/next/compiled/ci-info/index.js index 85afb1bf5d..e884da739b 100644 --- a/packages/next/compiled/ci-info/index.js +++ b/packages/next/compiled/ci-info/index.js @@ -1 +1 @@ -module.exports=function(n,e){"use strict";var t={};function __webpack_require__(e){if(t[e]){return t[e].exports}var a=t[e]={i:e,l:false,exports:{}};n[e].call(a.exports,a,a.exports,__webpack_require__);a.l=true;return a.exports}__webpack_require__.ab=__dirname+"/";function startup(){return __webpack_require__(853)}return startup()}({853:function(n,e,t){"use strict";var a=t(949);var I=process.env;Object.defineProperty(e,"_vendors",{value:a.map(function(n){return n.constant})});e.name=null;e.isPR=null;a.forEach(function(n){var t=Array.isArray(n.env)?n.env:[n.env];var a=t.every(function(n){return checkEnv(n)});e[n.constant]=a;if(a){e.name=n.name;switch(typeof n.pr){case"string":e.isPR=!!I[n.pr];break;case"object":if("env"in n.pr){e.isPR=n.pr.env in I&&I[n.pr.env]!==n.pr.ne}else if("any"in n.pr){e.isPR=n.pr.any.some(function(n){return!!I[n]})}else{e.isPR=checkEnv(n.pr)}break;default:e.isPR=null}}});e.isCI=!!(I.CI||I.CONTINUOUS_INTEGRATION||I.BUILD_NUMBER||I.RUN_ID||e.name||false);function checkEnv(n){if(typeof n==="string")return!!I[n];return Object.keys(n).every(function(e){return I[e]===n[e]})}},949:function(n){n.exports=[{name:"AppVeyor",constant:"APPVEYOR",env:"APPVEYOR",pr:"APPVEYOR_PULL_REQUEST_NUMBER"},{name:"Azure Pipelines",constant:"AZURE_PIPELINES",env:"SYSTEM_TEAMFOUNDATIONCOLLECTIONURI",pr:"SYSTEM_PULLREQUEST_PULLREQUESTID"},{name:"Bamboo",constant:"BAMBOO",env:"bamboo_planKey"},{name:"Bitbucket Pipelines",constant:"BITBUCKET",env:"BITBUCKET_COMMIT",pr:"BITBUCKET_PR_ID"},{name:"Bitrise",constant:"BITRISE",env:"BITRISE_IO",pr:"BITRISE_PULL_REQUEST"},{name:"Buddy",constant:"BUDDY",env:"BUDDY_WORKSPACE_ID",pr:"BUDDY_EXECUTION_PULL_REQUEST_ID"},{name:"Buildkite",constant:"BUILDKITE",env:"BUILDKITE",pr:{env:"BUILDKITE_PULL_REQUEST",ne:"false"}},{name:"CircleCI",constant:"CIRCLE",env:"CIRCLECI",pr:"CIRCLE_PULL_REQUEST"},{name:"Cirrus CI",constant:"CIRRUS",env:"CIRRUS_CI",pr:"CIRRUS_PR"},{name:"AWS CodeBuild",constant:"CODEBUILD",env:"CODEBUILD_BUILD_ARN"},{name:"Codeship",constant:"CODESHIP",env:{CI_NAME:"codeship"}},{name:"Drone",constant:"DRONE",env:"DRONE",pr:{DRONE_BUILD_EVENT:"pull_request"}},{name:"dsari",constant:"DSARI",env:"DSARI"},{name:"GitLab CI",constant:"GITLAB",env:"GITLAB_CI"},{name:"GoCD",constant:"GOCD",env:"GO_PIPELINE_LABEL"},{name:"Hudson",constant:"HUDSON",env:"HUDSON_URL"},{name:"Jenkins",constant:"JENKINS",env:["JENKINS_URL","BUILD_ID"],pr:{any:["ghprbPullId","CHANGE_ID"]}},{name:"Magnum CI",constant:"MAGNUM",env:"MAGNUM"},{name:"Netlify CI",constant:"NETLIFY",env:"NETLIFY_BUILD_BASE",pr:{env:"PULL_REQUEST",ne:"false"}},{name:"Sail CI",constant:"SAIL",env:"SAILCI",pr:"SAIL_PULL_REQUEST_NUMBER"},{name:"Semaphore",constant:"SEMAPHORE",env:"SEMAPHORE",pr:"PULL_REQUEST_NUMBER"},{name:"Shippable",constant:"SHIPPABLE",env:"SHIPPABLE",pr:{IS_PULL_REQUEST:"true"}},{name:"Solano CI",constant:"SOLANO",env:"TDDIUM",pr:"TDDIUM_PR_ID"},{name:"Strider CD",constant:"STRIDER",env:"STRIDER"},{name:"TaskCluster",constant:"TASKCLUSTER",env:["TASK_ID","RUN_ID"]},{name:"TeamCity",constant:"TEAMCITY",env:"TEAMCITY_VERSION"},{name:"Travis CI",constant:"TRAVIS",env:"TRAVIS",pr:{env:"TRAVIS_PULL_REQUEST",ne:"false"}}]}}); \ No newline at end of file +module.exports=function(n,e){"use strict";var t={};function __webpack_require__(e){if(t[e]){return t[e].exports}var a=t[e]={i:e,l:false,exports:{}};n[e].call(a.exports,a,a.exports,__webpack_require__);a.l=true;return a.exports}__webpack_require__.ab=__dirname+"/";function startup(){return __webpack_require__(853)}return startup()}({853:function(n,e,t){"use strict";var a=t(949);var E=process.env;Object.defineProperty(e,"_vendors",{value:a.map(function(n){return n.constant})});e.name=null;e.isPR=null;a.forEach(function(n){var t=Array.isArray(n.env)?n.env:[n.env];var a=t.every(function(n){return checkEnv(n)});e[n.constant]=a;if(a){e.name=n.name;switch(typeof n.pr){case"string":e.isPR=!!E[n.pr];break;case"object":if("env"in n.pr){e.isPR=n.pr.env in E&&E[n.pr.env]!==n.pr.ne}else if("any"in n.pr){e.isPR=n.pr.any.some(function(n){return!!E[n]})}else{e.isPR=checkEnv(n.pr)}break;default:e.isPR=null}}});e.isCI=!!(E.CI||E.CONTINUOUS_INTEGRATION||E.BUILD_NUMBER||E.RUN_ID||e.name||false);function checkEnv(n){if(typeof n==="string")return!!E[n];return Object.keys(n).every(function(e){return E[e]===n[e]})}},949:function(n){n.exports=[{name:"AppVeyor",constant:"APPVEYOR",env:"APPVEYOR",pr:"APPVEYOR_PULL_REQUEST_NUMBER"},{name:"Azure Pipelines",constant:"AZURE_PIPELINES",env:"SYSTEM_TEAMFOUNDATIONCOLLECTIONURI",pr:"SYSTEM_PULLREQUEST_PULLREQUESTID"},{name:"Bamboo",constant:"BAMBOO",env:"bamboo_planKey"},{name:"Bitbucket Pipelines",constant:"BITBUCKET",env:"BITBUCKET_COMMIT",pr:"BITBUCKET_PR_ID"},{name:"Bitrise",constant:"BITRISE",env:"BITRISE_IO",pr:"BITRISE_PULL_REQUEST"},{name:"Buddy",constant:"BUDDY",env:"BUDDY_WORKSPACE_ID",pr:"BUDDY_EXECUTION_PULL_REQUEST_ID"},{name:"Buildkite",constant:"BUILDKITE",env:"BUILDKITE",pr:{env:"BUILDKITE_PULL_REQUEST",ne:"false"}},{name:"CircleCI",constant:"CIRCLE",env:"CIRCLECI",pr:"CIRCLE_PULL_REQUEST"},{name:"Cirrus CI",constant:"CIRRUS",env:"CIRRUS_CI",pr:"CIRRUS_PR"},{name:"AWS CodeBuild",constant:"CODEBUILD",env:"CODEBUILD_BUILD_ARN"},{name:"Codeship",constant:"CODESHIP",env:{CI_NAME:"codeship"}},{name:"Drone",constant:"DRONE",env:"DRONE",pr:{DRONE_BUILD_EVENT:"pull_request"}},{name:"dsari",constant:"DSARI",env:"DSARI"},{name:"GitHub Actions",constant:"GITHUB_ACTIONS",env:"GITHUB_ACTIONS",pr:{GITHUB_EVENT_NAME:"pull_request"}},{name:"GitLab CI",constant:"GITLAB",env:"GITLAB_CI"},{name:"GoCD",constant:"GOCD",env:"GO_PIPELINE_LABEL"},{name:"Hudson",constant:"HUDSON",env:"HUDSON_URL"},{name:"Jenkins",constant:"JENKINS",env:["JENKINS_URL","BUILD_ID"],pr:{any:["ghprbPullId","CHANGE_ID"]}},{name:"ZEIT Now",constant:"ZEIT_NOW",env:"NOW_BUILDER"},{name:"Magnum CI",constant:"MAGNUM",env:"MAGNUM"},{name:"Netlify CI",constant:"NETLIFY",env:"NETLIFY",pr:{env:"PULL_REQUEST",ne:"false"}},{name:"Nevercode",constant:"NEVERCODE",env:"NEVERCODE",pr:{env:"NEVERCODE_PULL_REQUEST",ne:"false"}},{name:"Render",constant:"RENDER",env:"RENDER",pr:{IS_PULL_REQUEST:"true"}},{name:"Sail CI",constant:"SAIL",env:"SAILCI",pr:"SAIL_PULL_REQUEST_NUMBER"},{name:"Semaphore",constant:"SEMAPHORE",env:"SEMAPHORE",pr:"PULL_REQUEST_NUMBER"},{name:"Shippable",constant:"SHIPPABLE",env:"SHIPPABLE",pr:{IS_PULL_REQUEST:"true"}},{name:"Solano CI",constant:"SOLANO",env:"TDDIUM",pr:"TDDIUM_PR_ID"},{name:"Strider CD",constant:"STRIDER",env:"STRIDER"},{name:"TaskCluster",constant:"TASKCLUSTER",env:["TASK_ID","RUN_ID"]},{name:"TeamCity",constant:"TEAMCITY",env:"TEAMCITY_VERSION"},{name:"Travis CI",constant:"TRAVIS",env:"TRAVIS",pr:{env:"TRAVIS_PULL_REQUEST",ne:"false"}}]}}); \ No newline at end of file diff --git a/packages/next/package.json b/packages/next/package.json index f3458ce1f7..221805fe34 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -154,7 +154,7 @@ "babel-plugin-dynamic-import-node": "2.3.0", "cache-loader": "4.1.0", "chalk": "2.4.2", - "ci-info": "2.0.0", + "ci-info": "watson/ci-info#f43f6a1cefff47fb361c88cf4b943fdbcaafe540", "compression": "1.7.4", "conf": "5.0.0", "content-type": "1.0.4", diff --git a/test/integration/build-warnings/test/index.test.js b/test/integration/build-warnings/test/index.test.js index 174ff749d8..bd4d110593 100644 --- a/test/integration/build-warnings/test/index.test.js +++ b/test/integration/build-warnings/test/index.test.js @@ -54,6 +54,8 @@ describe('Build warnings', () => { CIRCLECI: '', TRAVIS: '', SYSTEM_TEAMFOUNDATIONCOLLECTIONURI: '', + GITHUB_ACTIONS: '', + GITHUB_EVENT_NAME: '', }, }) expect(stdout).not.toContain('no-cache') diff --git a/yarn.lock b/yarn.lock index e26b73a2a6..65d94a34ec 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4706,16 +4706,20 @@ chrome-trace-event@^1.0.2: dependencies: tslib "^1.9.0" -ci-info@2.0.0, ci-info@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" - integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== - ci-info@^1.5.0: version "1.6.0" resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497" integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A== +ci-info@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" + integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== + +ci-info@watson/ci-info#f43f6a1cefff47fb361c88cf4b943fdbcaafe540: + version "2.0.0" + resolved "https://codeload.github.com/watson/ci-info/tar.gz/f43f6a1cefff47fb361c88cf4b943fdbcaafe540" + cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de" -- GitLab