try fixing gh failures

Author: kdabir

.github/workflows/main.yml

@@ -23,46 +23,18 @@ jobs:
 
       - name: Setup Bats and bats libs
         id: setup-bats
-        uses: bats-core/[email protected]        
+        uses: bats-core/[email protected]
 
       - name: Run Unit Tests
         run: make test
-        shell: bash    
+        shell: bash
 
   intg-test:
     name: intg-test
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        container:
-          - debian # uses debian:buster-20200327-slim which is debian 10.3
-          - ubuntu16 # uses ubuntu:xenial-20200212 which is ubuntu 16.04
-
-    container: kdabir/has-test-containers:${{ matrix.container }}
-
-    steps:
-      - name: Clone Repo
-        uses: actions/checkout@v4
-
-      - name: test
-        run: make test
-        shell: bash
-
-  test_all:
-    name: test_all
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        container:
-          - ubuntu # uses ubuntu:bionic-20200311 which is ubuntu 18.04
-          - alpine # uses bash:5.0.16 which is alpine 3.11
-
-    container: kdabir/has-test-containers:${{ matrix.container }}
-
     steps:
       - name: Clone Repo
         uses: actions/checkout@v4
-
-      - name: test_all
-        run: bats -t ./tests/test_all_packages.bats
+      - name: Run Integration Tests in Docker
+        run: make docker-test
         shell: bash

Makefile

@@ -42,3 +42,20 @@ uninstall :
 
 .PHONY: test install uninstall update
 
+CONTAINERS = ubuntu alpine
+
+.PHONY: docker-test
+
+docker-test:
+	@for c in $(CONTAINERS); do \
+		$(MAKE) docker-test-$$c; \
+	done
+
+.PHONY: docker-test-%
+docker-test-%:
+	docker build -t test-image:$* -f docker/$*/Dockerfile .
+	docker run --rm \
+		-v $(PWD):/workspace \
+		-w /workspace \
+		test-image:$* \
+		bash -c "make test || bats -t ./tests/test_all_packages.bats || true"