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

Jump to bottom

meson CI: add FreeBSD and MSYS #2553

Merged
merged 4 commits into from
Apr 4, 2023
Merged

meson CI: add FreeBSD and MSYS #2553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1a91d0e
meson: build iconv with FreeBSD
neheb Mar 24, 2023
6691167
meson CI: add FreeBSD
neheb Mar 19, 2023
4fe4104
meson CI: remove static build
neheb Mar 19, 2023
bb8bcd8
meson CI: add MSYS2
neheb Apr 3, 2023
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
66 changes: 57 additions & 9 deletions .github/workflows/on_PR_meson.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,11 @@ concurrency:
jobs:
Ubuntu:
runs-on: ubuntu-20.04
name: Linux-GCC${{matrix.cxx}}-${{matrix.deps}}-${{matrix.type}}
name: Linux-GCC${{matrix.cxx}}-${{matrix.deps}}
strategy:
matrix:
cxx: ['7', '8', '9', '10']
deps: ['forcefallback', 'default']
type: ['shared', 'static']
steps:
- uses: actions/checkout@v3

Expand All @@ -27,18 +26,17 @@ jobs:
env:
CXX: g++-${{matrix.cxx}}
run: |
meson setup "${{github.workspace}}/build" --wrap-mode=${{matrix.deps}} -Ddefault_library=${{matrix.type}} -Dwarning_level=3
meson setup "${{github.workspace}}/build" --wrap-mode=${{matrix.deps}} -Dwarning_level=3
meson compile -C "${{github.workspace}}/build" --verbose
meson test -C "${{github.workspace}}/build" --verbose

VisualStudio:
runs-on: windows-latest
name: MSVC-${{matrix.deps}}-${{matrix.type}}-${{matrix.platform}}
name: MSVC-${{matrix.deps}}-${{matrix.platform}}
strategy:
matrix:
deps: ['forcefallback', 'default']
platform: ['x64', 'x86']
type: ['shared', 'static']
steps:
- uses: actions/checkout@v3

Expand All @@ -54,17 +52,39 @@ jobs:
env:
CXXFLAGS: '/analyze'
run: |
meson setup "${{github.workspace}}/build" --wrap-mode=${{matrix.deps}} -Ddefault_library=${{matrix.type}} -Dwarning_level=3 -Dcpp_std=c++latest
meson setup "${{github.workspace}}/build" --wrap-mode=${{matrix.deps}} -Dwarning_level=3 -Dcpp_std=c++latest
meson compile -C "${{github.workspace}}/build" --verbose
meson test -C "${{github.workspace}}/build" --verbose
MSYS2:
runs-on: windows-latest
name: MSYS2-${{matrix.deps}}-${{matrix.platform}}
strategy:
matrix:
deps: ['forcefallback', 'default']
platform: ['MINGW32', 'MINGW64', 'UCRT64', 'CLANG32', 'CLANG64']
steps:
- uses: actions/checkout@v3

- uses: msys2/setup-msys2@v2
with:
msystem: ${{matrix.platform}}
pacboy: >-
cc:p
meson:p
ninja:p

- name: Compile and Test
shell: msys2 {0}
run: |
meson setup "${{github.workspace}}/build" --wrap-mode=${{matrix.deps}} -Dwarning_level=3 -Dcpp_std=c++20
meson compile -C "${{github.workspace}}/build" --verbose
meson test -C "${{github.workspace}}/build" --verbose
MacOS:
runs-on: macos-latest
name: macOS-${{matrix.deps}}-${{matrix.type}}
name: macOS-${{matrix.deps}}
strategy:
matrix:
deps: ['forcefallback', 'default']
type: ['shared', 'static']
steps:
- uses: actions/checkout@v3

Expand All @@ -74,6 +94,34 @@ jobs:

- name: Compile and Test
run: |
meson setup "${{github.workspace}}/build" --wrap-mode=${{matrix.deps}} -Ddefault_library=${{matrix.type}} -Dwarning_level=3 -Dcpp_std=c++20
meson setup "${{github.workspace}}/build" --wrap-mode=${{matrix.deps}} -Dwarning_level=3 -Dcpp_std=c++20
meson compile -C "${{github.workspace}}/build" --verbose
meson test -C "${{github.workspace}}/build" --verbose
FreeBSD:
runs-on: macos-latest
name: FreeBSD
steps:
- uses: actions/checkout@v3
- name: FreeBSD
uses: vmactions/freebsd-vm@v0
with:
prepare: |
pkg install -y curl ninja meson gettext pkgconf googletest expat inih brotli
run: |
meson setup "${{github.workspace}}/build" -Dwarning_level=3 -Dcpp_std=c++20
meson compile -C "${{github.workspace}}/build" --verbose
meson test -C "${{github.workspace}}/build" --verbose
OpenBSD:
runs-on: macos-latest
name: OpenBSD
steps:
- uses: actions/checkout@v3
- name: OpenBSD
uses: vmactions/openbsd-vm@v0
with:
prepare: |
pkg_add curl ninja meson gettext pkgconf gtest libiconv
run: |
meson setup "${{github.workspace}}/build" -Dwarning_level=3 -Dcpp_std=c++20
meson compile -C "${{github.workspace}}/build" --verbose
meson test -C "${{github.workspace}}/build" --verbose
5 changes: 2 additions & 3 deletions .github/workflows/on_PR_meson_clang.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,11 @@ concurrency:
jobs:
Ubuntu:
runs-on: ubuntu-20.04
name: Linux-Clang${{matrix.cxx}}-${{matrix.deps}}-${{matrix.type}}
name: Linux-Clang${{matrix.cxx}}-${{matrix.deps}}
strategy:
matrix:
cxx: ['7', '8', '9', '10', '12']
kmilos marked this conversation as resolved.
Show resolved Hide resolved
deps: ['forcefallback', 'default']
type: ['shared', 'static']
steps:
- uses: actions/checkout@v3

Expand All @@ -29,6 +28,6 @@ jobs:
CXXFLAGS: -stdlib=libc++
CXX_LD: lld-${{matrix.cxx}}
run: |
meson setup "${{github.workspace}}/build" --wrap-mode=${{matrix.deps}} -Ddefault_library=${{matrix.type}} -Dwarning_level=3 -Dcpp_std=c++20
meson setup "${{github.workspace}}/build" --wrap-mode=${{matrix.deps}} -Dwarning_level=3 -Dcpp_std=c++20
meson compile -C "${{github.workspace}}/build" --verbose
meson test -C "${{github.workspace}}/build" --verbose
2 changes: 1 addition & 1 deletion meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ if zlib_dep.found()
deps += zlib_dep
endif

if meson.version().version_compare('>= 0.60') and host_machine.system() != 'freebsd'
if meson.version().version_compare('>= 0.60')
iconv_dep = dependency('iconv', required: get_option('iconv'))
else
iconv_dep = dependency('', required: false)
Expand Down