Skip to content

Screener cleanup #24170

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

Closed
ralucapelin wants to merge 17 commits into from
Closed

Screener cleanup #24170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
090e9f1
Add screener workflows
Jul 27, 2022
a9a8f47
Remove screener jobs from pipeline
Jul 27, 2022
924bbd2
Additional documentation
Jul 27, 2022
8974b12
Add checkout action option
Jul 27, 2022
2a371d0
Make changes suggested in PR review
Jul 28, 2022
8ea283b
Add change suggested by review
Jul 28, 2022
8cd922d
Restore pipeline from master branch
Jul 28, 2022
1cc9223
Restore fetch path from master branch
Jul 28, 2022
9304e1d
Update step name
ralucapelin Jul 28, 2022
05814f9
Make changes proposed in review
Jul 28, 2022
ebc5667
Merge branch 'screenerChecksTransition' of https://github.com/microso…
Jul 28, 2022
cf3001d
Add comments regarding possible changes
Aug 1, 2022
ced3938
Change config option condition
Aug 1, 2022
694a542
Remove unnecessary check
Aug 1, 2022
8c84f3a
Change isPrBuild conditions
Aug 3, 2022
1f69671
Merge with master
Aug 3, 2022
455e2d0
Change branch variable definition
Aug 8, 2022
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
8 changes: 2 additions & 6 deletions apps/vr-tests-react-components/screener.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand All @@ -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));
Expand Down
8 changes: 2 additions & 6 deletions apps/vr-tests/screener.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand All @@ -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));
Expand Down
2 changes: 1 addition & 1 deletion scripts/gulp/tasks/screener.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ task('screener:runner', cb => {

const screenerConfig = require(screenerConfigPath);
let affectedPackages = new Set<string>();
const isPrBuild = process.env.BUILD_SOURCEBRANCH && process.env.BUILD_SOURCEBRANCH.includes('refs/pull');
const isPrBuild = process.env.BUILD_SOURCEBRANCHNAME === 'merge';

if (isPrBuild) {
affectedPackages = getAffectedPackages();
Expand Down
5 changes: 2 additions & 3 deletions scripts/screener/screener.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand All @@ -56,8 +56,7 @@ module.exports = {
alwaysAcceptBaseBranch: true,
baseBranch,
failureExitCode: 0,

...(sourceBranch && sourceBranch.indexOf('refs/pull') > -1
...(sourceBranchName === 'merge'
? {
commit: getCurrentHash(),
}
Expand Down
4 changes: 0 additions & 4 deletions scripts/screener/screener.runner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion scripts/tasks/screener.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<string>();
const isPrBuild = process.env.BUILD_SOURCEBRANCH && process.env.BUILD_SOURCEBRANCH.includes('refs/pull');
const isPrBuild = process.env.BUILD_SOURCEBRANCHNAME === 'merge';

if (isPrBuild) {
affectedPackages = getAffectedPackages();
Expand Down