Skip to content

Commit 8c8afe2

Browse files
Merge remote-tracking branch 'upstream/main' into fix_networkmonitor_false_enginerestarts
* upstream/main: (228 commits) [management] add breakdown of network map calculation metrics (#4020) [client] Don't open cmd.exe during MSI actions (#4041) [misc] Specify netbird binary location in Dockerfiles (#4024) [management] check and log on new management version (#4029) [misc] add additional metrics (#4028) [client] close windows when process needs to exit (#4027) [client] Refactor showLoginURL to improve error handling and connection status checks (#4026) [client] Handle lazy routing peers that are part of HA groups (#3943) [management] add transaction for integrated validator groups update and primary account update (#4014) [management] export ephemeral peer flag on api (#4004) [management] Add backward compatibility for older clients without firewall rules port range support (#4003) [client] Fix port range squashing (#4007) [client] Add more Android advanced settings (#4001) Fix route notification [management] Refactor routes to use store methods (#2928) [client] fix connection state handling (#3995) [client] Fix logic in updateStatus to correctly handle connection state (#3994) [management] Avoid recalculating next peer expiration (#3991) [client] Fix DNS Interceptor Build Error (#3993) [client] Tighten allowed domains for dns forwarder (#3978) ...
2 parents 0190ed4 + 1b73fae commit 8c8afe2

File tree

474 files changed

+35831
-12874
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

474 files changed

+35831
-12874
lines changed

.git-branches.toml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# More info around this file at https://www.git-town.com/configuration-file
2+
3+
[branches]
4+
main = "main"
5+
perennials = []
6+
perennial-regex = ""
7+
8+
[create]
9+
new-branch-type = "feature"
10+
push-new-branches = false
11+
12+
[hosting]
13+
dev-remote = "origin"
14+
# platform = ""
15+
# origin-hostname = ""
16+
17+
[ship]
18+
delete-tracking-branch = false
19+
strategy = "squash-merge"
20+
21+
[sync]
22+
feature-strategy = "merge"
23+
perennial-strategy = "rebase"
24+
prototype-strategy = "merge"
25+
push-hook = true
26+
tags = true
27+
upstream = false

.github/ISSUE_TEMPLATE/bug-issue-report.md

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,21 @@ If yes, which one?
3737

3838
**Debug output**
3939

40-
To help us resolve the problem, please attach the following debug output
40+
To help us resolve the problem, please attach the following anonymized status output
4141

4242
netbird status -dA
4343

44-
As well as the file created by
44+
Create and upload a debug bundle, and share the returned file key:
45+
46+
netbird debug for 1m -AS -U
47+
48+
*Uploaded files are automatically deleted after 30 days.*
49+
50+
51+
Alternatively, create the file only and attach it here manually:
4552

4653
netbird debug for 1m -AS
4754

48-
49-
We advise reviewing the anonymized output for any remaining personal information.
5055

5156
**Screenshots**
5257

@@ -57,8 +62,10 @@ If applicable, add screenshots to help explain your problem.
5762
Add any other context about the problem here.
5863

5964
**Have you tried these troubleshooting steps?**
65+
- [ ] Reviewed [client troubleshooting](https://docs.netbird.io/how-to/troubleshooting-client) (if applicable)
6066
- [ ] Checked for newer NetBird versions
6167
- [ ] Searched for similar issues on GitHub (including closed ones)
6268
- [ ] Restarted the NetBird client
6369
- [ ] Disabled other VPN software
6470
- [ ] Checked firewall settings
71+

.github/pull_request_template.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,16 @@
22

33
## Issue ticket number and link
44

5+
## Stack
6+
7+
<!-- branch-stack -->
8+
59
### Checklist
610
- [ ] Is it a bug fix
711
- [ ] Is a typo/documentation fix
812
- [ ] Is a feature enhancement
913
- [ ] It is a refactor
1014
- [ ] Created tests that fail without the change (if possible)
1115
- [ ] Extended the README / documentation, if necessary
16+
17+
> By submitting this pull request, you confirm that you have read and agree to the terms of the [Contributor License Agreement](https://github.com/netbirdio/netbird/blob/main/CONTRIBUTOR_LICENSE_AGREEMENT.md).

.github/workflows/git-town.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Git Town
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- '**'
7+
8+
jobs:
9+
git-town:
10+
name: Display the branch stack
11+
runs-on: ubuntu-latest
12+
13+
permissions:
14+
contents: read
15+
pull-requests: write
16+
17+
steps:
18+
- uses: actions/checkout@v4
19+
- uses: git-town/action@v1
20+
with:
21+
skip-single-stacks: true

.github/workflows/golang-test-freebsd.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,20 @@ jobs:
2222
with:
2323
usesh: true
2424
copyback: false
25-
release: "14.1"
25+
release: "14.2"
2626
prepare: |
27-
pkg install -y go pkgconf xorg
27+
pkg install -y curl pkgconf xorg
28+
LATEST_VERSION=$(curl -s https://go.dev/VERSION?m=text|head -n 1)
29+
GO_TARBALL="$LATEST_VERSION.freebsd-amd64.tar.gz"
30+
GO_URL="https://go.dev/dl/$GO_TARBALL"
31+
curl -vLO "$GO_URL"
32+
tar -C /usr/local -vxzf "$GO_TARBALL"
2833
2934
# -x - to print all executed commands
3035
# -e - to faile on first error
3136
run: |
3237
set -e -x
38+
export PATH=$PATH:/usr/local/go/bin:$HOME/go/bin
3339
time go build -o netbird client/main.go
3440
# check all component except management, since we do not support management server on freebsd
3541
time go test -timeout 1m -failfast ./base62/...

0 commit comments

Comments
 (0)