diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index 2fb11be51..11e6eed3b 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -1,32 +1,19 @@ name: Build (Linux, x86-64) -on: - push: - paths: - - '**.cpp' - - '**.h' - - '**.c' - - '**.cc' - - '**.cxx' - - '**.hh' - - '**.hpp' - - '**.hxx' - - '**.inl' - - "**.meson.build" - - '.github/workflows/build-linux.yml*' - pull_request: - paths: - - '**.cpp' - - '**.h' - - '**.c' - - '**.cc' - - '**.cxx' - - '**.hh' - - '**.hpp' - - '**.hxx' - - '**.inl' - - "**.meson.build" - - '.github/workflows/build-linux.yml*' +on: [push, pull_request] + paths: + - '**.cpp' + - '**.h' + - '**.c' + - '**.cc' + - '**.cxx' + - '**.hh' + - '**.hpp' + - '**.hxx' + - '**.inl' + - "**meson.build" + - "flake.nix" + - '.github/workflows/build-linux.yml' jobs: build-linux: @@ -40,8 +27,8 @@ jobs: with: nix_path: nixpkgs=channel:nixos-unstable + - name: Build + run: nix build --print-build-logs + - name: Flake integrity run: nix flake check - - - name: Build - run: nix build diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml index 01da33f84..6aab5fd76 100644 --- a/.github/workflows/clang-format.yml +++ b/.github/workflows/clang-format.yml @@ -1,20 +1,19 @@ name: Check Format (Linux, x86-64) -on: - push: - paths: - - '**.cpp' - - '**.h' - - '**.c' - - '**.cc' - - '**.cxx' - - '**.hh' - - '**.hpp' - - '**.hxx' - - '**.inl' - - '.clang-format' - - '.github/workflows/clang-format.yml' - - '.github/scripts/check-clang-format.sh' +on: [push, pull_request] + paths: + - '**.cpp' + - '**.h' + - '**.c' + - '**.cc' + - '**.cxx' + - '**.hh' + - '**.hpp' + - '**.hxx' + - '**.inl' + - "**meson.build" + - "flake.nix" + - '.github/workflows/build-linux.yml' jobs: formatting-check: