From 876e803cf2b02c6008e2a416dba05d89eeaf053a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A1nos=20Veres?= <janos@dot.industries>
Date: Fri, 29 Mar 2024 12:04:32 +0100
Subject: [PATCH 1/3] fix: integration tests

---
 .github/workflows/test.yml | 11 ++---------
 integration/setup_env.sh   |  2 ++
 2 files changed, 4 insertions(+), 9 deletions(-)
 create mode 100644 integration/setup_env.sh

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b10856a..4ca5595 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -25,15 +25,6 @@ jobs:
         go-version: [ 1.21.x ]
         os: [ ubuntu-latest ]
     runs-on: ${{ matrix.os }}
-    services:
-      minio1:
-        image: quay.io/minio/minio
-        env:
-          MINIO_ROOT_USER: minio
-          MINIO_ROOT_PASSWORD: minio123
-        ports:
-          - 9000:9000
-      # todo: we also need to add our local code changed service to be built...
     steps:
       - name: Checkout
         uses: actions/checkout@master
@@ -41,6 +32,8 @@ jobs:
         uses: actions/setup-go@master
       - name: Setup Node
         uses: actions/setup-node@master
+      - name: Setup docker env
+        run: sh integration/setup_env.sh
       - name: Install bruno
         run: npm install -g @usebruno/cli
       - name: Run tests
diff --git a/integration/setup_env.sh b/integration/setup_env.sh
new file mode 100644
index 0000000..f5ca707
--- /dev/null
+++ b/integration/setup_env.sh
@@ -0,0 +1,2 @@
+echo "Starting dev env"
+docker compose -f ./docker/docker-compose-dev.yml up --detach --wait
\ No newline at end of file

From 6edec9437e68ea356fbba22430806c591eda4ef9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A1nos=20Veres?= <janos@dot.industries>
Date: Fri, 29 Mar 2024 12:09:25 +0100
Subject: [PATCH 2/3] test: running tests in the same step doesn't work

---
 .github/workflows/test.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4ca5595..10f5063 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -32,9 +32,9 @@ jobs:
         uses: actions/setup-go@master
       - name: Setup Node
         uses: actions/setup-node@master
-      - name: Setup docker env
-        run: sh integration/setup_env.sh
       - name: Install bruno
         run: npm install -g @usebruno/cli
-      - name: Run tests
-        run: cd integration && bru run --env local
\ No newline at end of file
+      - name: Setup docker env
+        run: sh integration/setup_env.sh && cd integration && bru run --env local
+#      - name: Run tests
+#        run: cd integration && bru run --env local
\ No newline at end of file

From 93ac58f764e6a4c3622c4f82774700a716dcbea3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A1nos=20Veres?= <janos@dot.industries>
Date: Fri, 29 Mar 2024 12:12:16 +0100
Subject: [PATCH 3/3] chore: test failed... the network works now... make it
 clean

---
 .github/workflows/test.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 10f5063..fba3ebb 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -35,6 +35,6 @@ jobs:
       - name: Install bruno
         run: npm install -g @usebruno/cli
       - name: Setup docker env
-        run: sh integration/setup_env.sh && cd integration && bru run --env local
-#      - name: Run tests
-#        run: cd integration && bru run --env local
\ No newline at end of file
+        run: sh integration/setup_env.sh
+      - name: Run tests
+        run: cd integration && bru run --env local
\ No newline at end of file