Skip to content

Commit 53ed2c7

Browse files
committed
chore(misc): refactor e2e workflow for better reuse
Signed-off-by: Fluent Crafter <205769460+fluentcrafter@users.noreply.github.com>
1 parent 6adebb1 commit 53ed2c7

1 file changed

Lines changed: 16 additions & 16 deletions

File tree

.github/actions/run-e2e-tests/action.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ runs:
7474
uses: lhotari/action-upterm@b0357f23233f5ea6d58947c0c402e0631bab7334 #v1
7575

7676
- name: Setup nodejs environment
77-
uses: ${{ github.action_path }}/../setup-nodejs
77+
uses: ./.github/actions/setup-nodejs
7878
with:
7979
working-directory: ${{ inputs.working-directory }}
8080
pnpm-install-options: '-F contracts -F "e2e..." --frozen-lockfile --prefer-offline'
@@ -190,21 +190,22 @@ runs:
190190
- name: Spin up fresh environment with retry
191191
shell: bash
192192
working-directory: ${{ inputs.working-directory }}
193-
timeout-minutes: 10
194193
run: |
195194
set -euo pipefail
196-
max=10
197-
attempt=0
198-
until make start-env-with-tracing-v2-ci CLEAN_PREVIOUS_ENV=false; do
199-
attempt=$((attempt + 1))
200-
if [ "$attempt" -ge "$max" ]; then
201-
echo "All $max attempts failed"
202-
exit 1
203-
fi
204-
echo "Attempt $attempt failed — cleaning up and retrying in 30 s..."
205-
make clean-environment || true
206-
sleep 30
207-
done
195+
timeout 10m bash -c '
196+
max=10
197+
attempt=0
198+
until make start-env-with-tracing-v2-ci CLEAN_PREVIOUS_ENV=false; do
199+
attempt=$((attempt + 1))
200+
if [ "$attempt" -ge "$max" ]; then
201+
echo "All $max attempts failed"
202+
exit 1
203+
fi
204+
echo "Attempt $attempt failed — cleaning up and retrying in 30 s..."
205+
make clean-environment || true
206+
sleep 30
207+
done
208+
'
208209
209210
- name: List docker containers/images
210211
if: ${{ always() && inputs.e2e-tests-containers-list == 'true' }}
@@ -218,9 +219,8 @@ runs:
218219
id: run_e2e_tests
219220
shell: bash
220221
working-directory: ${{ inputs.working-directory }}
221-
timeout-minutes: 6
222222
run: |
223-
pnpm run -F e2e test:local
223+
timeout 6m pnpm run -F e2e test:local
224224
225225
- name: Show e2e tests result
226226
if: always()

0 commit comments

Comments
 (0)