Merge branch 'main' into refactor/iface-pkg

.github/workflows/golangci-lint.yml

@@ -19,7 +19,7 @@ jobs:
  - name: codespell
  uses: codespell-project/actions-codespell@v2
  with:
- ignore_words_list: erro,clienta,hastable,
+ ignore_words_list: erro,clienta,hastable,iif
  skip: go.mod,go.sum
  only_warn: 1
  golangci:

.github/workflows/install-script-test.yml

@@ -13,6 +13,7 @@ concurrency:
 jobs:
  test-install-script:
  strategy:
+ fail-fast: false
  max-parallel: 2
  matrix:
  os: [ubuntu-latest, macos-latest]

.github/workflows/release.yml

@@ -3,15 +3,14 @@ name: Release
 on:
  push:
  tags:
- - 'v*'
+ - "v*"
  branches:
  - main
  pull_request:
 
-
 env:
  SIGN_PIPE_VER: "v0.0.14"
- GORELEASER_VER: "v1.14.1"
+ GORELEASER_VER: "v2.3.2"
  PRODUCT_NAME: "NetBird"
  COPYRIGHT: "Wiretrustee UG (haftungsbeschreankt)"
 
@@ -34,19 +33,16 @@ jobs:
 
  - if: ${{ !startsWith(github.ref, 'refs/tags/v') }}
  run: echo "flags=--snapshot" >> $GITHUB_ENV
- -
- name: Checkout
+ - name: Checkout
  uses: actions/checkout@v4
  with:
  fetch-depth: 0 # It is required for GoReleaser to work properly
- -
- name: Set up Go
+ - name: Set up Go
  uses: actions/setup-go@v5
  with:
  go-version: "1.23"
  cache: false
- -
- name: Cache Go modules
+ - name: Cache Go modules
  uses: actions/cache@v4
  with:
  path: |
@@ -55,24 +51,19 @@ jobs:
  key: ${{ runner.os }}-go-releaser-${{ hashFiles('**/go.sum') }}
  restore-keys: |
  ${{ runner.os }}-go-releaser-
- -
- name: Install modules
+ - name: Install modules
  run: go mod tidy
- -
- name: check git status
+ - name: check git status
  run: git --no-pager diff --exit-code
- -
- name: Set up QEMU
+ - name: Set up QEMU
  uses: docker/setup-qemu-action@v2
- -
- name: Set up Docker Buildx
+ - name: Set up Docker Buildx
  uses: docker/setup-buildx-action@v2
- -
- name: Login to Docker hub
+ - name: Login to Docker hub
  if: github.event_name != 'pull_request'
  uses: docker/login-action@v1
  with:
- username: netbirdio
+ username: ${{ secrets.DOCKER_USER }}
  password: ${{ secrets.DOCKER_TOKEN }}
  - name: Install OS build dependencies
  run: sudo apt update && sudo apt install -y -q gcc-arm-linux-gnueabihf gcc-aarch64-linux-gnu
@@ -85,35 +76,31 @@ jobs:
  uses: goreleaser/goreleaser-action@v4
  with:
  version: ${{ env.GORELEASER_VER }}
- args: release --rm-dist ${{ env.flags }}
+ args: release --clean ${{ env.flags }}
  env:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
  HOMEBREW_TAP_GITHUB_TOKEN: ${{ secrets.HOMEBREW_TAP_GITHUB_TOKEN }}
  UPLOAD_DEBIAN_SECRET: ${{ secrets.PKG_UPLOAD_SECRET }}
  UPLOAD_YUM_SECRET: ${{ secrets.PKG_UPLOAD_SECRET }}
- -
- name: upload non tags for debug purposes
+ - name: upload non tags for debug purposes
  uses: actions/upload-artifact@v4
  with:
  name: release
  path: dist/
  retention-days: 3
- -
- name: upload linux packages
+ - name: upload linux packages
  uses: actions/upload-artifact@v4
  with:
  name: linux-packages
  path: dist/netbird_linux**
  retention-days: 3
- -
- name: upload windows packages
+ - name: upload windows packages
  uses: actions/upload-artifact@v4
  with:
  name: windows-packages
  path: dist/netbird_windows**
  retention-days: 3
- -
- name: upload macos packages
+ - name: upload macos packages
  uses: actions/upload-artifact@v4
  with:
  name: macos-packages
@@ -145,7 +132,7 @@ jobs:
  - name: Cache Go modules
  uses: actions/cache@v4
  with:
- path: | 
+ path: |
  ~/go/pkg/mod
  ~/.cache/go-build
  key: ${{ runner.os }}-ui-go-releaser-${{ hashFiles('**/go.sum') }}
@@ -169,7 +156,7 @@ jobs:
  uses: goreleaser/goreleaser-action@v4
  with:
  version: ${{ env.GORELEASER_VER }}
- args: release --config .goreleaser_ui.yaml --rm-dist ${{ env.flags }}
+ args: release --config .goreleaser_ui.yaml --clean ${{ env.flags }}
  env:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
  HOMEBREW_TAP_GITHUB_TOKEN: ${{ secrets.HOMEBREW_TAP_GITHUB_TOKEN }}
@@ -187,19 +174,16 @@ jobs:
  steps:
  - if: ${{ !startsWith(github.ref, 'refs/tags/v') }}
  run: echo "flags=--snapshot" >> $GITHUB_ENV
- -
- name: Checkout
+ - name: Checkout
  uses: actions/checkout@v4
  with:
  fetch-depth: 0 # It is required for GoReleaser to work properly
- -
- name: Set up Go
+ - name: Set up Go
  uses: actions/setup-go@v5
  with:
  go-version: "1.23"
  cache: false
- -
- name: Cache Go modules
+ - name: Cache Go modules
  uses: actions/cache@v4
  with:
  path: |
@@ -208,23 +192,19 @@ jobs:
  key: ${{ runner.os }}-ui-go-releaser-darwin-${{ hashFiles('**/go.sum') }}
  restore-keys: |
  ${{ runner.os }}-ui-go-releaser-darwin-
- -
- name: Install modules
+ - name: Install modules
  run: go mod tidy
- - 
- name: check git status
+ - name: check git status
  run: git --no-pager diff --exit-code
- -
- name: Run GoReleaser
+ - name: Run GoReleaser
  id: goreleaser
  uses: goreleaser/goreleaser-action@v4
  with:
  version: ${{ env.GORELEASER_VER }}
- args: release --config .goreleaser_ui_darwin.yaml --rm-dist ${{ env.flags }}
+ args: release --config .goreleaser_ui_darwin.yaml --clean ${{ env.flags }}
  env:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- -
- name: upload non tags for debug purposes
+ - name: upload non tags for debug purposes
  uses: actions/upload-artifact@v4
  with:
  name: release-ui-darwin
@@ -233,7 +213,7 @@ jobs:
 
  trigger_signer:
  runs-on: ubuntu-latest
- needs: [release,release_ui,release_ui_darwin]
+ needs: [release, release_ui, release_ui_darwin]
  if: startsWith(github.ref, 'refs/tags/')
  steps:
  - name: Trigger binaries sign pipelines

.goreleaser.yaml

@@ -1,3 +1,5 @@
+version: 2
+
 project_name: netbird
 builds:
  - id: netbird
@@ -22,7 +24,7 @@ builds:
  goarch: 386
  ldflags:
  - -s -w -X github.com/netbirdio/netbird/version.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}} -X main.builtBy=goreleaser
- mod_timestamp: '{{ .CommitTimestamp }}'
+ mod_timestamp: "{{ .CommitTimestamp }}"
  tags:
  - load_wgnt_from_rsrc
 
@@ -42,19 +44,19 @@ builds:
  - softfloat
  ldflags:
  - -s -w -X github.com/netbirdio/netbird/version.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}} -X main.builtBy=goreleaser
- mod_timestamp: '{{ .CommitTimestamp }}'
+ mod_timestamp: "{{ .CommitTimestamp }}"
  tags:
  - load_wgnt_from_rsrc
 
  - id: netbird-mgmt
  dir: management
  env:
- - CGO_ENABLED=1
- - >-
- {{- if eq .Runtime.Goos "linux" }}
- {{- if eq .Arch "arm64"}}CC=aarch64-linux-gnu-gcc{{- end }}
- {{- if eq .Arch "arm"}}CC=arm-linux-gnueabihf-gcc{{- end }}
- {{- end }}
+  - CGO_ENABLED=1
+  - >-
+  {{- if eq .Runtime.Goos "linux" }}
+  {{- if eq .Arch "arm64"}}CC=aarch64-linux-gnu-gcc{{- end }}
+  {{- if eq .Arch "arm"}}CC=arm-linux-gnueabihf-gcc{{- end }}
+  {{- end }}
  binary: netbird-mgmt
  goos:
  - linux
@@ -64,7 +66,7 @@ builds:
  - arm
  ldflags:
  - -s -w -X github.com/netbirdio/netbird/version.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}} -X main.builtBy=goreleaser
- mod_timestamp: '{{ .CommitTimestamp }}'
+ mod_timestamp: "{{ .CommitTimestamp }}"
 
  - id: netbird-signal
  dir: signal
@@ -78,7 +80,7 @@ builds:
  - arm
  ldflags:
  - -s -w -X github.com/netbirdio/netbird/version.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}} -X main.builtBy=goreleaser
- mod_timestamp: '{{ .CommitTimestamp }}'
+ mod_timestamp: "{{ .CommitTimestamp }}"
 
  - id: netbird-relay
  dir: relay
@@ -92,15 +94,14 @@ builds:
  - arm
  ldflags:
  - -s -w -X github.com/netbirdio/netbird/version.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}} -X main.builtBy=goreleaser
- mod_timestamp: '{{ .CommitTimestamp }}'
+ mod_timestamp: "{{ .CommitTimestamp }}"
 
 archives:
  - builds:
  - netbird
  - netbird-static
 
 nfpms:
-
  - maintainer: Netbird <[email protected]>
  description: Netbird client.
  homepage: https://netbird.io/
@@ -416,10 +417,9 @@ docker_manifests:
  - netbirdio/management:{{ .Version }}-debug-amd64
 
 brews:
- -
- ids:
+ - ids:
  - default
- tap:
+ repository:
  owner: netbirdio
  name: homebrew-tap
  token: "{{ .Env.HOMEBREW_TAP_GITHUB_TOKEN }}"
@@ -436,7 +436,7 @@ brews:
 uploads:
  - name: debian
  ids:
- - netbird-deb
+  - netbird-deb
  mode: archive
  target: https://pkgs.wiretrustee.com/debian/pool/{{ .ArtifactName }};deb.distribution=stable;deb.component=main;deb.architecture={{ if .Arm }}armhf{{ else }}{{ .Arch }}{{ end }};deb.package=
  username: [email protected]

.goreleaser_ui.yaml

@@ -1,3 +1,5 @@
+version: 2
+
 project_name: netbird-ui
 builds:
  - id: netbird-ui
@@ -11,7 +13,7 @@ builds:
  - amd64
  ldflags:
  - -s -w -X github.com/netbirdio/netbird/version.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}} -X main.builtBy=goreleaser
- mod_timestamp: '{{ .CommitTimestamp }}'
+ mod_timestamp: "{{ .CommitTimestamp }}"
 
  - id: netbird-ui-windows
  dir: client/ui
@@ -26,7 +28,7 @@ builds:
  ldflags:
  - -s -w -X github.com/netbirdio/netbird/version.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}} -X main.builtBy=goreleaser
  - -H windowsgui
- mod_timestamp: '{{ .CommitTimestamp }}'
+ mod_timestamp: "{{ .CommitTimestamp }}"
 
 archives:
  - id: linux-arch
@@ -39,7 +41,6 @@ archives:
  - netbird-ui-windows
 
 nfpms:
-
  - maintainer: Netbird <[email protected]>
  description: Netbird client UI.
  homepage: https://netbird.io/
@@ -77,7 +78,7 @@ nfpms:
 uploads:
  - name: debian
  ids:
- - netbird-ui-deb
+  - netbird-ui-deb
  mode: archive
  target: https://pkgs.wiretrustee.com/debian/pool/{{ .ArtifactName }};deb.distribution=stable;deb.component=main;deb.architecture={{ if .Arm }}armhf{{ else }}{{ .Arch }}{{ end }};deb.package=
  username: [email protected]

.goreleaser_ui_darwin.yaml

@@ -1,3 +1,5 @@
+version: 2
+
 project_name: netbird-ui
 builds:
  - id: netbird-ui-darwin
@@ -17,7 +19,7 @@ builds:
  - softfloat
  ldflags:
  - -s -w -X github.com/netbirdio/netbird/version.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}} -X main.builtBy=goreleaser
- mod_timestamp: '{{ .CommitTimestamp }}'
+ mod_timestamp: "{{ .CommitTimestamp }}"
  tags:
  - load_wgnt_from_rsrc
 
@@ -28,4 +30,4 @@ archives:
 checksum:
  name_template: "{{ .ProjectName }}_darwin_checksums.txt"
 changelog:
- skip: true
+ disable: true

CONTRIBUTING.md

@@ -96,7 +96,7 @@ They can be executed from the repository root before every push or PR:
 
 **Goreleaser**
 ```shell
-goreleaser --snapshot --rm-dist
+goreleaser build --snapshot --clean
 ```
 **golangci-lint**
 ```shell