mirror of
https://github.com/curl/curl.git
synced 2026-08-26 09:13:32 +03:00
GHA/windows: tidy up Cygwin jobs
- drop unnecessary installed packages. - sync built type name with other jobs. Closes #18758
This commit is contained in:
parent
b5c9c858d5
commit
75d5424979
1 changed files with 5 additions and 5 deletions
8
.github/workflows/windows.yml
vendored
8
.github/workflows/windows.yml
vendored
|
|
@ -110,7 +110,7 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- { build: 'automake', platform: 'x86_64', tflags: 'skiprun', config: '--with-openssl', install: 'libssl-devel libssh2-devel', name: 'openssl R' }
|
- { build: 'autotools', platform: 'x86_64', tflags: 'skiprun', config: '--with-openssl', install: 'libssl-devel libssh2-devel', name: 'openssl R' }
|
||||||
- { build: 'cmake' , platform: 'x86_64', tflags: '' , config: '-DENABLE_DEBUG=ON -DCURL_USE_OPENSSL=ON -DENABLE_THREADED_RESOLVER=OFF', install: 'libssl-devel libssh2-devel', name: 'openssl' }
|
- { build: 'cmake' , platform: 'x86_64', tflags: '' , config: '-DENABLE_DEBUG=ON -DCURL_USE_OPENSSL=ON -DENABLE_THREADED_RESOLVER=OFF', install: 'libssl-devel libssh2-devel', name: 'openssl' }
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
steps:
|
steps:
|
||||||
|
|
@ -123,8 +123,8 @@ jobs:
|
||||||
work-vol: 'D:'
|
work-vol: 'D:'
|
||||||
# https://cygwin.com/cgi-bin2/package-grep.cgi
|
# https://cygwin.com/cgi-bin2/package-grep.cgi
|
||||||
packages: >-
|
packages: >-
|
||||||
autoconf libtool gcc-core gcc-g++ binutils
|
${{ matrix.build == 'autotools' && 'autoconf automake libtool make' || 'cmake ninja' }}
|
||||||
${{ matrix.build }} make ninja
|
gcc-core binutils perl
|
||||||
openssh
|
openssh
|
||||||
libpsl-devel
|
libpsl-devel
|
||||||
zlib-devel
|
zlib-devel
|
||||||
|
|
@ -138,7 +138,7 @@ jobs:
|
||||||
persist-credentials: false
|
persist-credentials: false
|
||||||
|
|
||||||
- name: 'autoreconf'
|
- name: 'autoreconf'
|
||||||
if: ${{ matrix.build == 'automake' }}
|
if: ${{ matrix.build == 'autotools' }}
|
||||||
timeout-minutes: 2
|
timeout-minutes: 2
|
||||||
run: |
|
run: |
|
||||||
PATH=/usr/bin
|
PATH=/usr/bin
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue