From d68ec1fa0233fc871063d43bcd8d1dc2717ed0c8 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Tue, 13 Feb 2024 03:24:53 -0600 Subject: [PATCH 1/3] test windows builds with shared libs enabled --- .github/workflows/windows.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 8adb9f9048..be8ce5731e 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -13,7 +13,7 @@ concurrency: jobs: test: - name: "${{ matrix.os }}/${{ matrix.arch }} (${{ matrix.generator }})" + name: "${{ matrix.os }}/${{ matrix.arch }}/shared ${{ matrix.shared }} (${{ matrix.generator }})" runs-on: "${{ matrix.os }}" if: ${{ github.repository_owner == 'libressl' || github.event_name != 'schedule' }} permissions: @@ -23,6 +23,7 @@ jobs: matrix: os: ["windows-2022", "windows-2019"] arch: ["ARM64", "x64", "Win32"] + shared: ["ON", "OFF"] include: - os: "windows-2022" generator: "Visual Studio 17 2022" @@ -49,7 +50,7 @@ jobs: - name: "Configure CMake" shell: cmd - run: cmake -Bbuild -G "${{ matrix.generator }}" -A ${{ matrix.arch }} -DCMAKE_INSTALL_PREFIX=../local + run: cmake -Bbuild -G "${{ matrix.generator }}" -A ${{ matrix.arch }} DBUILD_SHARED_LIBS=${{ matrix.shared }} -DCMAKE_INSTALL_PREFIX=../local - name: "Build" shell: cmd @@ -64,5 +65,5 @@ jobs: if: always() uses: actions/upload-artifact@v4 with: - name: "${{ matrix.os }}-${{ matrix.arch }}-build-results" + name: "${{ matrix.os }}-${{ matrix.arch }}-shared-${{ matrix.shared }}-build-results" path: "build" From 839fa4df5a77cc0ecb18d40393414c76a20bf3ad Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Tue, 27 Feb 2024 06:59:24 -0600 Subject: [PATCH 2/3] adjust formatting of results --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index be8ce5731e..facc4967ba 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -13,7 +13,7 @@ concurrency: jobs: test: - name: "${{ matrix.os }}/${{ matrix.arch }}/shared ${{ matrix.shared }} (${{ matrix.generator }})" + name: "${{ matrix.os }}/${{ matrix.arch }} (${{ matrix.generator }}${{ matrix.shared == 'ON' && ', shared' || '' }})" runs-on: "${{ matrix.os }}" if: ${{ github.repository_owner == 'libressl' || github.event_name != 'schedule' }} permissions: From b0689627c43e464c92d49fee13bc6b6d533c4057 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Tue, 27 Feb 2024 07:02:15 -0600 Subject: [PATCH 3/3] format artifacts with shared conditionally --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index facc4967ba..fe14501915 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -65,5 +65,5 @@ jobs: if: always() uses: actions/upload-artifact@v4 with: - name: "${{ matrix.os }}-${{ matrix.arch }}-shared-${{ matrix.shared }}-build-results" + name: "${{ matrix.os }}-${{ matrix.arch }}${{ matrix.shared == 'ON' && '-shared' || '' }}-build-results" path: "build"