diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5a6b98b..2a39076 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,7 +12,7 @@ jobs:
           sudo apt-get update
           sudo apt --yes install libgtk-3-dev meson ninja-build scdoc
           pkg-config --list-all
-          CC=gcc meson build
+          CC=gcc meson setup build
           ninja -C build
 
   build-clang:
@@ -23,7 +23,7 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt --yes install libgtk-3-dev meson ninja-build scdoc clang clang-format clang-tidy
-          CC=clang meson build
+          CC=clang meson setup build
           ninja -C build
           echo "Making sure clang-format is correct..."
           git ls-files -- '*.[ch]' | xargs clang-format -Werror -n
diff --git a/README.md b/README.md
index b1ac907..cc8c7ea 100644
--- a/README.md
+++ b/README.md
@@ -133,7 +133,7 @@ Optional dependencies:
 Then run:
 
 ```sh
-meson build
+meson setup build
 ninja -C build
 ```
 
diff --git a/meson.build b/meson.build
index ffecb26..5b0746f 100644
--- a/meson.build
+++ b/meson.build
@@ -14,8 +14,8 @@ project(
 version = '"@0@"'.format(meson.project_version())
 git = find_program('git', native: true, required: false)
 if git.found()
-	git_commit = run_command([git, 'rev-parse', '--short', 'HEAD'])
-	git_branch = run_command([git, 'rev-parse', '--abbrev-ref', 'HEAD'])
+	git_commit = run_command([git, 'rev-parse', '--short', 'HEAD'], check:true)
+	git_branch = run_command([git, 'rev-parse', '--abbrev-ref', 'HEAD'], check:true)
 	if git_commit.returncode() == 0 and git_branch.returncode() == 0
 		version = '"@0@-@1@ (" __DATE__ ", branch \'@2@\')"'.format(
 			meson.project_version(),