Skip to content

Commit d9d2970

Browse files
committed
Fix windows tests
1 parent 5176103 commit d9d2970

3 files changed

Lines changed: 22 additions & 11 deletions

File tree

.github/workflows/ci.yml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@ jobs:
1515
with:
1616
bb: ${{ matrix.bb-version }}
1717
- run: bb run test
18+
- name: Upload debug log
19+
if: failure()
20+
uses: actions/upload-artifact@v4
21+
with:
22+
name: linux-debug-log
23+
path: debug.log
1824

1925
bb-run-test-macos:
2026
runs-on: macos-latest
@@ -30,6 +36,12 @@ jobs:
3036
with:
3137
bb: ${{ matrix.bb-version }}
3238
- run: bb run test
39+
- name: Upload debug log
40+
if: failure()
41+
uses: actions/upload-artifact@v4
42+
with:
43+
name: macos-debug-log
44+
path: debug.log
3345

3446
bb-run-test-windows:
3547
runs-on: windows-latest
@@ -53,11 +65,15 @@ jobs:
5365
cp bb.exe "$(which bb)"
5466
- name: bb test
5567
run: |
56-
bb run test
68+
bb test
69+
env:
70+
GIT_SSH_COMMAND: ssh -o StrictHostKeyChecking=no -i $GITHUB_WORKSPACE\\test-resources\\id_ed25519_bbin_test_lib_private
71+
GITLIBS_DEBUG: true
5772
- name: Upload debug log
73+
if: failure()
5874
uses: actions/upload-artifact@v4
5975
with:
60-
name: debug-log
76+
name: windows-debug-log
6177
path: debug.log
6278

6379

test-resources/git-wrapper.bat

Lines changed: 0 additions & 4 deletions
This file was deleted.

test/babashka/bbin/test_util.clj

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,7 @@
4545
(f))))
4646

4747
(def git-wrapper-path
48-
(-> (if (fs/windows?)
49-
"test-resources/git-wrapper.bat"
50-
"test-resources/git-wrapper")
51-
fs/file
48+
(-> (fs/file "test-resources/git-wrapper")
5249
fs/canonicalize
5350
str))
5451

@@ -57,7 +54,9 @@
5754

5855
(defn bbin-private-keys-fixture []
5956
(fn [f]
60-
(set-gitlibs-command)
57+
; FIXME: Windows batch file escaping prevents usage of git-wrapper
58+
(when-not (fs/windows?)
59+
(set-gitlibs-command))
6160
(f)))
6261

6362
(defn bbin [main-args & {:as opts}]

0 commit comments

Comments
 (0)