diff --git a/.github/ci-cd-scripts/playwright-electron.sh b/.github/ci-cd-scripts/playwright-electron.sh index 0ddb995c4..d45556ba2 100755 --- a/.github/ci-cd-scripts/playwright-electron.sh +++ b/.github/ci-cd-scripts/playwright-electron.sh @@ -21,7 +21,7 @@ if [[ ! -f "test-results/.last-run.json" ]]; then fi retry=1 -max_retrys=5 +max_retrys=1 # retry failed tests, doing our own retries because using inbuilt playwright retries causes connection issues while [[ $retry -le $max_retrys ]]; do diff --git a/.github/workflows/cargo-test.yml b/.github/workflows/cargo-test.yml index 2c5c5c88a..58fe1332e 100644 --- a/.github/workflows/cargo-test.yml +++ b/.github/workflows/cargo-test.yml @@ -46,7 +46,7 @@ jobs: shell: bash run: |- cd "${{ matrix.dir }}" - cargo llvm-cov nextest --workspace --lcov --output-path lcov.info --test-threads=1 --no-fail-fast -P ci 2>&1 | tee /tmp/github-actions.log + cargo llvm-cov nextest --workspace --lcov --output-path lcov.info --test-threads=1 --retries=2 --no-fail-fast -P ci 2>&1 | tee /tmp/github-actions.log env: KITTYCAD_API_TOKEN: ${{secrets.KITTYCAD_API_TOKEN}} RUST_MIN_STACK: 10485760000 diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index ccd2bfee0..26ff17c99 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -200,9 +200,11 @@ jobs: - name: Run playwright/electron flow (with retries) id: retry if: ${{ !cancelled() && (success() || failure()) }} - shell: bash - run: | - .github/ci-cd-scripts/playwright-electron.sh ${{matrix.shardIndex}} ${{matrix.shardTotal}} ${{matrix.os}} + uses: nick-fields/retry@v3.0.0 + with: + command: .github/ci-cd-scripts/playwright-electron.sh ${{matrix.shardIndex}} ${{matrix.shardTotal}} ${{matrix.os}} + timeout_minutes: 30 + max_attempts: 25 env: CI: true FAIL_ON_CONSOLE_ERRORS: true