From e3b01eb6b25e76d4832d81023d056948edc2cb36 Mon Sep 17 00:00:00 2001 From: Michael Baentsch <57787676+baentsch@users.noreply.github.com> Date: Sun, 4 Jun 2023 14:43:35 +0200 Subject: [PATCH] add cygwin CI Reviewed-by: Todd Short Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/21006) --- .github/workflows/windows.yml | 38 +++++++++++++++++++ .../storemgmt/winstore_store.c | 2 +- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index bcc36163e5837..d37b7b75f5ce0 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -109,3 +109,41 @@ jobs: - name: test working-directory: _build run: nmake test VERBOSE_FAILURE=yes TESTS=-test_fuzz* HARNESS_JOBS=4 + cygwin: + # Run a job for each of the specified target architectures: + strategy: + matrix: + os: + - windows-2019 +# really worth while running, too? cygwin should mask this +# - windows-2022 + platform: + - arch: win64 + config: -DCMAKE_C_COMPILER=gcc --strict-warnings no-fips enable-quic +# are we really learning sth new from win32? So let's save some CO2 for now disabling this +# - arch: win32 +# config: -DCMAKE_C_COMPILER=gcc --strict-warnings no-fips enable-quic + runs-on: ${{matrix.os}} + env: + CYGWIN_NOWINPATH: 1 + SHELLOPTS: igncr +# Don't overwhelm github CI VMs: + MAKE_PARAMS: -j 4 + steps: +# Checkout before cygwin can mess with PATH... + - uses: actions/checkout@v3 + - uses: cygwin/cygwin-install-action@master + with: + packages: perl git make gcc-core + - name: Check repo + run: cygcheck -V + - name: Full cygcheck status + run: cygcheck -s -v -r -h +# Activate this if checkout action fails: +# - name: Clone repo +# run: bash -c "pwd && git clone --branch ${{ github.ref_name }} --depth 1 https://github.com/${{ github.repository }}.git" + - name: Full build + run: bash -c "gcc --version && ./config ${{ matrix.platform.config }} && make $MAKE_PARAMS" +# Disable testing for now. TBD: Need local cygwin installation to debug . +# - name: Run openssl tests +# run: bash -c "cd openssl && make V=1 test" diff --git a/providers/implementations/storemgmt/winstore_store.c b/providers/implementations/storemgmt/winstore_store.c index 540f9d24405e8..5e873a183fe50 100644 --- a/providers/implementations/storemgmt/winstore_store.c +++ b/providers/implementations/storemgmt/winstore_store.c @@ -24,7 +24,7 @@ #include "prov/bio.h" #include "file_store_local.h" #ifdef __CYGWIN__ -#include +# include #endif #include