The branch master has been updated
via 25eeab019c3eb191bcfcbcae501023be3b75713a (commit)
via dd53c2979372c40fcfce0a1de6221f1c68b157a6 (commit)
from 773e67ab82df4b268bd88465b70fd08ff7165904 (commit)
- Log -----------------------------------------------------------------
commit 25eeab019c3eb191bcfcbcae501023be3b75713a
Author: Richard Levitte <levi...@openssl.org>
Date: Fri Jun 11 04:30:22 2021 +0200
Windows GitHub CI: Introduce --strict-warnings
This involves making a more comprehensive matrix for the different
architectures we build for.
Reviewed-by: Shane Lontis <shane.lon...@oracle.com>
Reviewed-by: Paul Dale <pa...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15709)
commit dd53c2979372c40fcfce0a1de6221f1c68b157a6
Author: Richard Levitte <levi...@openssl.org>
Date: Fri Jun 11 03:58:49 2021 +0200
Windows Github CI: test in Windows 2016 as well
This brings an older version of MSVC, which may bring some "interesting"
failures.
Reviewed-by: Shane Lontis <shane.lon...@oracle.com>
Reviewed-by: Paul Dale <pa...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15709)
-----------------------------------------------------------------------
Summary of changes:
.github/workflows/windows.yml | 36 +++++++++++++++++++++++++-----------
1 file changed, 25 insertions(+), 11 deletions(-)
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 5c98695a70..ffe6c92403 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -4,28 +4,32 @@ on: [pull_request, push]
jobs:
shared:
- runs-on: windows-latest
# Run a job for each of the specified target architectures:
strategy:
matrix:
- arch:
- - win64
- - win32
+ os:
+ - windows-latest
+ - windows-2016
+ platform:
+ - arch: win64
+ config: VC-WIN64A enable-fips
+ - arch: win32
+ config: VC-WIN32 --strict-warnings no-fips
+ runs-on: ${{matrix.os}}
steps:
- uses: actions/checkout@v2
- uses: ilammy/msvc-dev-cmd@v1
with:
- arch: ${{ matrix.arch }}
+ arch: ${{ matrix.platform.arch }}
- uses: ilammy/setup-nasm@v1
with:
- platform: ${{ matrix.arch }}
+ platform: ${{ matrix.platform.arch }}
- name: prepare the build directory
run: mkdir _build
- name: config
working-directory: _build
run: |
- if ( "${{ matrix.arch }}" -eq "win32" ) { $target = "VC-WIN32" ; $fips
= "no-fips" } else { $target = "VC-WIN64A" ; $fips = "enable-fips" }
- perl ..\Configure --banner=Configured no-makedepend $fips $target
+ perl ..\Configure --banner=Configured no-makedepend ${{
matrix.platform.config }}
perl configdata.pm --dump
- name: build
working-directory: _build
@@ -35,13 +39,18 @@ jobs:
run: nmake test VERBOSE_FAILURE=yes TESTS=-test_fuzz* HARNESS_JOBS=4
- name: install
# Run on 64 bit only as 32 bit is slow enough already
- if: $${{ matrix.arch == 'win64' }}
+ if: $${{ matrix.platform.arch == 'win64' }}
run: |
mkdir _dest
nmake install DESTDIR=_dest
working-directory: _build
plain:
- runs-on: windows-latest
+ strategy:
+ matrix:
+ os:
+ - windows-latest
+ - windows-2016
+ runs-on: ${{matrix.os}}
steps:
- uses: actions/checkout@v2
- uses: ilammy/msvc-dev-cmd@v1
@@ -59,7 +68,12 @@ jobs:
working-directory: _build
run: nmake test VERBOSE_FAILURE=yes HARNESS_JOBS=4
minimal:
- runs-on: windows-latest
+ strategy:
+ matrix:
+ os:
+ - windows-latest
+ - windows-2016
+ runs-on: ${{matrix.os}}
steps:
- uses: actions/checkout@v2
- uses: ilammy/msvc-dev-cmd@v1
