.github: Attempt 4

Signed-off-by: Casper Andersson <[email protected]>
cappe987 · Dec 30, 2024 · 0d0de5c · 0d0de5c
1 parent 948fbff
commit 0d0de5c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -32,8 +32,7 @@ jobs:
       - name: Test
         run: |
           cd build
-          # Use sudo since in Ubuntu 24.04 you can't run `unshare` when unprivilegied
-          sudo make test
+          make pipeline_test
   build-aarch64:
     name: Build aarch64
     runs-on: ubuntu-latest

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -34,8 +34,14 @@ install(TARGETS tstest
 
 add_custom_target(test
 	COMMAND
-	# unshare -r -n ${PROJECT_SOURCE_DIR}/test/test.sh ${PROJECT_BINARY_DIR}/tstest $(t)
-	# unshare -n ${PROJECT_SOURCE_DIR}/test/test.sh ${PROJECT_BINARY_DIR}/tstest $(t)
+	unshare -r -n ${PROJECT_SOURCE_DIR}/test/test.sh ${PROJECT_BINARY_DIR}/tstest $(t)
+	DEPENDS ${PROJECT_BINARY_DIR}/tstest
+	)
+
+# Add separate command for pipeline since apparently `unshare` is
+# problematic there on Ubuntu 24.04.
+add_custom_target(pipeline_test
+	COMMAND
 	${PROJECT_SOURCE_DIR}/test/test.sh ${PROJECT_BINARY_DIR}/tstest $(t)
 	DEPENDS ${PROJECT_BINARY_DIR}/tstest
 	)