do not pass ending slash in CURL_DIRSUFFIX
This commit is contained in:
parent
c028a243f2
commit
fe92f1f847
2
.github/workflows/windows.yml
vendored
2
.github/workflows/windows.yml
vendored
@ -902,7 +902,7 @@ jobs:
|
|||||||
if: ${{ matrix.tflags != 'skipall' && matrix.tflags != 'skiprun' }}
|
if: ${{ matrix.tflags != 'skipall' && matrix.tflags != 'skiprun' }}
|
||||||
timeout-minutes: 10
|
timeout-minutes: 10
|
||||||
run: |
|
run: |
|
||||||
export CURL_DIRSUFFIX='${{ matrix.type }}/'
|
export CURL_DIRSUFFIX='${{ matrix.type }}'
|
||||||
export TFLAGS='-j8 ~WebSockets ~SCP ~612 ${{ matrix.tflags }}'
|
export TFLAGS='-j8 ~WebSockets ~SCP ~612 ${{ matrix.tflags }}'
|
||||||
if [[ '${{ matrix.install }}' = *'libssh2[core,zlib]'* ]]; then
|
if [[ '${{ matrix.install }}' = *'libssh2[core,zlib]'* ]]; then
|
||||||
TFLAGS+=' ~SFTP'
|
TFLAGS+=' ~SFTP'
|
||||||
|
|||||||
@ -134,7 +134,7 @@ fi
|
|||||||
|
|
||||||
if [ "${TFLAGS}" != 'skipall' ] && \
|
if [ "${TFLAGS}" != 'skipall' ] && \
|
||||||
[ "${TFLAGS}" != 'skiprun' ]; then
|
[ "${TFLAGS}" != 'skiprun' ]; then
|
||||||
export CURL_DIRSUFFIX="${PRJ_CFG}/"
|
export CURL_DIRSUFFIX="${PRJ_CFG}"
|
||||||
if [ -x "$(cygpath "${SYSTEMROOT}/System32/curl.exe")" ]; then
|
if [ -x "$(cygpath "${SYSTEMROOT}/System32/curl.exe")" ]; then
|
||||||
TFLAGS+=" -ac $(cygpath "${SYSTEMROOT}/System32/curl.exe")"
|
TFLAGS+=" -ac $(cygpath "${SYSTEMROOT}/System32/curl.exe")"
|
||||||
elif [ -x "$(cygpath 'C:/msys64/usr/bin/curl.exe')" ]; then
|
elif [ -x "$(cygpath 'C:/msys64/usr/bin/curl.exe')" ]; then
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user