mirror of
				https://github.com/juanfont/headscale.git
				synced 2025-10-28 10:51:44 +01:00 
			
		
		
		
	Merge branch 'main' into integration-v2-resolve-magicdns
This commit is contained in:
		
						commit
						e7e2c7804b
					
				
							
								
								
									
										7
									
								
								.github/workflows/test-integration-cli.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										7
									
								
								.github/workflows/test-integration-cli.yml
									
									
									
									
										vendored
									
									
								
							@ -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
									
									
								
							
							
						
						
									
										7
									
								
								.github/workflows/test-integration-derp.yml
									
									
									
									
										vendored
									
									
								
							@ -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
 | 
			
		||||
 | 
			
		||||
@ -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
									
									
								
							
							
						
						
									
										7
									
								
								.github/workflows/test-integration-oidc.yml
									
									
									
									
										vendored
									
									
								
							@ -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
 | 
			
		||||
 | 
			
		||||
@ -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
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user