myriation/headscale
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Merge branch 'main' into integration-v2-resolve-magicdns

Browse source
This commit is contained in:
Juan Font 2022-10-25 00:10:28 +02:00 committed by GitHub
commit e7e2c7804b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.github/workflows/test-integration-cli.yml vendored
View file

@ -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

7
.github/workflows/test-integration-derp.yml vendored
View file

@ -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

7
.github/workflows/test-integration-general.yml vendored
View file

@ -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

7
.github/workflows/test-integration-oidc.yml vendored
View file

@ -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

7
.github/workflows/test-integration-v2-general.yml vendored
View file

@ -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

2
Makefile
View file

@ -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