Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions .github/workflows/build-manual.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v6
with:
go-version: 1.25.x
go-version: 1.26.x
cache: true
cache-dependency-path: |
awl/go.sum
Expand Down Expand Up @@ -92,8 +92,8 @@ jobs:
go install golang.org/x/mobile/cmd/gomobile@latest
go get golang.org/x/mobile/cmd/gomobile
gomobile init
go mod tidy -compat=1.25
cd cmd/awl-tray && go mod tidy -compat=1.25 && cd ../..
go mod tidy -compat=1.26
cd cmd/awl-tray && go mod tidy -compat=1.26 && cd ../..
echo "check go mod tidy and git dirty"
test -z "$(git status --porcelain)" || (git status; git diff && false)
echo "start building"
Expand All @@ -104,13 +104,13 @@ jobs:
run: |
df -h
- name: Upload build artifacts
uses: actions/upload-artifact@v5
uses: actions/upload-artifact@v7
with:
name: awl-release-build
path: awl/build/*
if-no-files-found: error
- name: Upload flutter web artifacts
uses: actions/upload-artifact@v5
uses: actions/upload-artifact@v7
with:
name: awl-release-static
path: awl/static/
Expand Down Expand Up @@ -138,15 +138,15 @@ jobs:
ref: ${{ github.event.inputs.awl_ref }}
path: 'awl'
- name: Retrieve saved static/ build
uses: actions/download-artifact@v6
uses: actions/download-artifact@v8
with:
name: awl-release-static
path: awl/static

- name: Install Go
uses: actions/setup-go@v6
with:
go-version: 1.25.x
go-version: 1.26.x
cache: true
cache-dependency-path: |
awl/go.sum
Expand All @@ -160,7 +160,7 @@ jobs:
echo "ls build"
ls -lah build
- name: Upload build artifacts
uses: actions/upload-artifact@v5
uses: actions/upload-artifact@v7
with:
name: awl-release-build-macos
path: awl/build/*
Expand All @@ -180,16 +180,16 @@ jobs:
ref: ${{ github.event.inputs.awl_ref }}
path: 'awl'
- name: Retrieve saved static/ build
uses: actions/download-artifact@v6
uses: actions/download-artifact@v8
with:
name: awl-release-static
path: awl/static

- name: Download and setup go-legacy-win7
run: |
mkdir -p /tmp/go-legacy-setup
wget -P /tmp/go-legacy-setup https://github.com/thongtech/go-legacy-win7/releases/download/v1.25.7-1/go-legacy-win7-1.25.7-1.linux_amd64.tar.gz
tar -xzf /tmp/go-legacy-setup/go-legacy-win7-1.25.7-1.linux_amd64.tar.gz -C /tmp/go-legacy-setup
wget -P /tmp/go-legacy-setup https://github.com/thongtech/go-legacy-win7/releases/download/v1.26.1-1/go-legacy-win7-1.26.1-1.linux_amd64.tar.gz
tar -xzf /tmp/go-legacy-setup/go-legacy-win7-1.26.1-1.linux_amd64.tar.gz -C /tmp/go-legacy-setup
export GOROOT=/tmp/go-legacy-setup/go-legacy-win7
export PATH=$GOROOT/bin:$PATH
go version
Expand All @@ -204,7 +204,7 @@ jobs:
echo "ls build"
ls -lah build
- name: Upload build artifacts
uses: actions/upload-artifact@v5
uses: actions/upload-artifact@v7
with:
name: awl-release-build-windows7
path: awl/build/*
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
- name: Install Go
uses: actions/setup-go@v6
with:
go-version: 1.25.x
go-version: 1.26.x
- name: Create stub embed files
run: mkdir static && touch static/index.html && touch embeds/wintun.dll
- name: golangci-lint
uses: golangci/golangci-lint-action@v9
with:
version: v2.11.3
version: v2.11.4
10 changes: 5 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v6
with:
go-version: 1.25.x
go-version: 1.26.x
cache: true
- name: Create stub static/
run: mkdir static && touch static/index.html
Expand All @@ -25,8 +25,8 @@ jobs:
- name: gofmt && go mod tidy
if: matrix.os == 'ubuntu-latest'
run: |
go mod tidy -compat=1.25
cd cmd/awl-tray && go mod tidy -compat=1.25 && cd ../..
go mod tidy -compat=1.26
cd cmd/awl-tray && go mod tidy -compat=1.26 && cd ../..
test -z "$(gofmt -d .)" || (gofmt -d . && false)
test -z "$(git status --porcelain)" || (git status; git diff && false)
- name: Test
Expand All @@ -36,7 +36,7 @@ jobs:
- name: Build cmd/awl
run: go build github.com/anywherelan/awl/cmd/awl
- name: Upload cmd/awl build
uses: actions/upload-artifact@v5
uses: actions/upload-artifact@v7
with:
name: awl-build-${{ runner.os }}
path: |
Expand All @@ -58,7 +58,7 @@ jobs:
shell: bash
steps:
- name: Retrieve saved cmd/awl build
uses: actions/download-artifact@v6
uses: actions/download-artifact@v8
with:
name: awl-build-${{ runner.os }}
- name: Download librespeed-cli
Expand Down
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: "2"
run:
go: "1.25"
go: "1.26"

linters:
default: none
Expand Down
2 changes: 1 addition & 1 deletion BUILDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Dependencies

* Go (1.25)
* Go (1.26)
* Git
* gomobile and Android Studio for Android ([see more](https://pkg.go.dev/golang.org/x/mobile/cmd/gomobile))
* Flutter (3.38) for Web and Android
Expand Down
2 changes: 1 addition & 1 deletion application_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ func TestUpdateUseAsExitNodeConfig(t *testing.T) {
return peer1Config.AllowedUsingAsExitNode && peer1Config.WeAllowUsingAsExitNode
}, 15*time.Second, 100*time.Millisecond)

ts.Equal(peer1.PeerID(), peer2.app.Conf.SOCKS5.UsingPeerID)
ts.Equal(peer1.PeerID(), peer2.app.SOCKS5.GetProxyPeerID())

// disallow from peer2, check that peer1 got our new config
err = peer2.api.UpdatePeerSettings(entity.UpdatePeerSettingsRequest{
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ build-android-lib() {
# about `-checklinkname=0` https://github.com/wlynxg/anet#how-to-build-with-go-1230-or-later
gomobile bind -trimpath -ldflags "-s -w -checklinkname=0 -X github.com/anywherelan/awl/config.Version=${VERSION}" -o anywherelan.aar -target=android .
go mod edit -droprequire=golang.org/x/mobile
go mod tidy -compat=1.25
go mod tidy -compat=1.26
mkdir -p "$awlflutterdir/android/app/src/main/libs"
mv anywherelan.aar "$awlflutterdir/android/app/src/main/libs/"
}
Expand Down
70 changes: 35 additions & 35 deletions cmd/awl-tray/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module awl-tray

go 1.25.0
go 1.26.0

replace (
github.com/anywherelan/awl => ../../
Expand All @@ -17,12 +17,14 @@ require (
github.com/gen2brain/beeep v0.11.2
github.com/godbus/dbus/v5 v5.2.2
github.com/ipfs/go-log/v2 v2.9.1
github.com/libp2p/go-libp2p v0.47.0
github.com/libp2p/go-libp2p v0.48.0
github.com/ncruces/zenity v0.10.8
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
)

require (
filippo.io/bigmod v0.1.1-0.20260103110540-f8a47775ebe5 // indirect
filippo.io/keygen v0.0.0-20260114151900-8e2790ea4c5b // indirect
git.sr.ht/~jackmordaunt/go-toast v1.1.2 // indirect
github.com/akavel/rsrc v0.10.2 // indirect
github.com/anywherelan/ts-dns v0.0.0-20240721135326-6d6b7b811853 // indirect
Expand All @@ -34,19 +36,19 @@ require (
github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
github.com/dblohm7/wingoes v0.0.0-20240119213807-a09d6be7affa // indirect
github.com/dchest/jsmin v0.0.0-20220218165748-59f39799265f // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.1 // indirect
github.com/docker/libcontainer v2.2.1+incompatible // indirect
github.com/dunglas/httpsfv v1.1.0 // indirect
github.com/esiqveland/notify v0.13.3 // indirect
github.com/filecoin-project/go-clock v0.1.0 // indirect
github.com/flynn/noise v1.1.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.12 // indirect
github.com/gabriel-vasile/mimetype v1.4.13 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-ole/go-ole v1.3.0 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.30.1 // indirect
github.com/go-playground/validator/v10 v10.30.2 // indirect
github.com/google/go-querystring v1.2.0 // indirect
github.com/google/gopacket v1.1.19 // indirect
github.com/google/uuid v1.6.0 // indirect
Expand All @@ -55,10 +57,10 @@ require (
github.com/haxii/socks5 v1.0.0 // indirect
github.com/huin/goupnp v1.3.0 // indirect
github.com/illarion/gonotify v1.0.1 // indirect
github.com/ipfs/boxo v0.35.2 // indirect
github.com/ipfs/boxo v0.37.0 // indirect
github.com/ipfs/go-cid v0.6.0 // indirect
github.com/ipfs/go-datastore v0.9.0 // indirect
github.com/ipld/go-ipld-prime v0.21.0 // indirect
github.com/ipfs/go-datastore v0.9.1 // indirect
github.com/ipld/go-ipld-prime v0.22.0 // indirect
github.com/jackmordaunt/icns/v3 v3.0.1 // indirect
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
Expand All @@ -67,14 +69,14 @@ require (
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
github.com/koron/go-ssdp v0.0.6 // indirect
github.com/labstack/echo-contrib v0.50.1 // indirect
github.com/labstack/echo/v4 v4.15.0 // indirect
github.com/labstack/echo/v4 v4.15.1 // indirect
github.com/labstack/gommon v0.4.2 // indirect
github.com/leodido/go-urn v1.4.0 // indirect
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
github.com/libp2p/go-cidranger v1.1.0 // indirect
github.com/libp2p/go-flow-metrics v0.3.0 // indirect
github.com/libp2p/go-libp2p-asn-util v0.4.1 // indirect
github.com/libp2p/go-libp2p-kad-dht v0.37.1 // indirect
github.com/libp2p/go-libp2p-kad-dht v0.39.0 // indirect
github.com/libp2p/go-libp2p-kbucket v0.8.0 // indirect
github.com/libp2p/go-libp2p-record v0.3.1 // indirect
github.com/libp2p/go-libp2p-routing-helpers v0.7.5 // indirect
Expand All @@ -96,7 +98,7 @@ require (
github.com/multiformats/go-base32 v0.1.0 // indirect
github.com/multiformats/go-base36 v0.2.0 // indirect
github.com/multiformats/go-multiaddr v0.16.1 // indirect
github.com/multiformats/go-multiaddr-dns v0.4.1 // indirect
github.com/multiformats/go-multiaddr-dns v0.5.0 // indirect
github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
github.com/multiformats/go-multibase v0.2.0 // indirect
github.com/multiformats/go-multicodec v0.10.0 // indirect
Expand All @@ -108,29 +110,27 @@ require (
github.com/olekukonko/tablewriter v0.0.5 // indirect
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
github.com/pion/datachannel v1.5.10 // indirect
github.com/pion/dtls/v2 v2.2.12 // indirect
github.com/pion/dtls/v3 v3.0.6 // indirect
github.com/pion/dtls/v3 v3.1.2 // indirect
github.com/pion/ice/v4 v4.0.10 // indirect
github.com/pion/interceptor v0.1.40 // indirect
github.com/pion/logging v0.2.3 // indirect
github.com/pion/logging v0.2.4 // indirect
github.com/pion/mdns/v2 v2.0.7 // indirect
github.com/pion/randutil v0.1.0 // indirect
github.com/pion/rtcp v1.2.15 // indirect
github.com/pion/rtcp v1.2.16 // indirect
github.com/pion/rtp v1.8.19 // indirect
github.com/pion/sctp v1.8.39 // indirect
github.com/pion/sdp/v3 v3.0.13 // indirect
github.com/pion/sdp/v3 v3.0.18 // indirect
github.com/pion/srtp/v3 v3.0.6 // indirect
github.com/pion/stun v0.6.1 // indirect
github.com/pion/stun/v3 v3.0.0 // indirect
github.com/pion/transport/v2 v2.2.10 // indirect
github.com/pion/stun/v3 v3.1.1 // indirect
github.com/pion/transport/v3 v3.0.7 // indirect
github.com/pion/transport/v4 v4.0.1 // indirect
github.com/pion/turn/v4 v4.0.2 // indirect
github.com/pion/webrtc/v4 v4.1.2 // indirect
github.com/polydawn/refmt v0.89.0 // indirect
github.com/polydawn/refmt v0.89.1-0.20231129105047-37766d95467a // indirect
github.com/prometheus/client_golang v1.23.2 // indirect
github.com/prometheus/client_model v0.6.2 // indirect
github.com/prometheus/common v0.67.5 // indirect
github.com/prometheus/procfs v0.19.2 // indirect
github.com/prometheus/procfs v0.20.1 // indirect
github.com/quic-go/qpack v0.6.0 // indirect
github.com/quic-go/quic-go v0.59.0 // indirect
github.com/quic-go/webtransport-go v0.10.0 // indirect
Expand All @@ -147,29 +147,29 @@ require (
github.com/wlynxg/anet v0.0.5 // indirect
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/otel v1.39.0 // indirect
go.opentelemetry.io/otel/metric v1.39.0 // indirect
go.opentelemetry.io/otel/trace v1.39.0 // indirect
go.opentelemetry.io/otel v1.42.0 // indirect
go.opentelemetry.io/otel/metric v1.42.0 // indirect
go.opentelemetry.io/otel/trace v1.42.0 // indirect
go.uber.org/dig v1.19.0 // indirect
go.uber.org/fx v1.24.0 // indirect
go.uber.org/mock v0.5.2 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.1 // indirect
go.yaml.in/yaml/v2 v2.4.3 // indirect
go.yaml.in/yaml/v2 v2.4.4 // indirect
go4.org/mem v0.0.0-20220726221520-4f986261bf13 // indirect
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
golang.org/x/crypto v0.48.0 // indirect
golang.org/x/exp v0.0.0-20260112195511-716be5621a96 // indirect
golang.org/x/crypto v0.49.0 // indirect
golang.org/x/exp v0.0.0-20260312153236-7ab1446f8b90 // indirect
golang.org/x/image v0.25.0 // indirect
golang.org/x/mod v0.33.0 // indirect
golang.org/x/net v0.50.0 // indirect
golang.org/x/sync v0.19.0 // indirect
golang.org/x/sys v0.41.0 // indirect
golang.org/x/telemetry v0.0.0-20260209163413-e7419c687ee4 // indirect
golang.org/x/term v0.40.0 // indirect
golang.org/x/text v0.34.0 // indirect
golang.org/x/mod v0.34.0 // indirect
golang.org/x/net v0.52.0 // indirect
golang.org/x/sync v0.20.0 // indirect
golang.org/x/sys v0.43.0 // indirect
golang.org/x/telemetry v0.0.0-20260311193753-579e4da9a98c // indirect
golang.org/x/term v0.41.0 // indirect
golang.org/x/text v0.35.0 // indirect
golang.org/x/time v0.14.0 // indirect
golang.org/x/tools v0.42.0 // indirect
golang.org/x/tools v0.43.0 // indirect
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
golang.zx2c4.com/wireguard v0.0.0-20250521234502-f333402bd9cb // indirect
golang.zx2c4.com/wireguard/windows v0.5.3 // indirect
Expand Down
Loading