diff options
author | Brent Cook <busterb@gmail.com> | 2024-02-28 04:26:09 -0600 |
---|---|---|
committer | Brent Cook <busterb@gmail.com> | 2024-02-28 04:26:09 -0600 |
commit | d3ce4a78fef7be558f532784e7daa530995a8572 (patch) | |
tree | d3b475338081add4837e25de8557b2e8a7681e14 | |
parent | d8702f6951420d7641e02c04c8ce4db5762ddb07 (diff) | |
parent | b0689627c43e464c92d49fee13bc6b6d533c4057 (diff) | |
download | portable-d3ce4a78fef7be558f532784e7daa530995a8572.tar.gz portable-d3ce4a78fef7be558f532784e7daa530995a8572.tar.bz2 portable-d3ce4a78fef7be558f532784e7daa530995a8572.zip |
Land #1000, test shared library builds for Windows
-rw-r--r-- | .github/workflows/windows.yml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 8adb9f9..fe14501 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml | |||
@@ -13,7 +13,7 @@ concurrency: | |||
13 | 13 | ||
14 | jobs: | 14 | jobs: |
15 | test: | 15 | test: |
16 | name: "${{ matrix.os }}/${{ matrix.arch }} (${{ matrix.generator }})" | 16 | name: "${{ matrix.os }}/${{ matrix.arch }} (${{ matrix.generator }}${{ matrix.shared == 'ON' && ', shared' || '' }})" |
17 | runs-on: "${{ matrix.os }}" | 17 | runs-on: "${{ matrix.os }}" |
18 | if: ${{ github.repository_owner == 'libressl' || github.event_name != 'schedule' }} | 18 | if: ${{ github.repository_owner == 'libressl' || github.event_name != 'schedule' }} |
19 | permissions: | 19 | permissions: |
@@ -23,6 +23,7 @@ jobs: | |||
23 | matrix: | 23 | matrix: |
24 | os: ["windows-2022", "windows-2019"] | 24 | os: ["windows-2022", "windows-2019"] |
25 | arch: ["ARM64", "x64", "Win32"] | 25 | arch: ["ARM64", "x64", "Win32"] |
26 | shared: ["ON", "OFF"] | ||
26 | include: | 27 | include: |
27 | - os: "windows-2022" | 28 | - os: "windows-2022" |
28 | generator: "Visual Studio 17 2022" | 29 | generator: "Visual Studio 17 2022" |
@@ -49,7 +50,7 @@ jobs: | |||
49 | 50 | ||
50 | - name: "Configure CMake" | 51 | - name: "Configure CMake" |
51 | shell: cmd | 52 | shell: cmd |
52 | run: cmake -Bbuild -G "${{ matrix.generator }}" -A ${{ matrix.arch }} -DCMAKE_INSTALL_PREFIX=../local | 53 | run: cmake -Bbuild -G "${{ matrix.generator }}" -A ${{ matrix.arch }} DBUILD_SHARED_LIBS=${{ matrix.shared }} -DCMAKE_INSTALL_PREFIX=../local |
53 | 54 | ||
54 | - name: "Build" | 55 | - name: "Build" |
55 | shell: cmd | 56 | shell: cmd |
@@ -64,5 +65,5 @@ jobs: | |||
64 | if: always() | 65 | if: always() |
65 | uses: actions/upload-artifact@v4 | 66 | uses: actions/upload-artifact@v4 |
66 | with: | 67 | with: |
67 | name: "${{ matrix.os }}-${{ matrix.arch }}-build-results" | 68 | name: "${{ matrix.os }}-${{ matrix.arch }}${{ matrix.shared == 'ON' && '-shared' || '' }}-build-results" |
68 | path: "build" | 69 | path: "build" |