mirror of
https://github.com/borgbackup/borg.git
synced 2026-06-13 19:00:44 -04:00
Merge pull request #9543 from ThomasWaldmann/revert-pr-9535
Some checks failed
CI / lint (push) Has been cancelled
CI / security (push) Has been cancelled
CI / asan_ubsan (push) Has been cancelled
CI / native_tests (push) Has been cancelled
CI / vm_tests (Haiku, false, haiku, r1beta5) (push) Has been cancelled
CI / vm_tests (NetBSD, false, netbsd, 10.1) (push) Has been cancelled
CI / vm_tests (OmniOS, false, omnios, r151056) (push) Has been cancelled
CI / vm_tests (OpenBSD, false, openbsd, 7.8) (push) Has been cancelled
CI / vm_tests (borg-freebsd-14-x86_64-gh, FreeBSD, true, freebsd, 14.3) (push) Has been cancelled
CI / windows_tests (push) Has been cancelled
Some checks failed
CI / lint (push) Has been cancelled
CI / security (push) Has been cancelled
CI / asan_ubsan (push) Has been cancelled
CI / native_tests (push) Has been cancelled
CI / vm_tests (Haiku, false, haiku, r1beta5) (push) Has been cancelled
CI / vm_tests (NetBSD, false, netbsd, 10.1) (push) Has been cancelled
CI / vm_tests (OmniOS, false, omnios, r151056) (push) Has been cancelled
CI / vm_tests (OpenBSD, false, openbsd, 7.8) (push) Has been cancelled
CI / vm_tests (borg-freebsd-14-x86_64-gh, FreeBSD, true, freebsd, 14.3) (push) Has been cancelled
CI / windows_tests (push) Has been cancelled
Revert wrong fix, apply correct fix for #9513
This commit is contained in:
commit
857db0532d
2 changed files with 2 additions and 3 deletions
2
.github/workflows/canary.yml
vendored
2
.github/workflows/canary.yml
vendored
|
|
@ -103,6 +103,8 @@ jobs:
|
|||
|
||||
env:
|
||||
PY_COLORS: 1
|
||||
MSYS2_ARG_CONV_EXCL: "*"
|
||||
MSYS2_ENV_CONV_EXCL: "*"
|
||||
|
||||
defaults:
|
||||
run:
|
||||
|
|
|
|||
3
.github/workflows/ci.yml
vendored
3
.github/workflows/ci.yml
vendored
|
|
@ -671,9 +671,6 @@ jobs:
|
|||
path: dist/binary/borg.exe
|
||||
|
||||
- name: Run tests
|
||||
env:
|
||||
MSYS2_ARG_CONV_EXCL: "*"
|
||||
MSYS2_ENV_CONV_EXCL: "*"
|
||||
run: |
|
||||
# Ensure locally built binary in ./dist/binary/borg-dir is found during tests
|
||||
export PATH="$GITHUB_WORKSPACE/dist/binary/borg-dir:$PATH"
|
||||
|
|
|
|||
Loading…
Reference in a new issue