Merge branch 'gitlab-migration' into 'master'

Gitlab migration

See merge request NebulousLabs/Sia!3167

.gitlab-ci.yml

@@ -0,0 +1,60 @@
+image: golang:1.10
+
+stages:
+  - lint
+  - test
+  - deploy
+
+before_script:
+  - make dependencies
+  - cp -R $CI_PROJECT_DIR $GOPATH/src/gitlab.com/NebulousLabs/Sia
+  - cd $GOPATH/src/gitlab.com/NebulousLabs/Sia
+
+after_script:
+  - cp -R /tmp/SiaTesting $CI_PROJECT_DIR/SiaTesting
+
+lint:
+  stage: lint
+  script: 
+    - go get -u github.com/alecthomas/gometalinter
+    - gometalinter --install
+    - gometalinter --vendor --disable-all --enable=vet --enable=gofmt ./...
+
+legacy-tests:
+  stage: test
+  artifacts:
+    name: "SiaTesting-$CI_JOB_NAME"
+    paths:
+      - $CI_PROJECT_DIR/SiaTesting
+  script: make test-long pkgs="./node ./node/api ./node/api/server" run=.
+
+package-tests:
+  stage: test
+  artifacts:
+    name: "SiaTesting-$CI_JOB_NAME"
+    paths:
+      - $CI_PROJECT_DIR/SiaTesting
+  script: 
+    - make test-long run=. pkgs="./build ./cmd/siac ./cmd/siad ./compatibility ./crypto ./encoding ./modules ./modules/consensus ./modules/explorer ./modules/gateway ./modules/host ./modules/host/contractmanager ./modules/renter ./modules/renter/contractor ./modules/renter/hostdb ./modules/renter/hostdb/hosttree ./modules/renter/proto ./modules/miner ./modules/wallet ./modules/transactionpool ./persist ./sync ./types"
+
+integration-tests:
+  stage: test
+  artifacts:
+    name: "SiaTesting-$CI_JOB_NAME"
+    paths:
+      - $CI_PROJECT_DIR/SiaTesting
+  script:
+    - make test-long run=. pkgs="./siatest ./siatest/consensus ./siatest/renter ./siatest/wallet"
+
+deploy:
+  stage: deploy
+  only:
+    refs:
+      - master
+  artifacts:
+    name: "Binaries"
+    paths:
+      - $CI_PROJECT_DIR/artifacts
+  script: 
+    - make deploy
+    - cp -R ./artifacts $CI_PROJECT_DIR/artifacts

Makefile

@@ -83,6 +83,10 @@ release:
 release-race:
 	go install -race -tags='netgo' -a -ldflags='-s -w $(ldflags)' $(pkgs)
 
+# deploy builds release binaries for every platform.
+deploy:
+	./deploy.sh
+
 # clean removes all directories that get automatically created during
 # development.
 clean:
@@ -93,7 +97,7 @@ test:
 test-v:
 	go test -race -v -short -tags='debug testing netgo' -timeout=15s $(pkgs) -run=$(run)
 test-long: clean fmt vet lint
-	go test -v -race -tags='testing debug netgo' -timeout=500s $(pkgs) -run=$(run)
+	go test -v -race -tags='testing debug netgo' -timeout=1200s $(pkgs) -run=$(run)
 test-vlong: clean fmt vet lint
 	go test -v -race -tags='testing debug vlong netgo' -timeout=5000s $(pkgs) -run=$(run)
 test-cpu:

cmd/siac/daemoncmd.go

@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
-	"gitlab.com/NebulousLabs/Sia/build"
 	"github.com/spf13/cobra"
+	"gitlab.com/NebulousLabs/Sia/build"
 )
 
 var (

cmd/siac/gatewaycmd.go

@@ -5,8 +5,8 @@ import (
 	"os"
 	"text/tabwriter"
 
-	"gitlab.com/NebulousLabs/Sia/modules"
 	"github.com/spf13/cobra"
+	"gitlab.com/NebulousLabs/Sia/modules"
 )
 
 var (

cmd/siac/rentercmd.go

@@ -33,8 +33,8 @@ import (
 	"text/tabwriter"
 	"time"
 
-	"gitlab.com/NebulousLabs/errors"
 	"github.com/spf13/cobra"
+	"gitlab.com/NebulousLabs/errors"
 
 	"gitlab.com/NebulousLabs/Sia/modules"
 	"gitlab.com/NebulousLabs/Sia/node/api"

deploy.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+mkdir artifacts
+for arch in amd64 arm; do
+	for os in darwin linux windows; do
+	        for pkg in siac siad; do
+			if [ "$arch" == "arm" ]; then
+				if [ "$os" == "windows" ] || [ "$os" == "darwin" ]; then
+					continue
+				fi
+			fi
+
+	                bin=$pkg
+	                if [ "$os" == "windows" ]; then
+	                        bin=${pkg}.exe
+	                fi
+
+	                GOOS=${os} GOARCH=${arch} go build -tags='netgo' -o artifacts/$arch/$os/$bin ./cmd/$pkg
+			if [ $? -ne 0 ]; then
+    				exit $?
+			fi
+	        done
+	done
+done

modules/consensus/difficulty.go

@@ -7,8 +7,8 @@ import (
 
 	"gitlab.com/NebulousLabs/Sia/types"
 
-	"gitlab.com/NebulousLabs/errors"
 	"github.com/coreos/bbolt"
+	"gitlab.com/NebulousLabs/errors"
 )
 
 // Errors returned by this file.

modules/consensus/subscribe.go

@@ -7,8 +7,8 @@ import (
 	"gitlab.com/NebulousLabs/Sia/build"
 	"gitlab.com/NebulousLabs/Sia/modules"
 
-	siasync "gitlab.com/NebulousLabs/Sia/sync"
 	"github.com/coreos/bbolt"
+	siasync "gitlab.com/NebulousLabs/Sia/sync"
 )
 
 // computeConsensusChange computes the consensus change from the change entry

modules/consensus/subscribe_test.go

@@ -4,8 +4,8 @@ import (
 	"sync"
 	"testing"
 
-	"gitlab.com/NebulousLabs/Sia/modules"
 	bolt "github.com/coreos/bbolt"
+	"gitlab.com/NebulousLabs/Sia/modules"
 )
 
 // mockSubscriber receives and holds changes to the consensus set, remembering

modules/explorer/info.go

@@ -1,10 +1,10 @@
 package explorer
 
 import (
+	"github.com/coreos/bbolt"
 	"gitlab.com/NebulousLabs/Sia/build"
 	"gitlab.com/NebulousLabs/Sia/modules"
 	"gitlab.com/NebulousLabs/Sia/types"
-	"github.com/coreos/bbolt"
 )
 
 // Block takes a block ID and finds the corresponding block, provided that the

modules/gateway/stream.go

@@ -3,8 +3,8 @@ package gateway
 import (
 	"net"
 
-	"gitlab.com/NebulousLabs/Sia/build"
 	"github.com/xtaci/smux"
+	"gitlab.com/NebulousLabs/Sia/build"
 )
 
 // A streamSession is a multiplexed transport that can accept or initiate

modules/transactionpool/database.go

@@ -8,8 +8,8 @@ import (
 	"gitlab.com/NebulousLabs/Sia/modules"
 	"gitlab.com/NebulousLabs/Sia/types"
 
-	"gitlab.com/NebulousLabs/errors"
 	"github.com/coreos/bbolt"
+	"gitlab.com/NebulousLabs/errors"
 )
 
 // database.go contains objects related to the layout of the transaction pool's

modules/transactionpool/persist.go

@@ -11,8 +11,8 @@ import (
 	"gitlab.com/NebulousLabs/Sia/persist"
 	"gitlab.com/NebulousLabs/Sia/types"
 
-	"gitlab.com/NebulousLabs/errors"
 	"github.com/coreos/bbolt"
+	"gitlab.com/NebulousLabs/errors"
 )
 
 const tpoolSyncRate = time.Minute * 2

modules/transactionpool/transactionpool.go

@@ -3,8 +3,8 @@ package transactionpool
 import (
 	"errors"
 
-	"gitlab.com/NebulousLabs/demotemutex"
 	"github.com/coreos/bbolt"
+	"gitlab.com/NebulousLabs/demotemutex"
 
 	"gitlab.com/NebulousLabs/Sia/crypto"
 	"gitlab.com/NebulousLabs/Sia/modules"

modules/wallet/encrypt.go

@@ -6,13 +6,13 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/coreos/bbolt"
 	"gitlab.com/NebulousLabs/Sia/build"
 	"gitlab.com/NebulousLabs/Sia/crypto"
 	"gitlab.com/NebulousLabs/Sia/encoding"
 	"gitlab.com/NebulousLabs/Sia/modules"
 	"gitlab.com/NebulousLabs/Sia/types"
 	"gitlab.com/NebulousLabs/fastrand"
-	"github.com/coreos/bbolt"
 )
 
 var (

modules/wallet/seed.go

@@ -4,13 +4,13 @@ import (
 	"runtime"
 	"sync"
 
+	"github.com/coreos/bbolt"
 	"gitlab.com/NebulousLabs/Sia/crypto"
 	"gitlab.com/NebulousLabs/Sia/encoding"
 	"gitlab.com/NebulousLabs/Sia/modules"
 	"gitlab.com/NebulousLabs/Sia/types"
 	"gitlab.com/NebulousLabs/errors"
 	"gitlab.com/NebulousLabs/fastrand"
-	"github.com/coreos/bbolt"
 )
 
 var (

node/api/routes.go

@@ -5,8 +5,8 @@ import (
 	"strings"
 	"time"
 
-	"gitlab.com/NebulousLabs/Sia/build"
 	"github.com/julienschmidt/httprouter"
+	"gitlab.com/NebulousLabs/Sia/build"
 )
 
 // buildHttpRoutes sets up and returns an * httprouter.Router.

node/api/wallet.go

@@ -13,8 +13,8 @@ import (
 	"gitlab.com/NebulousLabs/Sia/modules"
 	"gitlab.com/NebulousLabs/Sia/types"
 
-	"gitlab.com/NebulousLabs/entropy-mnemonics"
 	"github.com/julienschmidt/httprouter"
+	"gitlab.com/NebulousLabs/entropy-mnemonics"
 )
 
 type (

persist/boltdb_test.go

@@ -3,13 +3,12 @@ package persist
 import (
 	"os"
 	"path/filepath"
-	"runtime"
 	"testing"
 	"time"
 
+	"github.com/coreos/bbolt"
 	"gitlab.com/NebulousLabs/Sia/build"
 	"gitlab.com/NebulousLabs/fastrand"
-	"github.com/coreos/bbolt"
 )
 
 // testInputs and testFilenames are global variables because most tests require
@@ -199,49 +198,6 @@ func TestOpenDatabase(t *testing.T) {
 	}
 }
 
-// TestErrPermissionOpenDatabase tests calling OpenDatabase on a database file
-// with the wrong filemode (< 0600), which should result in an os.ErrPermission
-// error.
-func TestErrPermissionOpenDatabase(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		t.Skip("can't reproduce on Windows")
-	}
-
-	const (
-		dbHeader   = "Fake Header"
-		dbVersion  = "0.0.0"
-		dbFilename = "Fake Filename"
-	)
-	testDir := build.TempDir(persistDir, t.Name())
-	err := os.MkdirAll(testDir, 0700)
-	if err != nil {
-		t.Fatal(err)
-	}
-	dbFilepath := filepath.Join(testDir, dbFilename)
-	badFileModes := []os.FileMode{0000, 0001, 0002, 0003, 0004, 0005, 0010, 0040, 0060, 0105, 0110, 0126, 0130, 0143, 0150, 0166, 0170, 0200, 0313, 0470, 0504, 0560, 0566, 0577}
-
-	// Make sure OpenDatabase returns a permissions error for each of the modes
-	// in badFileModes.
-	for _, mode := range badFileModes {
-		// Create a file named dbFilename in directory testDir with the wrong
-		// permissions (mode < 0600).
-		_, err := os.OpenFile(dbFilepath, os.O_RDWR|os.O_CREATE, mode)
-		if err != nil {
-			t.Fatal(err)
-		}
-		// OpenDatabase should return a permissions error because the database
-		// mode is less than 0600.
-		_, err = OpenDatabase(Metadata{dbHeader, dbVersion}, dbFilepath)
-		if !os.IsPermission(err) {
-			t.Errorf("OpenDatabase failed to return expected error when called on a database with the wrong permissions (%o instead of >= 0600);\n wanted:\topen %v: permission denied\n got:\t\t%v", mode, dbFilepath, err)
-		}
-		err = os.Remove(dbFilepath)
-		if err != nil {
-			t.Error(err)
-		}
-	}
-}
-
 // TestErrTxNotWritable checks that updateMetadata returns an error when called
 // from a read-only transaction.
 func TestErrTxNotWritable(t *testing.T) {