ci: adjust devnet usage

starknet-io · Aug 9, 2023 · 85dc30e · 85dc30e
1 parent 5fc9aa4
commit 85dc30e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/.github/workflows/_test.yml b/.github/workflows/_test.yml
@@ -2,7 +2,10 @@ name: _ Run Tests
 on:
  workflow_call:
  inputs:
- is-rpc:
+ use-rpc-devnet:
+ type: boolean
+ default: false
+ use-seq-devnet:
  type: boolean
  default: false
  secrets:
@@ -23,11 +26,15 @@ jobs:
  # TODO - periodically check if conditional services are supported; https://github.com/actions/runner/issues/822
  services:
  devnet:
- # image: ${{ inputs.is-rpc && 'shardlabs/starknet-devnet:0.5.3-seed0' || 'shardlabs/starknet-devnet:0.5.2-seed0' }}
- image: shardlabs/starknet-devnet:0.5.5-seed0
+ # image: ${{ inputs.use-rpc-devnet && 'shardlabs/starknet-devnet:0.6.0a0-seed0' || inputs.use-seq-devnet && 'shardlabs/starknet-devnet:0.6.0a0-seed0' || '' }}
+ image: ${{ (inputs.use-rpc-devnet || inputs.use-seq-devnet) && 'shardlabs/starknet-devnet:0.6.0a0-seed0' || '' }}
+ # image: shardlabs/starknet-devnet:0.6.0a0-seed0
  ports:
  - 5050:5050
 
+ # TODO - temporary conditional, remove if/when devnet RPC support is restored
+ if: ${{ (!inputs.use-rpc-devnet) }}
+
  env:
  TEST_PROVIDER_BASE_URL: ${{ secrets.TEST_PROVIDER_BASE_URL }}
  TEST_RPC_URL: ${{ secrets.TEST_RPC_URL }}

diff --git a/.github/workflows/manual-tests-devnet.yml b/.github/workflows/manual-tests-devnet.yml
@@ -16,7 +16,8 @@ jobs:
 
  uses: ./.github/workflows/_test.yml
  with:
- is-rpc: ${{ matrix.TEST_RPC_URL != '' }}
+ use-rpc-devnet: ${{ matrix.TEST_RPC_URL != '' }}
+ use-seq-devnet: ${{ matrix.TEST_PROVIDER_BASE_URL != '' }}
  secrets:
  TEST_PROVIDER_BASE_URL: ${{ matrix.TEST_PROVIDER_BASE_URL }}
  TEST_RPC_URL: ${{ matrix.TEST_RPC_URL }}
diff --git a/.github/workflows/pr-push-dev.yml b/.github/workflows/pr-push-dev.yml
@@ -4,6 +4,7 @@ on:
  branches:
  - beta
  - develop
+ - next-version
  paths:
  - '__mocks__/**'
  - '__tests__/**'
@@ -15,6 +16,7 @@ on:
  branches:
  - beta
  - develop
+ - next-version
  paths:
  - '__mocks__/**'
  - '__tests__/**'
@@ -51,7 +53,8 @@ jobs:
 
  uses: ./.github/workflows/_test.yml
  with:
- is-rpc: ${{ matrix.TEST_RPC_URL != '' }}
+ use-rpc-devnet: ${{ matrix.TEST_RPC_URL != '' }}
+ use-seq-devnet: ${{ matrix.TEST_PROVIDER_BASE_URL != '' }}
  secrets:
  TEST_PROVIDER_BASE_URL: ${{ matrix.TEST_PROVIDER_BASE_URL }}
  TEST_RPC_URL: ${{ matrix.TEST_RPC_URL }}