File tree Expand file tree Collapse file tree 2 files changed +20
-2
lines changed Expand file tree Collapse file tree 2 files changed +20
-2
lines changed Original file line number Diff line number Diff line change @@ -208,6 +208,10 @@ jobs:
208
208
if : ${{ !cancelled() && runner.os == 'Windows' }}
209
209
run : |
210
210
echo "C:\Program Files\Git\usr\bin" >> $env:GITHUB_PATH
211
+ - name : VERIFY Git Unix tools in PATH for braindead windows ${{ matrix.os }}
212
+ if : ${{ !cancelled() && runner.os == 'Windows' }}
213
+ run : |
214
+ command -v touch
211
215
- name : Install dependencies for python ${{ matrix.python-version }} on ${{ matrix.os }}
212
216
shell : bash
213
217
run : make -f Makefile test-reqs ;
Original file line number Diff line number Diff line change @@ -48,6 +48,12 @@ ifeq "$(COMMAND)" ""
48
48
endif
49
49
endif
50
50
51
+ # Check if POSIX touch command can be resolved by COMMAND in the runtime env
52
+ ifeq "$(notdir $(shell $(COMMAND ) touch) ) " ""
53
+ # This is a non-POSIX environment, so try Windows fallback
54
+ COMMAND := where
55
+ endif
56
+
51
57
ifeq "$(MAKE ) " ""
52
58
# just no cmake please
53
59
MAKEFLAGS=$(MAKEFLAGS) -s
72
78
73
79
ifeq "$(LINK ) " ""
74
80
LINK_CMD=$(shell $(COMMAND) ln)
75
- LINK=$(LINK_CMD) -sf
81
+ ifneq "$(LINK_CMD)" ""
82
+ LINK=$(LINK_CMD) -sf
83
+ else
84
+ LINK=$(ECHO) "::debug:: Linking is not supported for file: "
85
+ endif
76
86
endif
77
87
78
88
# Python command configuration
@@ -90,7 +100,11 @@ ifeq "$(PYTHON)" ""
90
100
PY_CMD=$(shell $(COMMAND) python)
91
101
endif
92
102
# Set PYTHON only if not already set
93
- PYTHON := $(PY_CMD) $(PY_ARGS)
103
+ ifdef PY_ARGS
104
+ PYTHON := $(PY_CMD) $(PY_ARGS)
105
+ else
106
+ PYTHON := $(PY_CMD)
107
+ endif
94
108
endif
95
109
96
110
# Coverage configuration
You can’t perform that action at this time.
0 commit comments