rename to stackv1 and stackv2

stakwork · Aug 30, 2024 · 770c2f3 · 770c2f3
1 parent 51cc9b1
commit 770c2f3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/.github/workflows/frontend-e2e.yml b/.github/workflows/frontend-e2e.yml
@@ -25,14 +25,14 @@ jobs:
 
       - name: Clone Stack
         run: |
-          git clone https://github.com/stakwork/sphinx-stack.git stack
+          git clone https://github.com/stakwork/sphinx-stack.git stackv1
 
       - name: Clone Sphinx Tribes Frontend
         run: |
           git clone https://github.com/stakwork/sphinx-tribes-frontend.git tribes-frontend
 
       - name: Give Permissions to Stack
-        working-directory: ./stack
+        working-directory: ./stackv1
         run: |
           chmod 777 ./bitcoind;    
           chmod 777 -R ./relay;
@@ -46,13 +46,13 @@ jobs:
           timeout_minutes: 10
           max_attempts: 3
           command: |
-            GITACTION_ENV=gitactionenv docker compose -f ./stack/alts/proxy.yml --project-directory ./stack up -d;
+            GITACTION_ENV=gitactionenv docker compose -f ./stackv1/alts/proxy.yml --project-directory ./stackv1 up -d;
             sleep 240;
             docker ps
             docker logs meme.sphinx
             docker logs dave.sphinx
-            docker wait stack_relaysetup_1
-            cat stack/relay/NODES.json;
+            docker wait stackv1_relaysetup_1
+            cat stackv1/relay/NODES.json;
 
       - name: Copy Node.json
         uses: canastro/copy-file-action@master
@@ -82,5 +82,5 @@ jobs:
           path: tribes-frontend/cypress/videos
 
       - name: Stop Stack
-        working-directory: ./stack
+        working-directory: ./stackv1
         run: docker compose down
diff --git a/.github/workflows/prjob_tests.yml b/.github/workflows/prjob_tests.yml
@@ -17,20 +17,20 @@ jobs:
 
       - name: Clone Stack
         run: |
-          git clone https://github.com/stakwork/sphinx-stack.git stack;
+          git clone https://github.com/stakwork/sphinx-stack.git stackv2;
 
       - name: Run Stack V2
         uses: nick-fields/retry@v2
         with:
           timeout_minutes: 10
           max_attempts: 3
           command: |
-            GITACTION_ENV=gitactionenv docker compose -f ./stack/alts/v2.yml --project-directory ./stack up -d;
+            GITACTION_ENV=gitactionenv docker compose -f ./stack/alts/v2.yml --project-directory ./stackv2 up -d;
             sleep 240;
             docker ps
             docker logs alice.sphinx
             docker logs bob.sphinx
-            docker wait stack-v2setup-1
+            docker wait stackv2-v2setup-1
 
       - name: Starting DB
         run: docker compose -f ./docker/testdb-docker-compose.yml -p test_db  up -d
@@ -41,5 +41,9 @@ jobs:
       - name: Tests
         run: sudo V2_BOT_URL=http://localhost:3001 V2_BOT_TOKEN=xyzxyzxyz go test ./... -race -v -coverprofile=coverage.out && ./cover-check.sh coverage.out 8.4
 
-      - name: Droping with docker compose
+      - name: Droping DB with docker compose
         run: docker compose -f ./docker/testdb-docker-compose.yml -p test_db down
+
+      - name: Stop Stack
+        working-directory: ./stackv2
+        run: docker compose down