Skip to content

Commit

Permalink
Merge branch 'master' into fix/define-repeater-id-as-sentry-user
Browse files Browse the repository at this point in the history
  • Loading branch information
orubin authored Nov 26, 2024
2 parents 4244ec8 + 8b9b23f commit 6b871b7
Showing 1 changed file with 12 additions and 3 deletions.
15 changes: 12 additions & 3 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,16 @@ on:
- development
test_timeout:
description: "Test timeout in seconds"
default: 3600
default: 5000

jobs:
executables:
if: ${{ inputs.test-executables }}
runs-on: ${{ matrix.os }}
container: ${{ matrix.container }}
env:
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true

strategy:
fail-fast: false
matrix:
Expand All @@ -64,7 +67,7 @@ jobs:
- os: ubuntu-latest
executable: bright-cli-linux-x64
node: 20
- os: macos-11
- os: macos-12
executable: bright-cli-macos-x64
node: 20
- os: macos-latest
Expand Down Expand Up @@ -125,6 +128,7 @@ jobs:
E2E_REPEATER_TARGET_URL: ${{ format('http://localhost:{0}', steps.target.outputs.port) }}
E2E_REPEATER_TARGET_CMD: ${{ steps.target.outputs.cmd }}
E2E_TEST_TIMEOUT: ${{ inputs.test_timeout }}

msi:
if: ${{ inputs.test-msi }}
runs-on: windows-latest
Expand Down Expand Up @@ -175,6 +179,7 @@ jobs:
E2E_REPEATER_TARGET_URL: ${{ format('http://localhost:{0}', steps.target.outputs.port) }}
E2E_REPEATER_TARGET_CMD: ${{ steps.target.outputs.cmd }}
E2E_TEST_TIMEOUT: ${{ inputs.test_timeout }}

docker:
if: ${{ inputs.test-docker }}
runs-on: ${{ matrix.os }}
Expand All @@ -187,7 +192,7 @@ jobs:
- name: Install Docker (MacOS)
if: ${{ startsWith(matrix.os, 'macos') }}
uses: docker-practice/actions-setup-docker@master
timeout-minutes: 12
timeout-minutes: 30

- name: Pull Image
run: docker pull brightsec/cli:${{ inputs.version }}
Expand Down Expand Up @@ -217,10 +222,14 @@ jobs:
E2E_REPEATER_TARGET_URL: ${{ format('http://host.docker.internal:{0}', steps.target.outputs.port) }}
E2E_REPEATER_TARGET_CMD: ${{ steps.target.outputs.cmd }}
E2E_TEST_TIMEOUT: ${{ inputs.test_timeout }}

npm:
if: ${{ inputs.test-npm }}
runs-on: ${{ matrix.os }}
container: ${{ matrix.container }}
env:
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true

strategy:
fail-fast: false
matrix:
Expand Down

0 comments on commit 6b871b7

Please sign in to comment.