From 38a40676ab47fc30471661bd4e5d8857bbe2bc6a Mon Sep 17 00:00:00 2001 From: Cafe137 Date: Wed, 18 Sep 2024 11:06:46 +0200 Subject: [PATCH 1/3] ci: repair jobs --- .github/workflows/tests.yaml | 2 -- .github/workflows/update_bee.yaml | 27 +++++++++------------------ src/modules/debug/status.ts | 3 +-- 3 files changed, 10 insertions(+), 22 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 973f7eb5..82c60abe 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -11,8 +11,6 @@ on: env: BEE_API_URL: 'http://127.0.0.1:1633' BEE_PEER_API_URL: 'http://127.0.0.1:11633' - BEE_DEBUG_API_URL: 'http://127.0.0.1:1635' - BEE_PEER_DEBUG_API_URL: 'http://127.0.0.1:11635' BEE_TEST_CHEQUEBOOK: true jobs: diff --git a/.github/workflows/update_bee.yaml b/.github/workflows/update_bee.yaml index 521dc9c9..213c4ad7 100644 --- a/.github/workflows/update_bee.yaml +++ b/.github/workflows/update_bee.yaml @@ -16,7 +16,6 @@ on: repository_dispatch: types: [update-bee] - jobs: create-api-docs-pr: runs-on: ubuntu-latest @@ -72,7 +71,7 @@ jobs: with: find: "export const SUPPORTED_BEE_VERSION_EXACT = '.*?'" replace: "export const SUPPORTED_BEE_VERSION_EXACT = '${{ env.BEE_VERSION_WITH_COMMIT }}'" - include: "src/modules/debug/status.ts" + include: 'src/modules/debug/status.ts' regex: true - name: Replace SUPPORTED_API_VERSION for Status module @@ -80,22 +79,14 @@ jobs: with: find: "export const SUPPORTED_API_VERSION = '.*?'" replace: "export const SUPPORTED_API_VERSION = '${{ env.API_VERSION }}'" - include: "src/modules/debug/status.ts" - regex: true - - - name: Replace SUPPORTED_DEBUG_API_VERSION for Status module - uses: jacobtomlinson/gha-find-replace@v2 - with: - find: "export const SUPPORTED_DEBUG_API_VERSION = '.*?'" - replace: "export const SUPPORTED_DEBUG_API_VERSION = '${{ env.DEBUG_API_VERSION }}'" - include: "src/modules/debug/status.ts" + include: 'src/modules/debug/status.ts' regex: true - name: Replace README version uses: jacobtomlinson/gha-find-replace@v2 with: - find: ".*?" - replace: "${{ env.FINAL_CLEAN_BEE_VERSION }}" + find: '.*?' + replace: '${{ env.FINAL_CLEAN_BEE_VERSION }}' include: README.md regex: true @@ -105,11 +96,11 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.REPO_GHA_PAT }} with: - title: "chore: update to bee ${{ env.FINAL_CLEAN_BEE_VERSION }}" - body: "Updated Bee version ${{ env.BEE_VERSION_WITH_COMMIT }}" - branch: "bee-${{ env.FINAL_CLEAN_BEE_VERSION }}" - commit-message: "chore: update to bee" - author: "bee-worker " + title: 'chore: update to bee ${{ env.FINAL_CLEAN_BEE_VERSION }}' + body: 'Updated Bee version ${{ env.BEE_VERSION_WITH_COMMIT }}' + branch: 'bee-${{ env.FINAL_CLEAN_BEE_VERSION }}' + commit-message: 'chore: update to bee' + author: 'bee-worker ' - uses: joutvhu/get-release@v1 id: release-notes diff --git a/src/modules/debug/status.ts b/src/modules/debug/status.ts index 01572ebc..ca4a97d2 100644 --- a/src/modules/debug/status.ts +++ b/src/modules/debug/status.ts @@ -6,9 +6,8 @@ import { http } from '../../utils/http' // Following lines bellow are automatically updated with GitHub Action when Bee version is updated // so if you are changing anything about them change the `update_bee` action accordingly! -export const SUPPORTED_BEE_VERSION_EXACT = '1.18.2-759f56f' +export const SUPPORTED_BEE_VERSION_EXACT = '2.2.0-06a0aca7' export const SUPPORTED_API_VERSION = '4.0.0' -export const SUPPORTED_DEBUG_API_VERSION = '4.0.0' export const SUPPORTED_BEE_VERSION = SUPPORTED_BEE_VERSION_EXACT.split('-')[0] From e7d2fca5dd8a2dd2a62c7b333b8b03b66e5f3668 Mon Sep 17 00:00:00 2001 From: Cafe137 Date: Wed, 18 Sep 2024 11:07:23 +0200 Subject: [PATCH 2/3] ci: remove debug version bump --- .github/workflows/update_bee.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/update_bee.yaml b/.github/workflows/update_bee.yaml index 213c4ad7..a6ec8f7d 100644 --- a/.github/workflows/update_bee.yaml +++ b/.github/workflows/update_bee.yaml @@ -56,13 +56,6 @@ jobs: field: engines.beeApiVersion value: ${{ env.API_VERSION }} - - name: Replace Debug API version in package.json - uses: jossef/action-set-json-field@v1 - with: - file: package.json - field: engines.beeDebugApiVersion - value: ${{ env.DEBUG_API_VERSION }} - - name: Add trailing new-line to package.json run: printf "\n" >> package.json From ed82de7243ce72f5e2dbb4fd24cf5848a836dc70 Mon Sep 17 00:00:00 2001 From: Cafe137 Date: Wed, 18 Sep 2024 11:08:23 +0200 Subject: [PATCH 3/3] ci: specify exact fdp-play version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 979267c6..71f6b7d9 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "lint": "eslint --fix \"src/**/*.ts\" \"test/**/*.ts\" && prettier --write \"src/**/*.ts\" \"test/**/*.ts\"", "lint:check": "eslint \"src/**/*.ts\" \"test/**/*.ts\" && prettier --check \"src/**/*.ts\" \"test/**/*.ts\"", "depcheck": "depcheck .", - "bee": "npx fdp-play start --detach --fresh" + "bee": "npx @fairdatasociety/fdp-play@3.2.0 start --detach --fresh" }, "dependencies": { "@ethersphere/swarm-cid": "^0.1.0",