diff --git a/.github/workflows/test-integration-cli.yml b/.github/workflows/test-integration-cli.yml index de288fd..aecc98a 100644 --- a/.github/workflows/test-integration-cli.yml +++ b/.github/workflows/test-integration-cli.yml @@ -32,9 +32,4 @@ jobs: - name: Run CLI integration tests if: steps.changed-files.outputs.any_changed == 'true' - uses: nick-fields/retry@v2 - with: - timeout_minutes: 240 - max_attempts: 5 - retry_on: error - command: nix develop --command -- make test_integration_cli + run: nix develop --command -- make test_integration_cli diff --git a/.github/workflows/test-integration-derp.yml b/.github/workflows/test-integration-derp.yml index 88b7cf4..0e82901 100644 --- a/.github/workflows/test-integration-derp.yml +++ b/.github/workflows/test-integration-derp.yml @@ -32,9 +32,4 @@ jobs: - name: Run Embedded DERP server integration tests if: steps.changed-files.outputs.any_changed == 'true' - uses: nick-fields/retry@v2 - with: - timeout_minutes: 240 - max_attempts: 5 - retry_on: error - command: nix develop --command -- make test_integration_derp + run: nix develop --command -- make test_integration_derp diff --git a/.github/workflows/test-integration-general.yml b/.github/workflows/test-integration-general.yml index 01b31d9..8e393e6 100644 --- a/.github/workflows/test-integration-general.yml +++ b/.github/workflows/test-integration-general.yml @@ -32,9 +32,4 @@ jobs: - name: Run general integration tests if: steps.changed-files.outputs.any_changed == 'true' - uses: nick-fields/retry@v2 - with: - timeout_minutes: 240 - max_attempts: 5 - retry_on: error - command: nix develop --command -- make test_integration_general + run: nix develop --command -- make test_integration_general diff --git a/.github/workflows/test-integration-oidc.yml b/.github/workflows/test-integration-oidc.yml index e8afc1b..ac28be5 100644 --- a/.github/workflows/test-integration-oidc.yml +++ b/.github/workflows/test-integration-oidc.yml @@ -32,9 +32,4 @@ jobs: - name: Run OIDC integration tests if: steps.changed-files.outputs.any_changed == 'true' - uses: nick-fields/retry@v2 - with: - timeout_minutes: 240 - max_attempts: 5 - retry_on: error - command: nix develop --command -- make test_integration_oidc + run: nix develop --command -- make test_integration_oidc diff --git a/.github/workflows/test-integration-v2-general.yml b/.github/workflows/test-integration-v2-general.yml index fdd98d0..7c212aa 100644 --- a/.github/workflows/test-integration-v2-general.yml +++ b/.github/workflows/test-integration-v2-general.yml @@ -32,9 +32,4 @@ jobs: - name: Run general integration tests if: steps.changed-files.outputs.any_changed == 'true' - uses: nick-fields/retry@v2 - with: - timeout_minutes: 240 - max_attempts: 5 - retry_on: error - command: nix develop --command -- make test_integration_v2_general + run: nix develop --command -- make test_integration_v2_general diff --git a/Makefile b/Makefile index 431e107..36b6418 100644 --- a/Makefile +++ b/Makefile @@ -74,7 +74,7 @@ test_integration_v2_general: -v $$PWD:$$PWD -w $$PWD/integration \ -v /var/run/docker.sock:/var/run/docker.sock \ golang:1 \ - go test ./... -timeout 15m -v + go test ./... -timeout 30m coverprofile_func: go tool cover -func=coverage.out