From 6b499b0593445553f6f07f7b9c374ba924596d63 Mon Sep 17 00:00:00 2001 From: George Knee Date: Wed, 4 Oct 2023 10:28:29 +0100 Subject: [PATCH 1/6] run test on pushes to main branch --- .github/workflows/ts-rpc-test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ts-rpc-test.yml b/.github/workflows/ts-rpc-test.yml index 6587ad9dd..6911e9691 100644 --- a/.github/workflows/ts-rpc-test.yml +++ b/.github/workflows/ts-rpc-test.yml @@ -1,6 +1,8 @@ name: TypeScript RPC Client Test on: + push: + branches: [main] pull_request: workflow_dispatch: jobs: From 234260704fe243032265c157617b85e3e9bfdae7 Mon Sep 17 00:00:00 2001 From: George Knee Date: Wed, 4 Oct 2023 10:59:49 +0100 Subject: [PATCH 2/6] tweak documentation --- packages/nitro-rpc-client/scripts/client-runner.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/nitro-rpc-client/scripts/client-runner.ts b/packages/nitro-rpc-client/scripts/client-runner.ts index b73881b3f..b7bc3118b 100755 --- a/packages/nitro-rpc-client/scripts/client-runner.ts +++ b/packages/nitro-rpc-client/scripts/client-runner.ts @@ -290,7 +290,7 @@ function getChannelIdFromObjectiveId(objectiveId: string): string { return objectiveId.split("-")[1]; } -// Waits for the RPC server to be available by sending a simple get_address POST request until we get a response +// Waits for the RPC server to be available async function waitForRPCServer( port: number, waitDuration: number @@ -317,7 +317,7 @@ async function waitForRPCServer( ); } -// Checks if the server is up by sending a simple get_address POST request +// Checks if the server is up by sending a simple GET request to the health endpoint // This is specific to the HTTP/WS RPC transport async function isServerUp(port: number): Promise { let result: AxiosResponse; From 0b3c8a00e0749f592baef0eea5ade593b2059fc6 Mon Sep 17 00:00:00 2001 From: George Knee Date: Wed, 4 Oct 2023 11:11:52 +0100 Subject: [PATCH 3/6] improve docs --- packages/nitro-rpc-client/scripts/client-runner.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nitro-rpc-client/scripts/client-runner.ts b/packages/nitro-rpc-client/scripts/client-runner.ts index b7bc3118b..e5a82b464 100755 --- a/packages/nitro-rpc-client/scripts/client-runner.ts +++ b/packages/nitro-rpc-client/scripts/client-runner.ts @@ -290,7 +290,7 @@ function getChannelIdFromObjectiveId(objectiveId: string): string { return objectiveId.split("-")[1]; } -// Waits for the RPC server to be available +// Waits up to waitDuration milliseconds for the RPC server to be available async function waitForRPCServer( port: number, waitDuration: number From b01563b11796fdc98a46ae835077b02f20db85b3 Mon Sep 17 00:00:00 2001 From: George Knee Date: Wed, 4 Oct 2023 11:24:19 +0100 Subject: [PATCH 4/6] try using node 16 --- .github/workflows/ts-rpc-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ts-rpc-test.yml b/.github/workflows/ts-rpc-test.yml index 6911e9691..48b74828d 100644 --- a/.github/workflows/ts-rpc-test.yml +++ b/.github/workflows/ts-rpc-test.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/setup-node@v3 with: cache: "yarn" - node-version: "18.15.0" + node-version: "16.0.0" # Install foundry so we can use it to run a chain instance - name: Install Foundry From 27aeaa561960707a080527379ad80f587208ccff Mon Sep 17 00:00:00 2001 From: George Knee Date: Wed, 4 Oct 2023 11:28:35 +0100 Subject: [PATCH 5/6] try node v20 --- .github/workflows/ts-rpc-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ts-rpc-test.yml b/.github/workflows/ts-rpc-test.yml index 48b74828d..16c226dbb 100644 --- a/.github/workflows/ts-rpc-test.yml +++ b/.github/workflows/ts-rpc-test.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/setup-node@v3 with: cache: "yarn" - node-version: "16.0.0" + node-version: "20.0.0" # Install foundry so we can use it to run a chain instance - name: Install Foundry From fbdcc9233a69e7cd80c97671178689d7871237d4 Mon Sep 17 00:00:00 2001 From: George Knee Date: Thu, 12 Oct 2023 09:25:06 +0100 Subject: [PATCH 6/6] update node version across all GHAs --- .github/workflows/bindings-check.yml | 18 +++++++++--------- .github/workflows/contracts.yml | 2 +- .github/workflows/yarn-build.yml | 14 +++++++++++--- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/.github/workflows/bindings-check.yml b/.github/workflows/bindings-check.yml index 0972c4ffb..b18a40abf 100644 --- a/.github/workflows/bindings-check.yml +++ b/.github/workflows/bindings-check.yml @@ -6,13 +6,13 @@ on: pull_request: paths: [ - 'packages/nitro-protocol/contracts/**', - 'generate-adjudicator-bindings.sh', - '.github/workflows/bindings-check.yml', - 'node/engine/chainservice/adjudicator/NitroAdjudicator.go', - 'node/engine/chainservice/consensusapp/ConsensusApp.go', - 'node/engine/chainservice/erc20/Token.go', - 'node/engine/chainservice/virtualpaymentapp/VirtualPaymentApp.go' + "packages/nitro-protocol/contracts/**", + "generate-adjudicator-bindings.sh", + ".github/workflows/bindings-check.yml", + "node/engine/chainservice/adjudicator/NitroAdjudicator.go", + "node/engine/chainservice/consensusapp/ConsensusApp.go", + "node/engine/chainservice/erc20/Token.go", + "node/engine/chainservice/virtualpaymentapp/VirtualPaymentApp.go", ] jobs: build: @@ -21,8 +21,8 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: '18.15.0' - cache: 'yarn' + node-version: "20.0.0" + cache: "yarn" - name: Install go-ethereum (includes abigen) run: go install github.com/ethereum/go-ethereum diff --git a/.github/workflows/contracts.yml b/.github/workflows/contracts.yml index d9981b827..0926572ea 100644 --- a/.github/workflows/contracts.yml +++ b/.github/workflows/contracts.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: "18.15.0" + node-version: "20.0.0" cache: "yarn" - name: Install dependencies run: yarn diff --git a/.github/workflows/yarn-build.yml b/.github/workflows/yarn-build.yml index 0bee5d7ca..b60642590 100644 --- a/.github/workflows/yarn-build.yml +++ b/.github/workflows/yarn-build.yml @@ -2,7 +2,15 @@ name: Yarn build and lint on: pull_request: - paths: ['packages/**/*.ts', 'packages/**/*.tsx', 'packages/**/*.js', 'packages/**/*.jsx', 'packages/**/*.json', 'packages/**/*.md'] + paths: + [ + "packages/**/*.ts", + "packages/**/*.tsx", + "packages/**/*.js", + "packages/**/*.jsx", + "packages/**/*.json", + "packages/**/*.md", + ] workflow_dispatch: jobs: build-and-lint: @@ -11,8 +19,8 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - cache: 'yarn' - node-version: "18.15.0" + cache: "yarn" + node-version: "20.0.0" - name: Install dependencies run: yarn - name: Build everything