mirror of
				https://github.com/juanfont/headscale.git
				synced 2025-10-28 10:51:44 +01:00 
			
		
		
		
	Merge branch 'main' into ipv6
This commit is contained in:
		
						commit
						90fb9aa4ed
					
				
							
								
								
									
										16
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										16
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							| @ -14,22 +14,38 @@ jobs: | |||||||
| 
 | 
 | ||||||
|     steps: |     steps: | ||||||
|       - uses: actions/checkout@v2 |       - uses: actions/checkout@v2 | ||||||
|  |         with: | ||||||
|  |           fetch-depth: 2 | ||||||
|  | 
 | ||||||
|  |       - name: Get changed files | ||||||
|  |         id: changed-files | ||||||
|  |         uses: tj-actions/changed-files@v14.1 | ||||||
|  |         with: | ||||||
|  |           files: | | ||||||
|  |             go.* | ||||||
|  |             **/*.go | ||||||
|  |             integration_test/ | ||||||
|  |             config-example.yaml | ||||||
| 
 | 
 | ||||||
|       - name: Setup Go |       - name: Setup Go | ||||||
|  |         if: steps.changed-files.outputs.any_changed == 'true' | ||||||
|         uses: actions/setup-go@v2 |         uses: actions/setup-go@v2 | ||||||
|         with: |         with: | ||||||
|           go-version: "1.17" |           go-version: "1.17" | ||||||
| 
 | 
 | ||||||
|       - name: Install dependencies |       - name: Install dependencies | ||||||
|  |         if: steps.changed-files.outputs.any_changed == 'true' | ||||||
|         run: | |         run: | | ||||||
|           go version |           go version | ||||||
|           sudo apt update |           sudo apt update | ||||||
|           sudo apt install -y make |           sudo apt install -y make | ||||||
| 
 | 
 | ||||||
|       - name: Run build |       - name: Run build | ||||||
|  |         if: steps.changed-files.outputs.any_changed == 'true' | ||||||
|         run: make build |         run: make build | ||||||
| 
 | 
 | ||||||
|       - uses: actions/upload-artifact@v2 |       - uses: actions/upload-artifact@v2 | ||||||
|  |         if: steps.changed-files.outputs.any_changed == 'true' | ||||||
|         with: |         with: | ||||||
|           name: headscale-linux |           name: headscale-linux | ||||||
|           path: headscale |           path: headscale | ||||||
|  | |||||||
							
								
								
									
										31
									
								
								.github/workflows/lint.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										31
									
								
								.github/workflows/lint.yml
									
									
									
									
										vendored
									
									
								
							| @ -8,8 +8,21 @@ jobs: | |||||||
|     runs-on: ubuntu-latest |     runs-on: ubuntu-latest | ||||||
|     steps: |     steps: | ||||||
|       - uses: actions/checkout@v2 |       - uses: actions/checkout@v2 | ||||||
|  |         with: | ||||||
|  |           fetch-depth: 2 | ||||||
|  | 
 | ||||||
|  |       - name: Get changed files | ||||||
|  |         id: changed-files | ||||||
|  |         uses: tj-actions/changed-files@v14.1 | ||||||
|  |         with: | ||||||
|  |           files: | | ||||||
|  |             go.* | ||||||
|  |             **/*.go | ||||||
|  |             integration_test/ | ||||||
|  |             config-example.yaml | ||||||
| 
 | 
 | ||||||
|       - name: golangci-lint |       - name: golangci-lint | ||||||
|  |         if: steps.changed-files.outputs.any_changed == 'true' | ||||||
|         uses: golangci/golangci-lint-action@v2 |         uses: golangci/golangci-lint-action@v2 | ||||||
|         with: |         with: | ||||||
|           version: latest |           version: latest | ||||||
| @ -24,8 +37,26 @@ jobs: | |||||||
|     runs-on: ubuntu-latest |     runs-on: ubuntu-latest | ||||||
|     steps: |     steps: | ||||||
|       - uses: actions/checkout@v2 |       - uses: actions/checkout@v2 | ||||||
|  |         with: | ||||||
|  |           fetch-depth: 2 | ||||||
|  | 
 | ||||||
|  |       - name: Get changed files | ||||||
|  |         id: changed-files | ||||||
|  |         uses: tj-actions/changed-files@v14.1 | ||||||
|  |         with: | ||||||
|  |           files: | | ||||||
|  |             **/*.md | ||||||
|  |             **/*.yml | ||||||
|  |             **/*.yaml | ||||||
|  |             **/*.ts | ||||||
|  |             **/*.js | ||||||
|  |             **/*.sass | ||||||
|  |             **/*.css | ||||||
|  |             **/*.scss | ||||||
|  |             **/*.html | ||||||
| 
 | 
 | ||||||
|       - name: Prettify code |       - name: Prettify code | ||||||
|  |         if: steps.changed-files.outputs.any_changed == 'true' | ||||||
|         uses: creyD/prettier_action@v4.0 |         uses: creyD/prettier_action@v4.0 | ||||||
|         with: |         with: | ||||||
|           prettier_options: >- |           prettier_options: >- | ||||||
|  | |||||||
							
								
								
									
										19
									
								
								.github/workflows/test-integration.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										19
									
								
								.github/workflows/test-integration.yml
									
									
									
									
										vendored
									
									
								
							| @ -3,21 +3,30 @@ name: CI | |||||||
| on: [pull_request] | on: [pull_request] | ||||||
| 
 | 
 | ||||||
| jobs: | jobs: | ||||||
|   # The "build" workflow |  | ||||||
|   integration-test: |   integration-test: | ||||||
|     # The type of runner that the job will run on |  | ||||||
|     runs-on: ubuntu-latest |     runs-on: ubuntu-latest | ||||||
| 
 | 
 | ||||||
|     # Steps represent a sequence of tasks that will be executed as part of the job |  | ||||||
|     steps: |     steps: | ||||||
|       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it |  | ||||||
|       - uses: actions/checkout@v2 |       - uses: actions/checkout@v2 | ||||||
|  |         with: | ||||||
|  |           fetch-depth: 2 | ||||||
|  | 
 | ||||||
|  |       - name: Get changed files | ||||||
|  |         id: changed-files | ||||||
|  |         uses: tj-actions/changed-files@v14.1 | ||||||
|  |         with: | ||||||
|  |           files: | | ||||||
|  |             go.* | ||||||
|  |             **/*.go | ||||||
|  |             integration_test/ | ||||||
|  |             config-example.yaml | ||||||
| 
 | 
 | ||||||
|       # Setup Go |  | ||||||
|       - name: Setup Go |       - name: Setup Go | ||||||
|  |         if: steps.changed-files.outputs.any_changed == 'true' | ||||||
|         uses: actions/setup-go@v2 |         uses: actions/setup-go@v2 | ||||||
|         with: |         with: | ||||||
|           go-version: "1.17" |           go-version: "1.17" | ||||||
| 
 | 
 | ||||||
|       - name: Run Integration tests |       - name: Run Integration tests | ||||||
|  |         if: steps.changed-files.outputs.any_changed == 'true' | ||||||
|         run: go test -tags integration -timeout 30m |         run: go test -tags integration -timeout 30m | ||||||
|  | |||||||
							
								
								
									
										24
									
								
								.github/workflows/test.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										24
									
								
								.github/workflows/test.yml
									
									
									
									
										vendored
									
									
								
							| @ -3,31 +3,41 @@ name: CI | |||||||
| on: [push, pull_request] | on: [push, pull_request] | ||||||
| 
 | 
 | ||||||
| jobs: | jobs: | ||||||
|   # The "build" workflow |  | ||||||
|   test: |   test: | ||||||
|     # The type of runner that the job will run on |  | ||||||
|     runs-on: ubuntu-latest |     runs-on: ubuntu-latest | ||||||
| 
 | 
 | ||||||
|     # Steps represent a sequence of tasks that will be executed as part of the job |  | ||||||
|     steps: |     steps: | ||||||
|       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it |  | ||||||
|       - uses: actions/checkout@v2 |       - uses: actions/checkout@v2 | ||||||
|  |         with: | ||||||
|  |           fetch-depth: 2 | ||||||
|  | 
 | ||||||
|  |       - name: Get changed files | ||||||
|  |         id: changed-files | ||||||
|  |         uses: tj-actions/changed-files@v14.1 | ||||||
|  |         with: | ||||||
|  |           files: | | ||||||
|  |             go.* | ||||||
|  |             **/*.go | ||||||
|  |             integration_test/ | ||||||
|  |             config-example.yaml | ||||||
| 
 | 
 | ||||||
|       # Setup Go |  | ||||||
|       - name: Setup Go |       - name: Setup Go | ||||||
|  |         if: steps.changed-files.outputs.any_changed == 'true' | ||||||
|         uses: actions/setup-go@v2 |         uses: actions/setup-go@v2 | ||||||
|         with: |         with: | ||||||
|           go-version: "1.17" # The Go version to download (if necessary) and use. |           go-version: "1.17" | ||||||
| 
 | 
 | ||||||
|       # Install all the dependencies |  | ||||||
|       - name: Install dependencies |       - name: Install dependencies | ||||||
|  |         if: steps.changed-files.outputs.any_changed == 'true' | ||||||
|         run: | |         run: | | ||||||
|           go version |           go version | ||||||
|           sudo apt update |           sudo apt update | ||||||
|           sudo apt install -y make |           sudo apt install -y make | ||||||
| 
 | 
 | ||||||
|       - name: Run tests |       - name: Run tests | ||||||
|  |         if: steps.changed-files.outputs.any_changed == 'true' | ||||||
|         run: make test |         run: make test | ||||||
| 
 | 
 | ||||||
|       - name: Run build |       - name: Run build | ||||||
|  |         if: steps.changed-files.outputs.any_changed == 'true' | ||||||
|         run: make |         run: make | ||||||
|  | |||||||
| @ -1,8 +1,7 @@ | |||||||
| # This is an example .goreleaser.yml file with some sane defaults. | --- | ||||||
| # Make sure to check the documentation at http://goreleaser.com |  | ||||||
| before: | before: | ||||||
|   hooks: |   hooks: | ||||||
|     - go mod tidy |     - go mod tidy -compat=1.17 | ||||||
| 
 | 
 | ||||||
| release: | release: | ||||||
|   prerelease: auto |   prerelease: auto | ||||||
| @ -33,7 +32,7 @@ builds: | |||||||
|     goarch: |     goarch: | ||||||
|       - arm |       - arm | ||||||
|     goarm: |     goarm: | ||||||
|       - 7 |       - "7" | ||||||
|     env: |     env: | ||||||
|       - CC=arm-linux-gnueabihf-gcc |       - CC=arm-linux-gnueabihf-gcc | ||||||
|       - CXX=arm-linux-gnueabihf-g++ |       - CXX=arm-linux-gnueabihf-g++ | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user