merge single commands into proxy test step

Author: konradodwrot

.github/workflows/ci.yml

@@ -11,39 +11,24 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Prepare env
-        run: make prepare-env
-
-      - name: Prepare SSH identity (dummy, for testing tunnel only)
-        run: make prepare-ssh GIT_USERNAME='ci-bot' GIT_EMAIL='ci@example.com'
-
-      - name: Build images
-        run: make build
-
-      - name: Start stack
-        run: make up
-
-      - name: Wait for proxy to accept connections
+      - name: Test proxy
         run: |
+          make prepare-env
+          make prepare-ssh GIT_USERNAME='ci-bot' GIT_EMAIL='ci@example.com'
+          make build
+          make up
           for i in $(seq 1 30); do
             if docker compose exec -T workspace \
                  curl -s -o /dev/null -x http://proxy:3128 https://github.com; then
               echo "proxy ready after ${i}s"
-              exit 0
+              break
+            fi
+            if [ "$i" -eq 30 ]; then
+              echo "proxy did not become ready in 30s" >&2
+              docker compose logs proxy
+              exit 1
             fi
             sleep 1
           done
-          echo "proxy did not become ready in 30s" >&2
-          docker compose logs proxy
-          exit 1
-
-      - name: Run proxy rule tests
-        run: make test
-
-      - name: Proxy logs on failure
-        if: failure()
-        run: docker compose logs proxy
+          make test
 
-      - name: Tear down
-        if: always()
-        run: make down