Skip to content
Snippets Groups Projects

Add .golangci.yaml & and add .golangci.yaml config, fixes #34

Open Pea Nut requested to merge fix-34 into main
1 unresolved thread

Issue: #34 Catch up with the desktop client

Edited by Pea Nut

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • changed milestone to %2025.04 LEAP VPN Release

  • Pea Nut requested review from @cyberta

    requested review from @cyberta

  • assigned to @peanut2

  • Author Developer

    We can also fix this little thing: obfsvpn!69 (comment 1231443) (obfsvpn should be merged before)

  • Pea Nut added 1 commit

    added 1 commit

    • 08786e41 - [CI] Remove "gofmt -l ./" job from .gitlabci.yml

    Compare with previous version

  • Author Developer

    Hm the gomobile part is failing because of some dependency inconsistencies. Do you have an idea @cyberta? https://0xacab.org/leap/bitmask-core/-/jobs/682098#L20

  • Pea Nut changed title from Add .golangci.yaml & and add .golangci.yaml config to Add .golangci.yaml & and add .golangci.yaml config, fixes #34

    changed title from Add .golangci.yaml & and add .golangci.yaml config to Add .golangci.yaml & and add .golangci.yaml config, fixes #34

  • Pea Nut changed the description

    changed the description

  • cyberta added 6 commits

    added 6 commits

    Compare with previous version

  • cyberta added 6 commits

    added 6 commits

    Compare with previous version

  • @peanut2 the CI runner works now, but the CI fails related to the formatting issues in the vendoring directory. Could you please have a look?

  • Pea Nut added 5 commits

    added 5 commits

    • 1c24fda2 - [KCP] Use obfsvpn.GetKCPDialer instead of obfsvpn.GetKCPDialer
    • 9c0050cb - Update third party dependencies
    • f929195d - Add .golangci.yaml
    • 6fedfbb3 - Add vendor modules
    • 6e20380c - [CI] Remove "gofmt -l ./" job from .gitlabci.yml

    Compare with previous version

  • Pea Nut added 3 commits

    added 3 commits

    • 7e060c41 - Add .golangci.yaml
    • f67c3151 - Add vendor modules
    • d35162e3 - [CI] Remove "gofmt -l ./" job from .gitlabci.yml

    Compare with previous version

  • Pea Nut added 2 commits

    added 2 commits

    • 22a7c1bc - Add vendor modules
    • 41e976cd - [CI] Remove "gofmt -l ./" job from .gitlabci.yml

    Compare with previous version

  • Author Developer

    Still read, but for a different reason. Can you please check? It's gomobile related and I can't run/test it locally.

    $ make mobileclient
    echo "ANDROID_NDK_HOME: ${ANDROID_NDK_HOME}" && \
    go env && \
    go get golang.org/x/mobile/cmd/gomobile@latest && \
    go install golang.org/x/mobile/cmd/gomobile@latest && \
    gomobile init && \
    gomobile bind -target='android' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./bitmask-core.aar -v ./pkg/mobile && \
    go mod tidy
    ANDROID_NDK_HOME: /opt/android-sdk-linux/ndk/21.4.7075529
    GO111MODULE=''
    GOARCH='amd64'
    GOBIN='/usr/local/go/bin'
    GOCACHE='/root/.cache/go-build'
    GOENV='/root/.config/go/env'
    GOEXE=''
    GOEXPERIMENT=''
    GOFLAGS=''
    GOHOSTARCH='amd64'
    GOHOSTOS='linux'
    GOINSECURE=''
    GOMODCACHE='/root/go/pkg/mod'
    GONOPROXY=''
    GONOSUMDB=''
    GOOS='linux'
    GOPATH='/root/go'
    GOPRIVATE=''
    GOPROXY='https://proxy.golang.org,direct'
    GOROOT='/usr/local/go'
    GOSUMDB='sum.golang.org'
    GOTMPDIR=''
    GOTOOLCHAIN='auto'
    GOTOOLDIR='/usr/local/go/pkg/tool/linux_amd64'
    GOVCS=''
    GOVERSION='go1.22.2'
    GCCGO='gccgo'
    GOAMD64='v1'
    AR='ar'
    CC='gcc'
    CXX='g++'
    CGO_ENABLED='1'
    GOMOD='/builds/leap/bitmask-core/go.mod'
    GOWORK=''
    CGO_CFLAGS='-O2 -g'
    CGO_CPPFLAGS=''
    CGO_CXXFLAGS='-O2 -g'
    CGO_FFLAGS='-O2 -g'
    CGO_LDFLAGS='-O2 -g'
    PKG_CONFIG='pkg-config'
    GOGCCFLAGS='-fPIC -m64 -pthread -Wl,--no-gc-sections -fmessage-length=0 -ffile-prefix-map=/tmp/go-build1432177422=/tmp/go-build -gno-record-gcc-switches'
    go: downloading golang.org/x/mobile v0.0.0-20250106192035-c31d5b91ecc3
    go: downloading golang.org/x/mod v0.22.0
    go: downloading golang.org/x/sync v0.10.0
    go: downloading golang.org/x/tools v0.29.0
    go: downloading golang.org/x/sys v0.29.0
    go: upgraded golang.org/x/crypto v0.30.0 => v0.32.0
    go: added golang.org/x/mobile v0.0.0-20250106192035-c31d5b91ecc3
    go: upgraded golang.org/x/mod v0.17.0 => v0.22.0
    go: upgraded golang.org/x/net v0.32.0 => v0.34.0
    go: upgraded golang.org/x/sys v0.28.0 => v0.29.0
    go: upgraded golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d => v0.29.0
    gomobile: err: exit status 1: stderr: go: inconsistent vendoring in /builds/leap/bitmask-core:
    	golang.org/x/net@v0.34.0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
    	golang.org/x/crypto@v0.32.0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
    	golang.org/x/mobile@v0.0.0-20250106192035-c31d5b91ecc3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
    	golang.org/x/mod@v0.22.0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
    	golang.org/x/sys@v0.29.0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
    	golang.org/x/tools@v0.29.0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
    	golang.org/x/crypto@v0.30.0: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
    	golang.org/x/net@v0.32.0: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
    	golang.org/x/sys@v0.28.0: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
    	To ignore the vendor directory, use -mod=readonly or -mod=mod.
    	To sync the vendor directory, run:
    		go mod vendor
    make: *** [Makefile:21: mobileclient] Error 1
Please register or sign in to reply
Loading