diff options
| author | dd <dd@wx.tnyzeq.icu> | 2024-08-16 09:49:36 +0200 |
|---|---|---|
| committer | dd <dd@wx.tnyzeq.icu> | 2024-08-16 09:49:52 +0200 |
| commit | 118ede30510b66ba25b003f9aa15a4235180ae67 (patch) | |
| tree | af9cc914703ed11ae3b713325edd401f892d771b | |
| parent | 9523fb1a1d4a000bc0c73dda4aeb2ca633270627 (diff) | |
| download | vyos-build-118ede30510b66ba25b003f9aa15a4235180ae67.tar.gz vyos-build-118ede30510b66ba25b003f9aa15a4235180ae67.zip | |
build-script: fixed changeset regex matching
| -rw-r--r-- | packages/linux-kernel/Jenkinsfile | 2 | ||||
| -rw-r--r-- | vars/buildPackage.groovy | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/linux-kernel/Jenkinsfile b/packages/linux-kernel/Jenkinsfile index ad7ccd2c..f5b27e4f 100644 --- a/packages/linux-kernel/Jenkinsfile +++ b/packages/linux-kernel/Jenkinsfile @@ -72,4 +72,4 @@ def pkgList = [ ] // Start package build using library function from https://github.com/vyos/vyos-build -buildPackage('Kernel', pkgList, null, true, "(.*/packages/linux-kernel/.+|.*/data/defaults.+)", "ec2_amd64", "REGEXP") +buildPackage('Kernel', pkgList, null, true, "(.*packages/linux-kernel/.+|.*data/defaults.+)", "ec2_amd64", "REGEXP") diff --git a/vars/buildPackage.groovy b/vars/buildPackage.groovy index ab4ce903..344420b8 100644 --- a/vars/buildPackage.groovy +++ b/vars/buildPackage.groovy @@ -44,7 +44,7 @@ def call(description=null, pkgList=null, buildCmd=null, buildArm=false, changesP } when { anyOf { - changeset "${changesPattern}" + changeset pattern: changesPattern, caseSensitive: true, comparator: changesPatternComparator triggeredBy cause: "UserIdCause" } } @@ -140,7 +140,7 @@ def call(description=null, pkgList=null, buildCmd=null, buildArm=false, changesP stage("Finalize") { when { anyOf { - changeset pattern: changesPattern, caseSensitive: true + changeset pattern: changesPattern, caseSensitive: true, comparator: changesPatternComparator triggeredBy cause: "UserIdCause" } } |