From 4bde54c54048772ec1fe4219144f1ad791bc56fb Mon Sep 17 00:00:00 2001 From: Cafe137 Date: Sun, 30 Nov 2025 18:24:09 +0100 Subject: [PATCH 01/10] ci: test with bee-2.7.0 --- .github/workflows/ci.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6760bb1d..50d9838c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -35,7 +35,11 @@ jobs: run: npm ci - name: Install fdp-play - run: npm install --global @fairdatasociety/fdp-play + run: | + git clone git@github.com:fairDataSociety/fdp-play.git + cd fdp-play && npm install + cd ui && npm install + cd ../../ && npm run build:env -- --build-base-bee --bee-repository=Cafe137/inbee4.git - name: Install swarm-cli run: npm install --global @ethersphere/swarm-cli @@ -47,7 +51,7 @@ jobs: run: npx bee-dev --port 16338 --no-swap & - name: Start fdp-play environment - run: fdp-play start --detach --fresh --bee-version ${{ matrix.bee-version }} + run: fdp-play start --blockchain-image ethereum/client-go:release-1.13 --bee-version HEAD-commit - name: Deposit to chequebook run: | From 1cdf6c3fae1b6f8bbbdc0de91f1fc80a5cc6fac5 Mon Sep 17 00:00:00 2001 From: Cafe137 Date: Sun, 30 Nov 2025 18:25:43 +0100 Subject: [PATCH 02/10] ci(fix): prepare fdp-play --- .github/workflows/ci.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 50d9838c..461b91cf 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -34,9 +34,9 @@ jobs: - name: Install dependencies run: npm ci - - name: Install fdp-play + - name: Prepare fdp-play images run: | - git clone git@github.com:fairDataSociety/fdp-play.git + git clone https://github.com/fairDataSociety/fdp-play cd fdp-play && npm install cd ui && npm install cd ../../ && npm run build:env -- --build-base-bee --bee-repository=Cafe137/inbee4.git @@ -51,7 +51,9 @@ jobs: run: npx bee-dev --port 16338 --no-swap & - name: Start fdp-play environment - run: fdp-play start --blockchain-image ethereum/client-go:release-1.13 --bee-version HEAD-commit + run: | + npm install --global @fairdatasociety/fdp-play + fdp-play start --blockchain-image ethereum/client-go:release-1.13 --bee-version HEAD-commit - name: Deposit to chequebook run: | From 208acc58070baf7fd3585fbb9e0e65fbd689c0aa Mon Sep 17 00:00:00 2001 From: Cafe137 Date: Sun, 30 Nov 2025 18:27:42 +0100 Subject: [PATCH 03/10] ci(fix): cd --- .github/workflows/ci.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 461b91cf..e0056fbd 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -38,8 +38,9 @@ jobs: run: | git clone https://github.com/fairDataSociety/fdp-play cd fdp-play && npm install - cd ui && npm install - cd ../../ && npm run build:env -- --build-base-bee --bee-repository=Cafe137/inbee4.git + cd orchestrator && npm install + cd .. && npm run build:env -- --build-base-bee --bee-repository=Cafe137/inbee4.git + cd .. - name: Install swarm-cli run: npm install --global @ethersphere/swarm-cli From 88141a31432b8ebcf5ad0fba30fdc047799a7fbf Mon Sep 17 00:00:00 2001 From: Cafe137 Date: Sun, 30 Nov 2025 18:31:01 +0100 Subject: [PATCH 04/10] ci(fix): cd --- .github/workflows/ci.yaml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e0056fbd..8dc8583d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -34,13 +34,16 @@ jobs: - name: Install dependencies run: npm ci - - name: Prepare fdp-play images + - name: Clone fdp-play + run: git clone https://github.com/fairDataSociety/fdp-play + + - name: Install fdp-play dependencies run: | - git clone https://github.com/fairDataSociety/fdp-play cd fdp-play && npm install cd orchestrator && npm install - cd .. && npm run build:env -- --build-base-bee --bee-repository=Cafe137/inbee4.git - cd .. + + - name: Build fdp-play images + run: npm run build:env -- --build-base-bee --bee-repository=Cafe137/inbee4.git - name: Install swarm-cli run: npm install --global @ethersphere/swarm-cli From d72e96582a80e0821898e3fc500342c4334b96de Mon Sep 17 00:00:00 2001 From: Cafe137 Date: Sun, 30 Nov 2025 18:32:42 +0100 Subject: [PATCH 05/10] ci(fix): cd --- .github/workflows/ci.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8dc8583d..275b7ac7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -43,7 +43,9 @@ jobs: cd orchestrator && npm install - name: Build fdp-play images - run: npm run build:env -- --build-base-bee --bee-repository=Cafe137/inbee4.git + run: | + cd fdp-play/orchestrator + npm run build:env -- --build-base-bee --bee-repository=Cafe137/inbee4.git - name: Install swarm-cli run: npm install --global @ethersphere/swarm-cli From 5527a9ed7d160e1dc42a55448f0497a8f57309b4 Mon Sep 17 00:00:00 2001 From: Cafe137 Date: Sun, 30 Nov 2025 18:43:58 +0100 Subject: [PATCH 06/10] ci: update ci.yaml --- .github/workflows/ci.yaml | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 275b7ac7..332d0f13 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -22,18 +22,19 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 - with: - fetch-depth: 1 + uses: actions/checkout@v6 - name: Set up Node.js - uses: actions/setup-node@v1 + uses: actions/setup-node@v6 with: node-version: 20.x - - name: Install dependencies + - name: Install local dependencies run: npm ci + - name: Install global dependencies + run: npm install --global bee-dev @fairdatasociety/fdp-play @ethersphere/swarm-cli npxie + - name: Clone fdp-play run: git clone https://github.com/fairDataSociety/fdp-play @@ -47,19 +48,14 @@ jobs: cd fdp-play/orchestrator npm run build:env -- --build-base-bee --bee-repository=Cafe137/inbee4.git - - name: Install swarm-cli - run: npm install --global @ethersphere/swarm-cli - - name: Run bee-dev - run: npx bee-dev --port 16337 & + run: bee-dev --port 16337 & - name: Run bee-dev with --no-swap - run: npx bee-dev --port 16338 --no-swap & + run: bee-dev --port 16338 --no-swap & - name: Start fdp-play environment - run: | - npm install --global @fairdatasociety/fdp-play - fdp-play start --blockchain-image ethereum/client-go:release-1.13 --bee-version HEAD-commit + run: fdp-play start --blockchain-image ethereum/client-go:release-1.13 --bee-version HEAD-commit - name: Deposit to chequebook run: | @@ -79,5 +75,5 @@ jobs: - name: Compare coverage if: github.ref != 'refs/heads/master' run: - npx npxie coverage-comparison "${{ github.repository }}" "master" "${{ github.head_ref }}" + npxie coverage-comparison "${{ github.repository }}" "master" "${{ github.head_ref }}" "test/coverage/coverage-summary.json" "${{ github.event.pull_request.number }}" "${{ secrets.GITHUB_TOKEN }}" From 5a6dfe475976040261d94062642ba83f339be8d9 Mon Sep 17 00:00:00 2001 From: Cafe137 Date: Sun, 30 Nov 2025 18:50:45 +0100 Subject: [PATCH 07/10] ci(fix): detach --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 332d0f13..9ae74014 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -55,7 +55,7 @@ jobs: run: bee-dev --port 16338 --no-swap & - name: Start fdp-play environment - run: fdp-play start --blockchain-image ethereum/client-go:release-1.13 --bee-version HEAD-commit + run: fdp-play start --detach --blockchain-image ethereum/client-go:release-1.13 --bee-version HEAD-commit - name: Deposit to chequebook run: | From 1f5576fe171908ae4bc00c101ef3c03a20009758 Mon Sep 17 00:00:00 2001 From: Cafe137 Date: Sun, 30 Nov 2025 19:10:39 +0100 Subject: [PATCH 08/10] ci: clean up fdp-play --- .github/workflows/ci.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9ae74014..8b8747cb 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -48,6 +48,9 @@ jobs: cd fdp-play/orchestrator npm run build:env -- --build-base-bee --bee-repository=Cafe137/inbee4.git + - name: Clean up fdp-play + run: rm -rf fdp-play + - name: Run bee-dev run: bee-dev --port 16337 & From 9e3658e79b2857fde7aba57b77297014437b14b8 Mon Sep 17 00:00:00 2001 From: Cafe137 Date: Sun, 30 Nov 2025 19:16:28 +0100 Subject: [PATCH 09/10] ci: clean up fdp-play --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8b8747cb..bbed6a52 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -49,7 +49,7 @@ jobs: npm run build:env -- --build-base-bee --bee-repository=Cafe137/inbee4.git - name: Clean up fdp-play - run: rm -rf fdp-play + run: rm -rf fdp-play/test - name: Run bee-dev run: bee-dev --port 16337 & From 9d7ebdc2eacb4fdaf00dfd8c3d2e3772d798af1b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 30 Nov 2025 19:00:37 +0000 Subject: [PATCH 10/10] test: update test coverage