Skip to content
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.

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

Implement filtering the TravisCI build matrix on many more properties #20

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 21 additions & 1 deletion src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,27 @@ function start (id) {
const query = { style: req.query.style }
travis.getLatestBranchBuild(branch).then((build) => {
const filters = {
env: req.query.env
compiler: req.query.compiler,
d: req.query.d,
dart: req.query.dart,
dotnet: req.query.dotnet,
elixir: req.query.elixir,
env: req.query.env,
gemfile: req.query.gemfile,
go: req.query.go,
jdk: req.query.jdk,
mono: req.query.mono,
node_js: req.query.node_js,
os: req.query.os,
osx_image: req.query.osx_image,
otp_release: req.query.otp_release,
php: req.query.php,
python: req.query.python,
rust: req.query.rust,
rvm: req.query.rvm,
scala: req.query.scala,
xcode_scheme: req.query.xcode_scheme,
xcode_sdk: req.query.xcode_sdk
}
const jobs = travis.filterJobs(build.jobs, filters)
const status = travis.aggregateStatus(jobs)
Expand Down
40 changes: 33 additions & 7 deletions src/travis.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,41 @@ export default class TravisClient {
})
}

matchesStringFilter (actual, expected) {
return !expected || (actual == expected)
Copy link

@ghost ghost Jul 13, 2019

Choose a reason for hiding this comment

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

why use ‘!expect’ here?

}

matchesRegexFilter (actual, expectedRegex) {
return !expectedRegex || expectedRegex.test(actual)
}

filterJobs (jobs, filters = {}) {
const { env } = filters
const envRegex = env && new RegExp(`(^| )${env}( |$)`)
const envRegex = filters.env && new RegExp(`(^| )${filters.env}( |$)`)
return jobs.filter((job) => {
const jobEnv = job.config.env || ''
if (envRegex && (!jobEnv || !envRegex.test(jobEnv))) {
return false
}
return true
return (
matchesStringFilter(job.config.compiler, filters.compiler) &&
matchesStringFilter(job.config.d, filters.d) &&
matchesStringFilter(job.config.dart, filters.dart) &&
matchesStringFilter(job.config.dotnet, filters.dotnet) &&
matchesStringFilter(job.config.elixir, filters.elixir) &&
matchesRegexFilter(job.config.env, envRegex) &&
matchesStringFilter(job.config.gemfile, filters.gemfile) &&
matchesStringFilter(job.config.go, filters.go) &&
matchesStringFilter(job.config.jdk, filters.jdk) &&
matchesStringFilter(job.config.mono, filters.mono) &&
matchesStringFilter(job.config.node_js, filters.node_js) &&
matchesStringFilter(job.config.os, filters.os) &&
matchesStringFilter(job.config.osx_image, filters.osx_image) &&
matchesStringFilter(job.config.otp_release, filters.otp_release) &&
matchesStringFilter(job.config.php, filters.php) &&
matchesStringFilter(job.config.python, filters.python) &&
matchesStringFilter(job.config.rust, filters.rust) &&
matchesStringFilter(job.config.rvm, filters.rvm) &&
matchesStringFilter(job.config.scala, filters.scala) &&
matchesStringFilter(job.config.xcode_scheme, filters.xcode_scheme) &&
matchesStringFilter(job.config.xcode_sdk, filters.xcode_sdk) &&
true
)
})
}

Expand Down