Skip to content

Commit

Permalink
.github/workflows: fix meson deprecations
Browse files Browse the repository at this point in the history
  • Loading branch information
khaneliman committed May 28, 2024
1 parent 0d518cb commit ac69c6a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 12 deletions.
9 changes: 3 additions & 6 deletions .github/workflows/freebsd.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
name: freebsd

on: [push, pull_request]

concurrency:
group: ${{ github.workflow }}-freebsd-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
clang:
# Run actions in a FreeBSD VM on the ubuntu runner
Expand All @@ -18,7 +15,7 @@ jobs:
timeout-minutes: 180
env:
CPPFLAGS: '-isystem/usr/local/include'
LDFLAGS: '-L/usr/local/lib'
LDFLAGS: '-L/usr/local/lib'
with:
operating_system: freebsd
version: "13.2"
Expand All @@ -31,6 +28,6 @@ jobs:
libdbusmenu libevdev libfmt libmpdclient libudev-devd meson \
pkgconf pipewire pulseaudio scdoc sndio spdlog wayland-protocols upower \
libinotify
meson build -Dman-pages=enabled
meson setup build -Dman-pages=enabled
ninja -C build
meson test -C build --no-rebuild --print-errorlogs --suite waybar
meson setup test -C build --no-rebuild --print-errorlogs --suite waybar
7 changes: 1 addition & 6 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
name: linux

on: [push, pull_request]

concurrency:
group: ${{ github.workflow }}-linux-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
build:
strategy:
Expand All @@ -18,15 +15,13 @@ jobs:
- opensuse
- gentoo
cpp_std: [c++20]

runs-on: ubuntu-latest
container:
image: alexays/waybar:${{ matrix.distro }}

steps:
- uses: actions/checkout@v3
- name: configure
run: meson -Dman-pages=enabled -Dcpp_std=${{matrix.cpp_std}} build
run: meson setup -Dman-pages=enabled -Dcpp_std=${{matrix.cpp_std}} build
- name: build
run: ninja -C build
- name: test
Expand Down

0 comments on commit ac69c6a

Please sign in to comment.