Merge branch 'main' into integration-v2-no-verbose

juanfont · Oct 24, 2022 · 21b06f6 · 21b06f6
2 parents 86c132c + a14f482
commit 21b06f6
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 30 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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