aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stapelberg <michael@stapelberg.de>2023-01-02 10:46:25 +0100
committerMichael Stapelberg <stapelberg@users.noreply.github.com>2023-01-02 11:36:37 +0100
commit16f83396b4c52021483264cd6e5a6f54fedc75d4 (patch)
tree93ace3a735517558cc2a49c0aefbc03312c740f7
parent8fe28d1a952b342da0069ce6d2b562358f0e1fe7 (diff)
downloadi3-16f83396b4c52021483264cd6e5a6f54fedc75d4.tar.gz
i3-16f83396b4c52021483264cd6e5a6f54fedc75d4.zip
GitHub Actions: switch to meson setup subcommand
Using “meson” instead of “meson setup” results in a warning.
-rw-r--r--.github/workflows/main.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fe8e506b..194fef4e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -47,7 +47,7 @@ jobs:
echo "::endgroup::"
- name: build i3
run: |
- docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 -e CC ${{ env.BASENAME }} /bin/sh -c 'rm -rf build; mkdir -p build && cd build && CFLAGS="-Wformat -Wformat-security -Wextra -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Werror -fno-common -D_FORTIFY_SOURCE=2" meson .. -Ddocs=true -Dmans=true -Db_sanitize=address --buildtype=debugoptimized && ninja -v'
+ docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 -e CC ${{ env.BASENAME }} /bin/sh -c 'rm -rf build; mkdir -p build && cd build && CFLAGS="-Wformat -Wformat-security -Wextra -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Werror -fno-common -D_FORTIFY_SOURCE=2" meson setup .. -Ddocs=true -Dmans=true -Db_sanitize=address --buildtype=debugoptimized && ninja -v'
- name: check spelling
run: |
docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 ${{ env.BASENAME }} ./travis/check-spelling.pl
@@ -62,7 +62,7 @@ jobs:
if: ${{ failure() }}
- name: build dist tarball
run: |
- docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 -e CC ${{ env.BASENAME }} /bin/sh -c 'rm -rf distbuild; mkdir distbuild && cd distbuild && meson .. -Ddocs=true -Dmans=true && meson dist --no-tests'
+ docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 -e CC ${{ env.BASENAME }} /bin/sh -c 'rm -rf distbuild; mkdir distbuild && cd distbuild && meson setup .. -Ddocs=true -Dmans=true && meson dist --no-tests'
- name: build Debian packages
run: |
echo "::group::Debian amd64"