lib/libssh2
1
0
Fork 0
mirror of https://github.com/libssh2/libssh2.git synced 2025-08-13 04:42:24 +03:00
Code Activity

ci: use Ninja with cmake

Browse Source 
Closes #1458
This commit is contained in:
Viktor Szakats
2024-09-15 05:05:09 +02:00
parent 8d3bc19b3b
commit 20ad047df5
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
.github/workflows/ci.yml vendored
View File

@@ -316,7 +316,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: 'install packages' - name: 'install packages'
run: sudo apt-get --quiet 2 --option Dpkg::Use-Pty=0 install mingw-w64 run: sudo apt-get --quiet 2 --option Dpkg::Use-Pty=0 install mingw-w64 ${{ matrix.build == 'cmake' && 'ninja-build' || '' }}
- name: 'autotools autoreconf' - name: 'autotools autoreconf'
if: ${{ matrix.build == 'autotools' }} if: ${{ matrix.build == 'autotools' }}
run: autoreconf -fi run: autoreconf -fi
@@ -329,7 +329,7 @@ jobs:
- name: 'cmake configure' - name: 'cmake configure'
if: ${{ matrix.build == 'cmake' }} if: ${{ matrix.build == 'cmake' }}
run: | run: |
cmake -B bld \ cmake -B bld -G Ninja \
-DCMAKE_SYSTEM_NAME=Windows \ -DCMAKE_SYSTEM_NAME=Windows \
-DCMAKE_C_COMPILER_TARGET=${TRIPLET} \ -DCMAKE_C_COMPILER_TARGET=${TRIPLET} \
-DCMAKE_C_COMPILER=${TRIPLET}-gcc \ -DCMAKE_C_COMPILER=${TRIPLET}-gcc \
@@ -359,7 +359,7 @@ jobs:
- uses: cygwin/cygwin-install-action@v4 - uses: cygwin/cygwin-install-action@v4
with: with:
platform: ${{ matrix.platform }} platform: ${{ matrix.platform }}
packages: autoconf libtool ${{ matrix.build }} gcc-core gcc-g++ binutils make libssl-devel zlib-devel packages: ${{ matrix.build == 'automake' && 'autoconf libtool make' || 'ninja' }} ${{ matrix.build }} gcc-core gcc-g++ binutils libssl-devel zlib-devel
site: https://mirrors.kernel.org/sourceware/cygwin/ site: https://mirrors.kernel.org/sourceware/cygwin/
- name: 'autotools' - name: 'autotools'
@@ -382,7 +382,7 @@ jobs:
shell: C:\cygwin\bin\bash.exe '{0}' shell: C:\cygwin\bin\bash.exe '{0}'
run: | run: |
export PATH="/usr/bin:$(cygpath ${SYSTEMROOT})/System32" export PATH="/usr/bin:$(cygpath ${SYSTEMROOT})/System32"
cmake -B bld \ cmake -B bld -G Ninja \
-DCMAKE_UNITY_BUILD=ON \ -DCMAKE_UNITY_BUILD=ON \
-DENABLE_WERROR=ON \ -DENABLE_WERROR=ON \
-DENABLE_DEBUG_LOGGING=ON \ -DENABLE_DEBUG_LOGGING=ON \
@@ -421,14 +421,14 @@ jobs:
if: ${{ matrix.sys == 'msys' }} if: ${{ matrix.sys == 'msys' }}
with: with:
msystem: ${{ matrix.sys }} msystem: ${{ matrix.sys }}
install: gcc ${{ matrix.build }} make openssl-devel zlib-devel install: gcc ${{ matrix.build }} ${{ matrix.build == 'autotools' && 'make' || 'ninja' }} openssl-devel zlib-devel
- uses: msys2/setup-msys2@v2 - uses: msys2/setup-msys2@v2
if: ${{ matrix.sys != 'msys' }} if: ${{ matrix.sys != 'msys' }}
with: with:
msystem: ${{ matrix.sys }} msystem: ${{ matrix.sys }}
install: >- install: >-
mingw-w64-${{ matrix.env }}-cc mingw-w64-${{ matrix.env }}-cc
mingw-w64-${{ matrix.env }}-${{ matrix.build }} make mingw-w64-${{ matrix.env }}-${{ matrix.build }} ${{ matrix.build == 'autotools' && 'make' || '' }}
mingw-w64-${{ matrix.env }}-openssl mingw-w64-${{ matrix.env }}-openssl
- name: 'autotools autoreconf' - name: 'autotools autoreconf'
@@ -486,7 +486,7 @@ jobs:
cflags='' cflags=''
rcopts='' rcopts=''
fi fi
cmake -B bld ${options} \ cmake -B bld -G Ninja ${options} \
"-DCMAKE_C_FLAGS=${cflags}" \ "-DCMAKE_C_FLAGS=${cflags}" \
"-DCMAKE_RC_COMPILE_OBJECT=${rcopts}" \ "-DCMAKE_RC_COMPILE_OBJECT=${rcopts}" \
-DCMAKE_UNITY_BUILD=ON \ -DCMAKE_UNITY_BUILD=ON \
@@ -597,7 +597,7 @@ jobs:
cmake: -DCRYPTO_BACKEND=mbedTLS "-DMBEDTLS_INCLUDE_DIR=$(brew --prefix)/opt/mbedtls/include" "-DMBEDCRYPTO_LIBRARY=$(brew --prefix)/opt/mbedtls/lib/libmbedcrypto.a" cmake: -DCRYPTO_BACKEND=mbedTLS "-DMBEDTLS_INCLUDE_DIR=$(brew --prefix)/opt/mbedtls/include" "-DMBEDCRYPTO_LIBRARY=$(brew --prefix)/opt/mbedtls/lib/libmbedcrypto.a"
steps: steps:
- name: 'install packages' - name: 'install packages'
run: brew install automake libtool ${{ matrix.crypto.install }} run: brew install ${{ matrix.build == 'autotools' && 'automake libtool' || 'ninja' }} ${{ matrix.crypto.install }}
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: 'autotools autoreconf' - name: 'autotools autoreconf'
if: ${{ matrix.build == 'autotools' }} if: ${{ matrix.build == 'autotools' }}
@@ -621,7 +621,7 @@ jobs:
- name: 'cmake configure' - name: 'cmake configure'
if: ${{ matrix.build == 'cmake' }} if: ${{ matrix.build == 'cmake' }}
run: | run: |
cmake -B bld ${{ matrix.crypto.cmake }} \ cmake -B bld -G Ninja ${{ matrix.crypto.cmake }} \
-DCMAKE_UNITY_BUILD=ON \ -DCMAKE_UNITY_BUILD=ON \
-DENABLE_WERROR=ON \ -DENABLE_WERROR=ON \
-DENABLE_DEBUG_LOGGING=ON \ -DENABLE_DEBUG_LOGGING=ON \
@@ -655,8 +655,8 @@ jobs:
architecture: ${{ matrix.arch }} architecture: ${{ matrix.arch }}
run: | run: |
# https://pkgsrc.se/ # https://pkgsrc.se/
sudo pkgin -y install cmake sudo pkgin -y install cmake ninja-build
cmake -B bld \ cmake -B bld -G Ninja \
-DCMAKE_UNITY_BUILD=ON \ -DCMAKE_UNITY_BUILD=ON \
-DENABLE_WERROR=ON \ -DENABLE_WERROR=ON \
-DENABLE_DEBUG_LOGGING=ON \ -DENABLE_DEBUG_LOGGING=ON \
@@ -684,8 +684,8 @@ jobs:
architecture: ${{ matrix.arch }} architecture: ${{ matrix.arch }}
run: | run: |
# https://openbsd.app/ # https://openbsd.app/
sudo pkg_add cmake sudo pkg_add cmake ninja
cmake -B bld \ cmake -B bld -G Ninja \
-DCMAKE_UNITY_BUILD=ON \ -DCMAKE_UNITY_BUILD=ON \
-DENABLE_WERROR=ON \ -DENABLE_WERROR=ON \
-DENABLE_DEBUG_LOGGING=ON \ -DENABLE_DEBUG_LOGGING=ON \