diff --git a/apps/vr-tests-react-components/screener.config.js b/apps/vr-tests-react-components/screener.config.js index 5908be77592792..d7a07eafdbcee4 100644 --- a/apps/vr-tests-react-components/screener.config.js +++ b/apps/vr-tests-react-components/screener.config.js @@ -27,9 +27,7 @@ function getCurrentHash() { return ''; } -const baseBranch = process.env.SYSTEM_PULLREQUEST_TARGETBRANCH - ? process.env.SYSTEM_PULLREQUEST_TARGETBRANCH.replace(/^refs\/heads\//, '') - : 'master'; +const baseBranch = process.env.SYSTEM_PULLREQUEST_TARGETBRANCH; // https://github.com/screener-io/screener-storybook#additional-configuration-options const config = { @@ -41,9 +39,7 @@ const config = { baseBranch, failureExitCode: 0, alwaysAcceptBaseBranch: true, - ...(process.env.BUILD_SOURCEBRANCH && process.env.BUILD_SOURCEBRANCH.indexOf('refs/pull') > -1 - ? { commit: getCurrentHash() } - : null), + ...(process.env.BUILD_SOURCEBRANCHNAME === 'merge' ? { commit: getCurrentHash() } : null), baseUrl: `${process.env.DEPLOYURL}/react-components-screener/iframe.html`, }; console.log('Screener config: ' + JSON.stringify({ ...config, apiKey: '...' }, null, 2)); diff --git a/apps/vr-tests/screener.config.js b/apps/vr-tests/screener.config.js index e09461d0f3bfb3..8f5a357642ee69 100644 --- a/apps/vr-tests/screener.config.js +++ b/apps/vr-tests/screener.config.js @@ -27,9 +27,7 @@ function getCurrentHash() { return ''; } -const baseBranch = process.env.SYSTEM_PULLREQUEST_TARGETBRANCH - ? process.env.SYSTEM_PULLREQUEST_TARGETBRANCH.replace(/^refs\/heads\//, '') - : 'master'; +const baseBranch = process.env.SYSTEM_PULLREQUEST_TARGETBRANCH; // https://github.com/screener-io/screener-storybook#additional-configuration-options const config = { @@ -41,9 +39,7 @@ const config = { baseBranch, failureExitCode: 0, alwaysAcceptBaseBranch: true, - ...(process.env.BUILD_SOURCEBRANCH && process.env.BUILD_SOURCEBRANCH.indexOf('refs/pull') > -1 - ? { commit: getCurrentHash() } - : null), + ...(process.env.BUILD_SOURCEBRANCHNAME === 'merge' ? { commit: getCurrentHash() } : null), baseUrl: `${process.env.DEPLOYURL}/react-screener/iframe.html`, }; console.log('Screener config: ' + JSON.stringify({ ...config, apiKey: '...' }, null, 2)); diff --git a/scripts/gulp/tasks/screener.ts b/scripts/gulp/tasks/screener.ts index 08f45429a46710..60635483369f03 100644 --- a/scripts/gulp/tasks/screener.ts +++ b/scripts/gulp/tasks/screener.ts @@ -38,7 +38,7 @@ task('screener:runner', cb => { const screenerConfig = require(screenerConfigPath); let affectedPackages = new Set(); - const isPrBuild = process.env.BUILD_SOURCEBRANCH && process.env.BUILD_SOURCEBRANCH.includes('refs/pull'); + const isPrBuild = process.env.BUILD_SOURCEBRANCHNAME === 'merge'; if (isPrBuild) { affectedPackages = getAffectedPackages(); diff --git a/scripts/screener/screener.config.js b/scripts/screener/screener.config.js index 599016792c851b..541c74c085950b 100644 --- a/scripts/screener/screener.config.js +++ b/scripts/screener/screener.config.js @@ -32,7 +32,7 @@ require('tsconfig-paths').register({ }); const baseBranch = 'master'; -const sourceBranch = process.env.BUILD_SOURCEBRANCH; +const sourceBranchName = process.env.BUILD_SOURCEBRANCHNAME; // https://github.com/screener-io/screener-runner module.exports = { @@ -56,8 +56,7 @@ module.exports = { alwaysAcceptBaseBranch: true, baseBranch, failureExitCode: 0, - - ...(sourceBranch && sourceBranch.indexOf('refs/pull') > -1 + ...(sourceBranchName === 'merge' ? { commit: getCurrentHash(), } diff --git a/scripts/screener/screener.runner.ts b/scripts/screener/screener.runner.ts index 945e3c081a91d9..b06e8ede2d71dc 100644 --- a/scripts/screener/screener.runner.ts +++ b/scripts/screener/screener.runner.ts @@ -97,10 +97,6 @@ export async function screenerRunner(screenerConfig: ScreenerRunnerConfig) { const commit = process.env.SYSTEM_PULLREQUEST_SOURCECOMMITID; // https://github.com/screener-io/screener-runner/blob/2a8291fb1b0219c96c8428ea6644678b0763a1a1/src/ci.js#L101 let branchName = process.env.SYSTEM_PULLREQUEST_SOURCEBRANCH || process.env.BUILD_SOURCEBRANCHNAME; - // remove prefix if exists - if (branchName.indexOf('refs/heads/') === 0) { - branchName = branchName.replace('refs/heads/', ''); - } const checkUrl = await scheduleScreenerBuild(screenerConfig, { build: process.env.BUILD_BUILDID, diff --git a/scripts/tasks/screener.ts b/scripts/tasks/screener.ts index 1404f8fabd60fb..4c2407a6a1c02e 100644 --- a/scripts/tasks/screener.ts +++ b/scripts/tasks/screener.ts @@ -21,7 +21,7 @@ export async function screener() { const packagePath = path.relative(findGitRoot(), process.cwd()); const affectedPackageInfo = Object.values(packageInfos).find(x => x.packagePath === packagePath); let affectedPackages = new Set(); - const isPrBuild = process.env.BUILD_SOURCEBRANCH && process.env.BUILD_SOURCEBRANCH.includes('refs/pull'); + const isPrBuild = process.env.BUILD_SOURCEBRANCHNAME === 'merge'; if (isPrBuild) { affectedPackages = getAffectedPackages();