Skip to content
This repository was archived by the owner on Mar 6, 2024. It is now read-only.

Fix pathfilter #33

Merged
merged 3 commits into from
Mar 15, 2023
Merged
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
28 changes: 15 additions & 13 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,20 +31,22 @@ inputs:
- https://github.com/isaacs/minimatch
default: |
!dist/**
!**/*.pb.go
!**/*.lock
!**/*.yaml
!**/*.yml
!**/*.cfg
!**/*.ini
!**/*.mod
!**/*.sum
!**/*.json
!**/*.mmd
!**/*.svg
!**/*.png
!**/*.dot
!*.pb.go
!*.lock
!*.yaml
!*.yml
!*.cfg
!*.toml
!*.ini
!*.mod
!*.sum
!*.json
!*.mmd
!*.svg
!*.png
!*.dot
!**/gen/**
!**/_gen/**
!**/vendor/**
system_message:
required: false
Expand Down
28 changes: 14 additions & 14 deletions dist/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 17 additions & 13 deletions src/options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -191,23 +191,27 @@ export class PathFilter {
}

check(path: string): boolean {
let include_all = this.rules.length === 0
let matched = false
if (this.rules.length === 0) {
return true
}

let included = false
let excluded = false
let inclusionRuleExists = false

for (const [rule, exclude] of this.rules) {
if (exclude) {
if (minimatch(path, rule)) {
return false
}
include_all = true
} else {
if (minimatch(path, rule)) {
matched = true
include_all = false
if (minimatch(path, rule)) {
if (exclude) {
excluded = true
} else {
return false
included = true
}
}
if (!exclude) {
inclusionRuleExists = true
}
}
return include_all || matched

return (!inclusionRuleExists || included) && !excluded
}
}