From ce4dd911bc6e8fdf819c8b40365855f9bab3a7ec Mon Sep 17 00:00:00 2001 From: ailin-nemui Date: Thu, 14 Sep 2023 13:32:44 +0000 Subject: [PATCH] Merge pull request #1497 from ailin-nemui/github-workflow-error Slightly improve GitHub workflow (cherry picked from commit 2a1291f26f6dc47b1d3169d18faba8f995bd3ea6) --- .github/workflows/check.yml | 57 ++++++++++++++++++++++++++++++++++--- meson.build | 5 ++++ 2 files changed, 58 insertions(+), 4 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 97cb3feb..3e324649 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -114,9 +114,58 @@ jobs: ^set -clear log_day_changed ^set -clear log_open_string ^set log_timestamp * - ^window log on' > irssi-test/startup - echo load perl >> irssi-test/startup - echo load proxy >> irssi-test/startup - echo ^quit >> irssi-test/startup + ^window log on + load perl + load otr + load proxy + ^quit' > irssi-test/startup + irssi-build/bin/irssi --home irssi-test | perl -Mutf8 -C ~/render.pl + cat irc.log.* + annotation-warnings: + runs-on: ubuntu-latest + if: ${{ github.event_name == 'pull_request' }} + env: + CC: clang + steps: + - name: prepare required software + run: | + sudo apt update && sudo apt install $apt_build_deps + - uses: actions/checkout@main + - name: Setup local annotations + uses: irssi-import/actions-irssi/problem-matchers@master + - name: set PATH + run: | + echo "$HOME/.local/bin" >> $GITHUB_PATH + - name: prepare required software + env: + meson_ver: ${{ matrix.meson_ver }} + setuptools_ver: ${{ matrix.setuptools_ver }} + run: | + sudo apt update && sudo apt install $apt_build_deps $apt_build_deps_meson + eval "$get_pip_build_deps_meson" + curl -SLf https://github.com/irssi-import/actions-irssi/raw/master/check-irssi/render.pl -o ~/render.pl && chmod +x ~/render.pl + - name: build and install with meson + run: | + meson Build $build_options_meson --prefix=${prefix/\~/~} + ninja -C Build + ninja -C Build install >/dev/null + - name: run launch test + env: + TERM: xterm + run: | + # automated irssi launch test + cd + mkdir irssi-test + echo 'echo automated irssi launch test + ^set settings_autosave off + ^set -clear log_close_string + ^set -clear log_day_changed + ^set -clear log_open_string + ^set log_timestamp * + ^window log on + load perl + load otr + load proxy + ^quit' > irssi-test/startup irssi-build/bin/irssi --home irssi-test | perl -Mutf8 -C ~/render.pl cat irc.log.* diff --git a/meson.build b/meson.build index 700fac21..b6ab6178 100644 --- a/meson.build +++ b/meson.build @@ -382,6 +382,11 @@ if want_perl if perl_version == UNSET perl_version = run_command(cross_perl, '-V::version:').stdout().split('\'')[1] endif + + # disable clang warning + if perl_version.version_compare('<5.35.2') + perl_cflags += cc.get_supported_arguments('-Wno-compound-token-split-by-macro') + endif perl_dep = declare_dependency(compile_args : perl_cflags, link_args : perl_ldflags, version : perl_version)