Skip to content

Commit f439f4e

Browse files
elekelek
committed
build: fixing common build failures after the merge
The previous merge accidently commited to early. I tried to force-push undo it, but the git syncer restored the commit. This patch includes the last changes for merging storj/private -> storj/storj, fixing the build. 1. import order is changed because package rename 2. arm check is not valid for sqlite (workaround: do it for selected subdirs, which is somewhat slower) 3. restoring the go.mod trick for the version check Downgrade: storj.io/common Change-Id: I65a9e1fa404225953bd3c89864f050581e55b8ce
1 parent f767a21 commit f439f4e

20 files changed

+29
-2742
lines changed

‎Jenkinsfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ pipeline {
4444
sh 'check-monkit ./...'
4545
sh './scripts/check-dependencies.sh'
4646
sh 'staticcheck ./...'
47-
sh 'GOOS=linux GOARCH=arm staticcheck ./...'
47+
sh './scripts/arm-staticcheck.sh'
4848
sh 'golangci-lint --config /go/ci/.golangci.yml -j=2 run'
4949
sh 'check-mod-tidy -mod .build/go.mod.orig'
5050
sh 'go-licenses check ./...'
@@ -62,13 +62,13 @@ pipeline {
6262
sh 'use-ports -from 1024 -to 10000 &'
6363
sh 'cockroach sql --insecure --host=localhost:26256 -e \'create database testcockroach;\''
6464
sh 'psql -U postgres -c \'create database teststorj;\''
65-
sh 'go test -parallel 4 -p 6 -vet=off $COVERFLAGS -timeout 20m -json -race ./... 2>&1 | tee .build/tests.json | xunit -out .build/tests.xml'
65+
sh 'go test -parallel 4 -p 6 -vet=off $COVERFLAGS -timeout 20m -json -race ./... | tee .build/tests.json | xunit -out .build/tests.xml'
6666
sh 'check-clean-directory'
6767
}
6868

6969
post {
7070
always {
71-
sh script: 'cat .build/tests.json | tparse -all -top -slow 100', returnStatus: true
71+
sh script: 'cat .build/tests.json | tparse -all -slow 100', returnStatus: true
7272
archiveArtifacts artifacts: '.build/tests.json'
7373
junit '.build/tests.xml'
7474

‎dbutil/cockroachutil/driver_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
"github.com/stretchr/testify/require"
1111
"github.com/zeebo/errs"
1212

13-
"storj.io/common/testcontext"
1413
"storj.io/common/dbutil/pgtest"
1514
"storj.io/common/tagsql"
15+
"storj.io/common/testcontext"
1616
)
1717

1818
func TestLibPqCompatibility(t *testing.T) {

‎dbutil/cockroachutil/openunique_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ import (
99

1010
"github.com/stretchr/testify/require"
1111

12-
"storj.io/common/testcontext"
1312
"storj.io/common/dbutil"
1413
"storj.io/common/dbutil/cockroachutil"
1514
"storj.io/common/dbutil/pgtest"
1615
"storj.io/common/dbutil/tempdb"
1716
"storj.io/common/tagsql"
17+
"storj.io/common/testcontext"
1818
)
1919

2020
func TestTempCockroachDB(t *testing.T) {

‎dbutil/pgutil/openunique_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import (
99

1010
"github.com/stretchr/testify/require"
1111

12-
"storj.io/common/testcontext"
1312
"storj.io/common/dbutil/pgtest"
1413
"storj.io/common/dbutil/tempdb"
1514
"storj.io/common/tagsql"
15+
"storj.io/common/testcontext"
1616
)
1717

1818
func TestTempPostgresDB(t *testing.T) {

‎dbutil/pgutil/query_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ import (
1010
"github.com/stretchr/testify/assert"
1111
"github.com/stretchr/testify/require"
1212

13-
"storj.io/common/testcontext"
1413
"storj.io/common/dbutil"
1514
"storj.io/common/dbutil/dbschema"
1615
"storj.io/common/dbutil/pgtest"
1716
"storj.io/common/dbutil/pgutil"
1817
"storj.io/common/dbutil/tempdb"
18+
"storj.io/common/testcontext"
1919
)
2020

2121
func TestQuery(t *testing.T) {

‎dbutil/pgutil/types_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ import (
99

1010
"github.com/stretchr/testify/require"
1111

12-
"storj.io/common/storj"
13-
"storj.io/common/testcontext"
1412
"storj.io/common/dbutil"
1513
"storj.io/common/dbutil/pgtest"
1614
"storj.io/common/dbutil/pgutil"
1715
"storj.io/common/dbutil/tempdb"
16+
"storj.io/common/storj"
17+
"storj.io/common/testcontext"
1818
)
1919

2020
var anArrayOfStrings = []string{

‎dbutil/pgxutil/conn_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import (
1010
"github.com/jackc/pgx/v5"
1111
"github.com/stretchr/testify/require"
1212

13-
"storj.io/common/testcontext"
1413
"storj.io/common/dbutil/pgtest"
1514
"storj.io/common/dbutil/pgxutil"
1615
"storj.io/common/dbutil/tempdb"
16+
"storj.io/common/testcontext"
1717
)
1818

1919
func TestConn(t *testing.T) {

‎dbutil/sqliteutil/migrator_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
_ "github.com/mattn/go-sqlite3"
1111
"github.com/stretchr/testify/require"
1212

13-
"storj.io/common/testcontext"
1413
"storj.io/common/dbutil/sqliteutil"
1514
"storj.io/common/tagsql"
15+
"storj.io/common/testcontext"
1616
)
1717

1818
func TestMigrateTablesToDatabase(t *testing.T) {

‎dbutil/sqliteutil/query_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import (
1010
"github.com/stretchr/testify/assert"
1111
"github.com/stretchr/testify/require"
1212

13-
"storj.io/common/testcontext"
1413
"storj.io/common/dbutil/dbschema"
1514
"storj.io/common/dbutil/sqliteutil"
1615
"storj.io/common/tagsql"
16+
"storj.io/common/testcontext"
1717
)
1818

1919
func TestQuery(t *testing.T) {

‎debug/server.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ import (
2525
"go.uber.org/zap"
2626
"golang.org/x/sync/errgroup"
2727

28-
"storj.io/drpc/drpcmigrate"
2928
"storj.io/common/traces"
3029
"storj.io/common/version"
30+
"storj.io/drpc/drpcmigrate"
3131
)
3232

3333
func init() {

‎metrics/server_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func TestMetricsServer(t *testing.T) {
2525

2626
registry := monkit.NewRegistry()
2727
config := Config{
28-
Address: ":1234",
28+
Address: ":0",
2929
TLSKey: "testdata/server.key",
3030
TLSCert: "testdata/server.crt",
3131
ClientCA: "testdata/ca-client.crt",

‎migrate/create_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import (
1212
"github.com/stretchr/testify/assert"
1313
"github.com/stretchr/testify/require"
1414

15-
"storj.io/common/testcontext"
1615
"storj.io/common/dbutil/pgtest"
1716
"storj.io/common/dbutil/tempdb"
1817
"storj.io/common/migrate"
1918
"storj.io/common/tagsql"
19+
"storj.io/common/testcontext"
2020
)
2121

2222
func TestCreate_Sqlite(t *testing.T) {

‎migrate/versions_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ import (
1616
"github.com/zeebo/errs"
1717
"go.uber.org/zap"
1818

19-
"storj.io/common/testcontext"
2019
"storj.io/common/dbutil/pgtest"
2120
"storj.io/common/dbutil/tempdb"
2221
"storj.io/common/migrate"
2322
"storj.io/common/tagsql"
23+
"storj.io/common/testcontext"
2424
)
2525

2626
func TestBasicMigrationSqliteNoRebind(t *testing.T) {

‎process/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import (
1414
"github.com/zeebo/errs"
1515
yaml "gopkg.in/yaml.v2"
1616

17-
"storj.io/common/fpath"
1817
"storj.io/common/cfgstruct"
18+
"storj.io/common/fpath"
1919
)
2020

2121
// SaveConfigOption is a function that updates the options for SaveConfig.

‎process/metrics.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ import (
1717
"go.uber.org/zap"
1818
"golang.org/x/sync/errgroup"
1919

20-
"storj.io/common/identity"
21-
"storj.io/common/telemetry"
22-
"storj.io/eventkit"
2320
"storj.io/common/cfgstruct"
2421
"storj.io/common/debug"
22+
"storj.io/common/identity"
23+
"storj.io/common/telemetry"
2524
"storj.io/common/version"
25+
"storj.io/eventkit"
2626
)
2727

2828
var (

‎scripts/arm-staticcheck.sh

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/usr/bin/env bash
2+
set -x
3+
export GOOS=linux
4+
export GOARCH=arm
5+
find -name "*.go" | awk -F / '{print $2}' | sort | uniq | grep -v -E '(http|sqlite)' | xargs -IDIR staticcheck storj.io/common/DIR

‎tagsql/basic_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99

1010
"github.com/stretchr/testify/require"
1111

12-
"storj.io/common/testcontext"
1312
"storj.io/common/tagsql"
13+
"storj.io/common/testcontext"
1414
)
1515

1616
func TestDetect(t *testing.T) {

‎tagsql/db_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ import (
1010
_ "github.com/mattn/go-sqlite3"
1111
"github.com/stretchr/testify/require"
1212

13-
"storj.io/common/testcontext"
1413
"storj.io/common/dbutil/cockroachutil"
1514
"storj.io/common/dbutil/pgtest"
1615
"storj.io/common/dbutil/pgutil"
1716
"storj.io/common/tagsql"
17+
"storj.io/common/testcontext"
1818
)
1919

2020
func run(t *testing.T, fn func(*testcontext.Context, *testing.T, tagsql.DB, tagsql.ContextSupport)) {

‎version/testbuild/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
module storj.test/buildinfo
22

3-
go 1.17
3+
go 1.19
44

55
replace storj.io/common => ../../
66

7-
require storj.io/common v0.0.0-20220719163320-cd2ef8e1b9b0
7+
require storj.io/common v0.0.0-00010101000000-000000000000
88

99
require (
1010
github.com/blang/semver v3.5.1+incompatible // indirect

0 commit comments

Comments
 (0)