mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-05-03 19:41:24 -05:00
Code Issues Packages Projects Releases 159 Wiki Activity

repo fmt, temporarily remove compatibility CI

Browse Source
This commit is contained in:
Andy Arthur
2020-04-02 12:07:56 -07:00
parent 4665a29298
commit 90e75cbc0c
3 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+23 -23
View File
@@ -85,29 +85,29 @@ pipeline {
}
}
}
stage ("compatibility/") {
agent {
kubernetes {
label "liquidata-inc-ld-build"
}
}
environment {
PATH = "${pwd()}/.ci_bin:${pwd()}/.ci_bin/node_modules/.bin:${env.PATH}"
}
steps {
dir (".ci_bin") {
sh "npm i bats"
}
dir ("go") {
sh "go get -mod=readonly ./..."
sh "go build -mod=readonly -o ../.ci_bin/dolt ./cmd/dolt/."
}
sh "dolt config --global --add user.name 'Liquidata Jenkins'"
sh "dolt config --global --add user.email 'jenkins@liquidata.co'"
dir ("bats/compatibility") {
sh "./runner.sh"
}
}
// stage ("compatibility/") {
// agent {
// kubernetes {
// label "liquidata-inc-ld-build"
// }
// }
// environment {
// PATH = "${pwd()}/.ci_bin:${pwd()}/.ci_bin/node_modules/.bin:${env.PATH}"
// }
// steps {
// dir (".ci_bin") {
// sh "npm i bats"
// }
// dir ("go") {
// sh "go get -mod=readonly ./..."
// sh "go build -mod=readonly -o ../.ci_bin/dolt ./cmd/dolt/."
// }
// sh "dolt config --global --add user.name 'Liquidata Jenkins'"
// sh "dolt config --global --add user.email 'jenkins@liquidata.co'"
// dir ("bats/compatibility") {
// sh "./runner.sh"
// }
// }
}
}
}
go/cmd/dolt/commands/migrate.go
+4 -2
View File
@@ -16,7 +16,9 @@ package commands
import (
"context"
"github.com/fatih/color"
"github.com/liquidata-inc/dolt/go/cmd/dolt/cli"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/env"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/rebase"
@@ -26,7 +28,7 @@ import (
const migrationPrompt = "Run dolt migrate to update this repository to the latest format"
const migrationMsg = "Migrating repository to the latest format"
type MigrateCmd struct {}
type MigrateCmd struct{}
// Name is returns the name of the Dolt cli command. This is what is used on the command line to invoke the command
func (cmd MigrateCmd) Name() string {
@@ -74,4 +76,4 @@ func MigrationNeeded(ctx context.Context, dEnv *env.DoltEnv, args []string) bool
cli.PrintErrln(color.RedString("Cannot execute dolt %s, repository format is out of date.", subCmd))
cli.Println(migrationPrompt)
return true
}
}
go/cmd/dolt/dolt.go
+1 -1
View File
@@ -148,7 +148,7 @@ func runMain() int {
dEnv := env.Load(context.TODO(), env.GetCurrentUserHomeDir, filesys.LocalFS, doltdb.LocalDirDoltDB, Version)
if dEnv.DBLoadError == nil && commandNeedsMigrationCheck(args){
if dEnv.DBLoadError == nil && commandNeedsMigrationCheck(args) {
if commands.MigrationNeeded(context.Background(), dEnv, args) {
return 1
}