Skip to content

Commit

Permalink
Branch setup
Browse files Browse the repository at this point in the history
  • Loading branch information
maxirmx committed Nov 16, 2023
1 parent aa11f73 commit a815e32
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
1 change: 1 addition & 0 deletions .github/workflows/windows-msys2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ on:
push:
branches:
- main
- maxirmx-2147-windows-ci
- 'release/**'
paths-ignore:
- '/*.sh'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/windows-native.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ on:
push:
branches:
- main
- maxirmx-2147-windows-ci
- 'release/**'
paths-ignore:
- '/*.sh'
Expand Down
11 changes: 6 additions & 5 deletions src/tests/cli_common.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,9 @@ def is_windows():

def path_for_gpg(path):
# GPG built for mingw/msys doesn't work with Windows paths
if re.match(r'^[a-z]:[\\\/].*', path.lower()):
path = '/' + path[0] + '/' + path[3:].replace('\\', '/')
if sys.platform.startswith('msys'):
if re.match(r'^[a-z]:[\\\/].*', path.lower()):
path = '/' + path[0] + '/' + path[3:].replace('\\', '/')
return path

def raise_err(msg, log = None):
Expand Down Expand Up @@ -100,7 +101,7 @@ def rnp_file_path(relpath, check = True):

def run_proc_windows(proc, params, stdin=None):
exe = os.path.basename(proc)
# test special quote cases
# test special quote cases
params = list(map(lambda st: st.replace('"', '\\"'), params))
# We need to escape empty parameters/ones with spaces with quotes
params = tuple(map(lambda st: st if (st and not any(x in st for x in [' ','\r','\t'])) else '"%s"' % st, [exe] + params))
Expand Down Expand Up @@ -176,9 +177,9 @@ def run_proc_windows(proc, params, stdin=None):
err = file_text(stderr_path).replace('\r\n', '\n')
os.unlink(stdout_path)
os.unlink(stderr_path)
if stdin:
if stdin:
os.unlink(stdin_path)
if passfo:
if passfo:
os.unlink(pass_path)
logging.debug(err.strip())
logging.debug(out.strip())
Expand Down

0 comments on commit a815e32

Please sign in to comment.