Skip to content

Commit

Permalink
CI: Update for meson build
Browse files Browse the repository at this point in the history
We now include a Meson build that uses
Clang + lld as the build system to catch bugs and warnings
that our traditional autotools + GCC builds might miss.

This commit changes the autotools build to be more like the
meson build path: We no longer build a docker image, rather
directly executing the fvwm3-build container as a github
action.

The Go version in fvwm3-tools has been updated to enable use
with meson and eliminate the need for a complex envvar setup
and invocation, however older golang is still supported (>=1.14);
we're just relying on users to tell us if something is broken.
  • Loading branch information
Kangie committed Aug 17, 2024
1 parent 8efd827 commit 050d245
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 6 deletions.
29 changes: 24 additions & 5 deletions .github/workflows/ccpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,32 @@ on:
jobs:
build:
runs-on: ubuntu-latest
container:
image: fvwmorg/fvwm3-build:latest
env:
GO111MODULE: "on"
steps:
- name: checkout
uses: actions/checkout@v4
- name: set git safe directory
run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
- name: Autotools configure
run: ./autogen.sh && ./configure --enable-mandoc --enable-golang
- name: Autotools build
run: make -j

build-meson:
runs-on: ubuntu-latest
container: fvwmorg/fvwm3-build:latest
steps:
- uses: actions/checkout@v2
- name: Pulling docker image
run: docker pull fvwmorg/fvwm3-build:latest
- name: Build Package
run: 'docker build -t fvwm3 .'
- name: checkout
uses: actions/checkout@v4
- name: set git safe directory
run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
- name: configure meson build
run: CC=clang CC_LD=lld meson setup builddir -Dhtmldoc=true -Dmandoc=true -Dxent=true -Drsvg=true -Dpng=true -Dauto_features=enabled
- name: run build
run: ninja -C builddir

notification:
runs-on: ubuntu-20.04
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -529,4 +529,4 @@ summary(
'SVG support': get_option('rsvg') ? librsvg : 'No',
},
section: 'Configuration',
)
)

0 comments on commit 050d245

Please sign in to comment.