build

brianpursley · Apr 16, 2024 · cef9f1d · cef9f1d
1 parent a403e54
commit cef9f1d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -41,16 +41,13 @@ jobs:
         run: dotnet build --no-restore --configuration Release /p:Version=${{ env.VERSION }} /p:CopyrightYear=$(date +%Y)
 
       - name: Test
-        working-directory: Npgmq.Test
-        run: scripts/run-tests.sh
+        run: Npgmq.Test/scripts/run-tests.sh
 
       - name: Test (pgmq 1.0.0)
-        working-directory: Npgmq.Test
-        run: scripts/run-tests.sh 1.0.0
+        run: Npgmq.Test/scripts/run-tests.sh 1.0.0
 
       - name: Test (pgmq 0.26.0)
-        working-directory: Npgmq.Test
-        run: scripts/run-tests.sh 0.26.0
+        run: Npgmq.Test/scripts/run-tests.sh 0.26.0
 
       - name: Pack
         if: startsWith(github.ref, 'refs/tags/v')

diff --git a/Npgmq.Test/scripts/run-tests.sh b/Npgmq.Test/scripts/run-tests.sh
@@ -2,11 +2,11 @@
 set -e
 
 cleanup() {
-  "$(dirname "$0")"/stop-db.sh
+  "$(dirname "$0")"/stop-db.sh >/dev/null 2>&1
 }
 
 trap cleanup EXIT
-
 "$(dirname "$0")"/start-db.sh "$@"
 
-dotnet test ../
+dotnet test "$(dirname "$0")"/../
+cleanup
diff --git a/Npgmq.Test/scripts/stop-db.sh b/Npgmq.Test/scripts/stop-db.sh
@@ -2,3 +2,4 @@
 set -e
 
 docker stop npgmq_test_db
+docker rm npgmq_test_db
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,3 +2,4 @@
		set -e

		docker stop npgmq_test_db
		docker rm npgmq_test_db