From 5549c417e6b6a6187f492c9c48d93d887e2ca2a4 Mon Sep 17 00:00:00 2001 From: Russell Dempsey <1173416+SgtPooki@users.noreply.github.com> Date: Mon, 4 Dec 2023 14:27:19 -0800 Subject: [PATCH] fix: use proper env var and cleanup scripts --- .github/workflows/gateway-conformance.yml | 8 ++++---- package.json | 5 ++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/gateway-conformance.yml b/.github/workflows/gateway-conformance.yml index 562444e..ddad9e4 100644 --- a/.github/workflows/gateway-conformance.yml +++ b/.github/workflows/gateway-conformance.yml @@ -59,16 +59,16 @@ jobs: uses: actions/setup-node@v3 with: node-version: 20 - + - name: Checkout helia-http-gateway uses: actions/checkout@v3 with: path: helia-http-gateway - + - name: Install dependencies run: npm ci working-directory: helia-http-gateway - + - name: Build helia-http-gateway run: npm run build working-directory: helia-http-gateway @@ -77,7 +77,7 @@ jobs: - name: Start helia-http-gateway env: GATEWAY_CONFORMANCE_TEST: true - TRUSTLESS_GATEWAY: "http://127.0.0.1:8080" + TRUSTLESS_GATEWAYS: "http://127.0.0.1:8080" USE_LIBP2P: false PORT: 8090 run: | diff --git a/package.json b/package.json index b3bde97..bf2dd55 100644 --- a/package.json +++ b/package.json @@ -18,11 +18,10 @@ "test:e2e-flame": "concurrently -k -s all -n \"gateway,playwright\" -c \"magenta,blue\" \"npm run start:dev-flame\" \"wait-on 'tcp:$PORT' && npm run test:e2e\"", "test:e2e-doctor": "concurrently -k -s all -n \"gateway,playwright\" -c \"magenta,blue\" \"npm run start:dev-doctor\" \"wait-on 'tcp:$PORT' && npm run test:e2e\"", "test:gwc-kubo": "node ./scripts/kubo-init.js", - "test:gwc-helia": "npm run build && USE_LIBP2P=false PORT=8090 TRUSTLESS_GATEWAY='http://127.0.0.1:8080' npm start", + "test:gwc-helia": "npm run build && USE_LIBP2P=false PORT=8090 TRUSTLESS_GATEWAYS='http://127.0.0.1:8080' npm start", "test:gwc-setup": "concurrently -k -s all -n \"kubo,helia\" -c \"magenta,blue\" \"npm run test:gwc-kubo\" \"wait-on 'tcp:8080' && npm run test:gwc-helia\"", - "test:gwc-execute": "docker run --network host -v $PWD:/workspace -w /workspace ghcr.io/ipfs/gateway-conformance:v0.4.2 test --gateway-url http://localhost:8090 --json gwc-report.json --specs subdomain-ipfs-gateway,subdomain-ipns-gateway -- -timeout 30m", + "test:gwc-execute": "docker run --network host -v $PWD:/workspace -w /workspace ghcr.io/ipfs/gateway-conformance:v0.4.2 test --gateway-url 'http://localhost:8090' --subdomain-url 'http://localhost:8090' --json gwc-report.json --specs subdomain-ipns-gateway -- -timeout 30m", "test:gwc": "concurrently -k -s all -n \"kubo&helia,gateway-conformance\" -c \"magenta,blue\" \"npm run test:gwc-setup\" \"wait-on 'tcp:8090' && npm run test:gwc-execute\"", - "test:gateway-conformance": "TRUSTLESS_GATEWAY='http://localhost:8080' echo 'gateway conformance'", "healthcheck": "node dist/src/healthcheck.js", "debug:until-death": "./debugging/until-death.sh", "debug:test-gateways": "./debugging/test-gateways.sh"