CI: add/extend curl binary info, VS2010 32-bit, misc improvements
- fix `find` commands to not miss items.
- call `file` on the built files in `curl -V` steps.
To give more feedback on what was built.
- add `curl info` step for cross-jobs that can't do a `curl -V`.
It lists the files built and calls `file` on them.
- appveyor: make a VS2010 32-bit to match the VS2008 job it replaced.
Follow-up to d34aeecb08 #15934
- GHA/windows: drop the word "old" from standalone mingw-w64 jobs to not
conflate it with "old mingw" we no longer support (while also keeping
it short).
Cherry-picked from #15975
Closes #16001
This commit is contained in:
parent
be82a3605a
commit
55f3ba447f
8
.github/workflows/non-native.yml
vendored
8
.github/workflows/non-native.yml
vendored
@ -299,6 +299,10 @@ jobs:
|
|||||||
make -j5 -C bld
|
make -j5 -C bld
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
- name: 'curl info'
|
||||||
|
run: |
|
||||||
|
find . -type f \( -name curl -o -name '*.a' \) -exec file '{}' \;
|
||||||
|
|
||||||
- name: 'build tests'
|
- name: 'build tests'
|
||||||
if: ${{ matrix.build == 'cmake' }} # skip for autotools to save time
|
if: ${{ matrix.build == 'cmake' }} # skip for autotools to save time
|
||||||
run: |
|
run: |
|
||||||
@ -402,6 +406,10 @@ jobs:
|
|||||||
make -j5 -C bld
|
make -j5 -C bld
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
- name: 'curl info'
|
||||||
|
run: |
|
||||||
|
find . \( -name '*.exe' -o -name '*.a' \) -exec file '{}' \;
|
||||||
|
|
||||||
- name: 'build tests'
|
- name: 'build tests'
|
||||||
if: ${{ matrix.build == 'cmake' }} # skip for autotools to save time
|
if: ${{ matrix.build == 'cmake' }} # skip for autotools to save time
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
16
.github/workflows/windows.yml
vendored
16
.github/workflows/windows.yml
vendored
@ -118,7 +118,7 @@ jobs:
|
|||||||
- name: 'curl version'
|
- name: 'curl version'
|
||||||
timeout-minutes: 1
|
timeout-minutes: 1
|
||||||
run: |
|
run: |
|
||||||
find . -name '*.exe' -o -name '*.dll'
|
find . \( -name '*.exe' -o -name '*.dll' -o -name '*.a' \) -exec file '{}' \;
|
||||||
if [ '${{ matrix.build }}' = 'cmake' ]; then
|
if [ '${{ matrix.build }}' = 'cmake' ]; then
|
||||||
PATH="$PWD/bld/lib:$PATH"
|
PATH="$PWD/bld/lib:$PATH"
|
||||||
fi
|
fi
|
||||||
@ -294,7 +294,7 @@ jobs:
|
|||||||
# avoid libtool's curl.exe wrapper
|
# avoid libtool's curl.exe wrapper
|
||||||
mv bld/src/.libs/curl.exe bld/src/curl.exe
|
mv bld/src/.libs/curl.exe bld/src/curl.exe
|
||||||
fi
|
fi
|
||||||
find . -name '*.exe' -o -name '*.dll'
|
find . \( -name '*.exe' -o -name '*.dll' -o -name '*.a' \) -exec file '{}' \;
|
||||||
if [ '${{ matrix.test }}' != 'uwp' ]; then # curl: error initializing curl library
|
if [ '${{ matrix.test }}' != 'uwp' ]; then # curl: error initializing curl library
|
||||||
bld/src/curl.exe --disable --version
|
bld/src/curl.exe --disable --version
|
||||||
fi
|
fi
|
||||||
@ -356,8 +356,8 @@ jobs:
|
|||||||
make -C bld -j5 V=1 examples
|
make -C bld -j5 V=1 examples
|
||||||
fi
|
fi
|
||||||
|
|
||||||
old-mingw-w64:
|
mingw-w64-standalone-downloads:
|
||||||
name: 'old-mingw, CM ${{ matrix.env }} ${{ matrix.name }}'
|
name: 'dl-mingw, CM ${{ matrix.env }} ${{ matrix.name }}'
|
||||||
runs-on: windows-latest
|
runs-on: windows-latest
|
||||||
timeout-minutes: 20
|
timeout-minutes: 20
|
||||||
defaults:
|
defaults:
|
||||||
@ -446,7 +446,7 @@ jobs:
|
|||||||
- name: 'curl version'
|
- name: 'curl version'
|
||||||
timeout-minutes: 1
|
timeout-minutes: 1
|
||||||
run: |
|
run: |
|
||||||
PATH=/usr/bin find . -name '*.exe' -o -name '*.dll'
|
PATH=/usr/bin find . \( -name '*.exe' -o -name '*.dll' -o -name '*.a' \) -exec file '{}' \;
|
||||||
PATH="$PWD/bld/lib:$PATH"
|
PATH="$PWD/bld/lib:$PATH"
|
||||||
bld/src/curl.exe --disable --version
|
bld/src/curl.exe --disable --version
|
||||||
|
|
||||||
@ -542,6 +542,10 @@ jobs:
|
|||||||
make -C bld -j5
|
make -C bld -j5
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
- name: 'curl info'
|
||||||
|
run: |
|
||||||
|
find . \( -name '*.exe' -o -name '*.dll' -o -name '*.a' \) -exec file '{}' \;
|
||||||
|
|
||||||
- name: 'build tests'
|
- name: 'build tests'
|
||||||
if: ${{ matrix.build == 'cmake' }} # Save time by skipping this for autotools
|
if: ${{ matrix.build == 'cmake' }} # Save time by skipping this for autotools
|
||||||
run: |
|
run: |
|
||||||
@ -722,7 +726,7 @@ jobs:
|
|||||||
- name: 'curl version'
|
- name: 'curl version'
|
||||||
timeout-minutes: 1
|
timeout-minutes: 1
|
||||||
run: |
|
run: |
|
||||||
PATH=/usr/bin find . -name '*.exe' -o -name '*.dll'
|
PATH=/usr/bin find . \( -name '*.exe' -o -name '*.dll' -o -name '*.lib' \) -exec file '{}' \;
|
||||||
if [ '${{ matrix.plat }}' != 'uwp' ]; then # Missing: ucrtbased.dll, VCRUNTIME140D.dll, VCRUNTIME140D_APP.dll
|
if [ '${{ matrix.plat }}' != 'uwp' ]; then # Missing: ucrtbased.dll, VCRUNTIME140D.dll, VCRUNTIME140D_APP.dll
|
||||||
PATH="$PWD/bld/lib:$PATH"
|
PATH="$PWD/bld/lib:$PATH"
|
||||||
bld/src/curl.exe --disable --version
|
bld/src/curl.exe --disable --version
|
||||||
|
|||||||
@ -101,7 +101,7 @@ EOF
|
|||||||
curl="builds/libcurl-vc14.10-x64-${PATHPART}-dll-ssl-dll-ipv6-sspi/bin/curl.exe"
|
curl="builds/libcurl-vc14.10-x64-${PATHPART}-dll-ssl-dll-ipv6-sspi/bin/curl.exe"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
find . -name '*.exe' -o -name '*.dll'
|
find . \( -name '*.exe' -o -name '*.dll' -o -name '*.lib' \) -exec file '{}' \;
|
||||||
if [ -z "${SKIP_RUN:-}" ]; then
|
if [ -z "${SKIP_RUN:-}" ]; then
|
||||||
"${curl}" --disable --version
|
"${curl}" --disable --version
|
||||||
else
|
else
|
||||||
|
|||||||
@ -63,11 +63,11 @@ environment:
|
|||||||
ENABLE_UNICODE: 'OFF'
|
ENABLE_UNICODE: 'OFF'
|
||||||
DEBUG: 'OFF'
|
DEBUG: 'OFF'
|
||||||
CURLDEBUG: 'ON'
|
CURLDEBUG: 'ON'
|
||||||
- job_name: 'CMake, VS2010, Release, x64, Schannel, Static, Build-tests'
|
- job_name: 'CMake, VS2010, Release, x86, Schannel, Static, Build-tests'
|
||||||
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2015'
|
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2015'
|
||||||
BUILD_SYSTEM: CMake
|
BUILD_SYSTEM: CMake
|
||||||
PRJ_GEN: 'Visual Studio 10 2010'
|
PRJ_GEN: 'Visual Studio 10 2010'
|
||||||
TARGET: '-A x64'
|
TARGET: '-A Win32'
|
||||||
PRJ_CFG: Release
|
PRJ_CFG: Release
|
||||||
SCHANNEL: 'ON'
|
SCHANNEL: 'ON'
|
||||||
ENABLE_UNICODE: 'OFF'
|
ENABLE_UNICODE: 'OFF'
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user