Skip to content

Commit 1ae45ed

Browse files
committed
chore: stop vendoring
1 parent 1dc12e0 commit 1ae45ed

File tree

11 files changed

+16
-98
lines changed

11 files changed

+16
-98
lines changed

.codeclimate.yml

Lines changed: 0 additions & 45 deletions
This file was deleted.

.codecov.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ codecov:
99

1010
ignore:
1111
- "_.*"
12-
- "vendor"
1312
- "scripts"
1413
- "contracts"
1514
- "Makefile"

.github/workflows/import-check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ jobs:
2020

2121
- name: Run messaging import check
2222
run: |
23-
echo "Finding all Go files outside the messaging and vendor directories..."
24-
files=$(find . -type f -name '*.go' ! -path './messaging/*' ! -path './vendor/*')
23+
echo "Finding all Go files outside the messaging directory..."
24+
files=$(find . -type f -name '*.go' ! -path './messaging/*')
2525
2626
echo "Checking for invalid imports of github.com/status-im/status-go/messaging/*..."
2727
for file in $files; do

.github/workflows/pr.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@ jobs:
1919
with:
2020
go-version: 1.24
2121

22+
- name: Get dependencies
23+
run: |
24+
set -eo pipefail
25+
go mod tidy && git diff --exit-code
26+
go mod download
27+
go mod verify
28+
2229
- name: Cache Go dependencies
2330
uses: actions/cache@v4
2431
id: cache-go-deps

.gitignore

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
*/**/.DS_Store
2222
.ethtest
2323
*/**/*tx_database*
24-
vendor/github.com/ethereum/go-ethereum/vendor
2524
node_modules/
2625
tags
2726
build/
@@ -46,7 +45,6 @@ profile.cov
4645

4746
# tests
4847
.ethereumtest/
49-
/vendor/**/*_test.go
5048
*.test
5149

5250
#
@@ -68,9 +66,6 @@ Session.vim
6866
/cmd/*/.ethereum/
6967
*.iml
7068

71-
# do not vendor nested vendor/ dirs
72-
vendor/**/vendor
73-
7469
# nodejs package
7570

7671
package.json
@@ -84,14 +79,6 @@ test.log
8479
test_*.log
8580
**/exit_code_*.txt
8681

87-
# Waku libs
88-
vendor/github.com/waku-org/go-zerokit-rln-x86_64/
89-
vendor/github.com/waku-org/go-zerokit-rln-apple/
90-
vendor/github.com/waku-org/go-zerokit-rln-arm/
91-
92-
# waku-go-bindings third_party directory
93-
vendor/**/waku-go-bindings/third_party/
94-
9582
# status-cli logs
9683
alice.log
9784
bob.log
@@ -114,7 +101,6 @@ report/results.xml
114101

115102
# generated files
116103
mock/
117-
!vendor/**/mock/
118104
mock.go
119105
*_mock_test.go
120106
*.pb.go
@@ -128,9 +114,5 @@ pkg/sentry/SENTRY_CONTEXT_NAME
128114
pkg/sentry/SENTRY_CONTEXT_VERSION
129115
pkg/sentry/SENTRY_PRODUCTION
130116

131-
# Don't ignore generated files in the vendor/ directory
132-
!vendor/**/*.pb.go
133-
!vendor/**/migrations.go
134-
135117
go.work
136118
go.work.sum

.golangci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
version: "2"
22
run:
3-
modules-download-mode: vendor
43
issues-exit-code: 1
54
tests: true
65
linters:
@@ -70,4 +69,3 @@ formatters:
7069
generated: strict
7170
paths:
7271
- static
73-
- vendor

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ RUN mkdir -p /go/src/github.com/status-im/status-go
1818
WORKDIR /go/src/github.com/status-im/status-go
1919

2020
ADD go.mod go.sum ./
21+
RUN go mod download
2122
RUN go install google.golang.org/protobuf/cmd/[email protected]
2223

2324
ADD . .

Makefile

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ all: $(GO_CMD_NAMES)
170170
.PHONY: $(GO_CMD_NAMES) $(GO_CMD_PATHS) $(GO_CMD_BUILDS)
171171
$(GO_CMD_BUILDS): generate $(LIBWAKU)
172172
$(GO_CMD_BUILDS): ##@build Build any Go project from cmd folder
173-
go build -mod=vendor -v \
173+
go build -v \
174174
-tags '$(BUILD_TAGS)' $(BUILD_FLAGS) \
175175
-o ./$@ ./cmd/$(notdir $@)
176176
@echo "Compilation done."
@@ -191,7 +191,7 @@ status-backend: build/bin/status-backend
191191
run-status-backend: PORT ?= 0
192192
run-status-backend: generate
193193
run-status-backend: ##@run Start status-backend server listening to localhost:PORT
194-
go run ./cmd/status-backend --address localhost:${PORT}
194+
go run -mod=mod ./cmd/status-backend --address localhost:${PORT}
195195

196196
push-notification-server: ##@build Build push-notification-server
197197
push-notification-server: build/bin/push-notification-server
@@ -210,7 +210,7 @@ status-go-deps:
210210
statusgo-c-bindings:
211211
## cmd/library/README.md explains the magic incantation behind this
212212
mkdir -p build/bin/statusgo-lib
213-
go run cmd/library/*.go > build/bin/statusgo-lib/main.go
213+
go run -mod=mod cmd/library/*.go > build/bin/statusgo-lib/main.go
214214

215215
statusgo-library: generate
216216
statusgo-library: statusgo-c-bindings $(LIBWAKU) ##@cross-compile Build status-go as static library for current platform
@@ -298,9 +298,9 @@ generate: ##@ Run generate for all given packages using go-generate-fast, fallb
298298
generate-contracts:
299299
go generate ./contracts
300300
download-tokens:
301-
go run ./services/wallet/token/token-lists/default-lists/downloader/main.go
301+
go run -mod=mod ./services/wallet/token/token-lists/default-lists/downloader/main.go
302302
analyze-token-stores:
303-
go run ./services/wallet/token/token-lists/analyzer/main.go
303+
go run -mod=mod ./services/wallet/token/token-lists/analyzer/main.go
304304

305305
prepare-release: clean-release
306306
mkdir -p $(RELEASE_DIR)
@@ -319,11 +319,9 @@ lint-fix:
319319
-and -not -name 'messenger_handlers.go' \
320320
-and -not -name '*/mock/*' \
321321
-and -not -name 'mock.go' \
322-
-and -not -wholename '*/vendor/*' \
323322
-exec goimports \
324323
-local 'github.com/ethereum/go-ethereum,github.com/status-im/status-go,github.com/status-im/markdown' \
325324
-w {} \;
326-
$(MAKE) vendor
327325

328326
docker-test: ##@tests Run tests in a docker container with golang.
329327
docker run --privileged --rm -it -v "$(PWD):$(DOCKER_TEST_WORKDIR)" -w "$(DOCKER_TEST_WORKDIR)" $(DOCKER_TEST_IMAGE) go test ${ARGS}
@@ -350,7 +348,6 @@ test-unit-prep: export UNIT_TEST_REPORT_CODECOV ?= false
350348
test-unit: test-unit-prep
351349
test-unit: export UNIT_TEST_RERUN_FAILS ?= true
352350
test-unit: export UNIT_TEST_PACKAGES ?= $(call sh, go list ./... | \
353-
grep -v /vendor | \
354351
grep -v /t/e2e | \
355352
grep -v /t/benchmarks | \
356353
grep -v /transactions/fake | \
@@ -379,7 +376,7 @@ benchmark:
379376

380377
lint-panics: export GOFLAGS ?= -tags='$(BUILD_TAGS)'
381378
lint-panics: generate
382-
go run ./cmd/lint-panics -root="$(PWD)" -skip=./cmd -test=false ./...
379+
go run -mod=mod ./cmd/lint-panics -root="$(PWD)" -skip=./cmd -test=false ./...
383380

384381
lint: generate lint-panics
385382
golangci-lint --build-tags '$(BUILD_TAGS)' run ./...
@@ -396,12 +393,6 @@ deep-clean: clean git-clean
396393
tidy:
397394
go mod tidy
398395

399-
vendor: generate
400-
go mod tidy
401-
go mod vendor
402-
go tool modvendor -copy="**/*.c **/*.h" -v
403-
.PHONY: vendor
404-
405396
migration: DEFAULT_MIGRATION_PATH := appdatabase/migrations/sql
406397
migration:
407398
touch $(DEFAULT_MIGRATION_PATH)/$$(date '+%s')_$(D).up.sql

_assets/ci/Jenkinsfile.tests

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -111,14 +111,6 @@ pipeline {
111111
} }
112112
}
113113

114-
stage('Vendor Check') {
115-
steps { script {
116-
nix.develop('make vendor', pure: false)
117-
/* fail build if vendoring hasn't been done */
118-
nix.develop('git diff --exit-code --no-color --stat vendor/')
119-
} }
120-
}
121-
122114
stage('Unit Tests') {
123115
environment {
124116
TEST_POSTGRES_PORT = "${env.DB_PORT}"

go.mod

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ module github.com/status-im/status-go
33
go 1.24.0
44

55
tool (
6-
github.com/goware/modvendor
76
github.com/kevinburke/go-bindata/v4/go-bindata
87
github.com/wadey/gocovmerge
98
go.uber.org/mock/mockgen
@@ -176,7 +175,6 @@ require (
176175
github.com/google/gopacket v1.1.19 // indirect
177176
github.com/google/pprof v0.0.0-20250202011525-fc3143867406 // indirect
178177
github.com/gorilla/securecookie v1.1.1 // indirect
179-
github.com/goware/modvendor v0.5.0 // indirect
180178
github.com/hashicorp/errwrap v1.1.0 // indirect
181179
github.com/hashicorp/go-bexpr v0.1.10 // indirect
182180
github.com/hashicorp/go-multierror v1.1.1 // indirect
@@ -209,7 +207,6 @@ require (
209207
github.com/mattn/go-colorable v0.1.13 // indirect
210208
github.com/mattn/go-isatty v0.0.20 // indirect
211209
github.com/mattn/go-runewidth v0.0.15 // indirect
212-
github.com/mattn/go-zglob v0.0.2-0.20191112051448-a8912a37f9e7 // indirect
213210
github.com/miekg/dns v1.1.63 // indirect
214211
github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b // indirect
215212
github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc // indirect

0 commit comments

Comments
 (0)