diff options
| -rw-r--r-- | .github/workflows/pr-conflicts.yml | 4 | ||||
| -rwxr-xr-x | scripts/build-vyos-image | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/pr-conflicts.yml b/.github/workflows/pr-conflicts.yml index 96040cd6..2fd0bb42 100644 --- a/.github/workflows/pr-conflicts.yml +++ b/.github/workflows/pr-conflicts.yml @@ -6,10 +6,10 @@ on: jobs: Conflict_Check: name: 'Check PR status: conflicts and resolution' - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - name: check if PRs are dirty - uses: eps1lon/actions-label-merge-conflict@releases/2.x + uses: eps1lon/actions-label-merge-conflict@v3 with: dirtyLabel: "state: conflict" removeOnDirtyLabel: "state: conflict resolved" diff --git a/scripts/build-vyos-image b/scripts/build-vyos-image index 716a4cde..141da5e2 100755 --- a/scripts/build-vyos-image +++ b/scripts/build-vyos-image @@ -207,7 +207,7 @@ if __name__ == "__main__": sys.exit(1) # Validate characters in version name - if 'version' in args: + if 'version' in args and args['version'] != None: allowed = string.ascii_letters + string.digits + '.' + '-' + '+' if not set(args['version']) <= set(allowed): print(f'Version contained illegal character(s), allowed: {allowed}') |