Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test windows builds with shared libs enabled #1000

Merged
merged 3 commits into from
Feb 28, 2024
+4 −3
Merged

test windows builds with shared libs enabled #1000

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d68ec1f
test windows builds with shared libs enabled
busterb Feb 13, 2024
839fa4d
adjust formatting of results
busterb Feb 27, 2024
b068962
format artifacts with shared conditionally
busterb Feb 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/workflows/windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ concurrency:

jobs:
test:
name: "${{ matrix.os }}/${{ matrix.arch }} (${{ matrix.generator }})"
name: "${{ matrix.os }}/${{ matrix.arch }}/shared ${{ matrix.shared }} (${{ matrix.generator }})"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think formatting this as windows-2022/ARM64 (Visual Studio 17 2022, shared)/windows-2019/Win32 (Visual Studio 16 2019 could make it easier to understand. Maybe something like this would work?

Suggested change
name: "${{ matrix.os }}/${{ matrix.arch }}/shared ${{ matrix.shared }} (${{ matrix.generator }})"
name: "${{ matrix.os }}/${{ matrix.arch }} (${{ matrix.generator }}${{ matrix.shared == 'ON' && ', shared' || '' }})"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, let's give it a try.

runs-on: "${{ matrix.os }}"
if: ${{ github.repository_owner == 'libressl' || github.event_name != 'schedule' }}
permissions:
Expand All @@ -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"
Expand All @@ -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
Expand All @@ -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"