Skip to content

Commit

Permalink
TOOL-994 Update used tool and plugin versions, dependencies (#671)
Browse files Browse the repository at this point in the history
* Update minimum tool and plugin versions

* Gopkg update

* dep update

* Bumping version

* Adding go-utils/envutil as required package import path, as it is used by integration tests

* Require stepman and envman

* Update version in update test

* Use 1.32.0 as version, Gopkg use full versions

* Use master from urfave/cli
  • Loading branch information
lpusok authored and trapacska committed Jul 11, 2019
1 parent f7458dd commit 85fcf1f
Show file tree
Hide file tree
Showing 831 changed files with 3,373 additions and 143,688 deletions.
126 changes: 76 additions & 50 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

41 changes: 24 additions & 17 deletions Gopkg.toml
Original file line number Diff line number Diff line change
@@ -1,52 +1,59 @@
# Used by integration tests
required = ["github.com/bitrise-io/go-utils/envutil",
"github.com/bitrise-io/envman",
"github.com/bitrise-io/stepman"]

[[constraint]]
name = "github.com/Sirupsen/logrus"
branch = "master"
version = "1.4.2"

[[constraint]]
name = "github.com/bitrise-io/envman"
branch = "master"
name = "github.com/bitrise-io/envman"

[[constraint]]
name = "github.com/bitrise-io/go-utils"
branch = "master"
name = "github.com/bitrise-io/go-utils"

[[constraint]]
name = "github.com/bitrise-io/goinp"
branch = "master"
name = "github.com/bitrise-io/goinp"

[[constraint]]
name = "github.com/bitrise-io/stepman"
branch = "master"

[[constraint]]
name = "github.com/bitrise-io/gows"
branch = "master"

[[constraint]]
name = "github.com/hashicorp/go-version"
branch = "master"
name = "github.com/bitrise-io/stepman"

[[constraint]]
name = "github.com/pkg/errors"
branch = "master"
name = "github.com/hashicorp/go-version"
version = "1.2.0"

[[constraint]]
name = "github.com/ryanuber/go-glob"
branch = "master"
version = "1.0.0"

[[constraint]]
name = "github.com/stretchr/testify"
branch = "master"
version = "1.3.0"

[[constraint]]
# depending on master branch, as latest release (on 2019-07-11) 1.20.0 was released on 2017-08-11, and there was no release since
# override is needed to resolve package conflict with envman:
# master: Could not introduce github.com/bitrise-io/envman@master, as it has a dependency on github.com/urfave/cli with constraint ^1.20.0, which has no overlap with existing constraint master from (root)
[[override]]
name = "github.com/urfave/cli"
branch = "master"

[[constraint]]
name = "golang.org/x/sys"
branch = "master"
name = "golang.org/x/sys"

[[constraint]]
name = "gopkg.in/yaml.v2"
branch = "v2"

version = "v2"

[prune]
go-tests = true
unused-packages = true
6 changes: 3 additions & 3 deletions _tests/integration/update_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@ import (

func Test_Update(t *testing.T) {

t.Log("Update --version 1.10.0")
t.Log("Update --version 1.28.0")
{
// save original binary
if err := cli.CopyFile(binPath(), binPath()+"_original", false); err != nil {
t.Fatal(err)
}

out, err := command.New(binPath(), "update", "--version", "1.10.0").RunAndReturnTrimmedCombinedOutput()
out, err := command.New(binPath(), "update", "--version", "1.28.0").RunAndReturnTrimmedCombinedOutput()
require.NoError(t, err, out)

updatedVer, err := command.RunCommandAndReturnCombinedStdoutAndStderr(binPath(), "version")
require.NoError(t, err)
require.Equal(t, "1.10.0", updatedVer)
require.Equal(t, "1.28.0", updatedVer)

// restore original binary
if err := cli.CopyFile(binPath()+"_original", binPath(), true); err != nil {
Expand Down
4 changes: 2 additions & 2 deletions _tests/integration/version_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ func Test_VersionOutput(t *testing.T) {
{
out, err := command.RunCommandAndReturnCombinedStdoutAndStderr(binPath(), "version")
require.NoError(t, err)
require.Equal(t, "1.31.0", out)
require.Equal(t, "1.32.0", out)
}

t.Log("Version --full")
Expand All @@ -23,7 +23,7 @@ func Test_VersionOutput(t *testing.T) {
require.NoError(t, err)

expectedOSVersion := fmt.Sprintf("%s (%s)", runtime.GOOS, runtime.GOARCH)
expectedVersionOut := fmt.Sprintf(`version: 1.31.0
expectedVersionOut := fmt.Sprintf(`version: 1.32.0
format version: 8
os: %s
go: %s
Expand Down
10 changes: 5 additions & 5 deletions bitrise/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
)

const (
minEnvmanVersion = "2.2.4"
minStepmanVersion = "0.11.6"
minEnvmanVersion = "2.2.5"
minStepmanVersion = "0.11.7"
)

// PluginDependency ..
Expand All @@ -28,19 +28,19 @@ type PluginDependency struct {
var PluginDependencyMap = map[string]PluginDependency{
"init": PluginDependency{
Source: "https://github.com/bitrise-io/bitrise-plugins-init.git",
MinVersion: "1.2.0",
MinVersion: "1.2.1",
},
"step": PluginDependency{
Source: "https://github.com/bitrise-io/bitrise-plugins-step.git",
MinVersion: "0.9.10",
},
"workflow-editor": PluginDependency{
Source: "https://github.com/bitrise-io/bitrise-workflow-editor.git",
MinVersion: "1.1.57",
MinVersion: "1.1.59",
},
"analytics": PluginDependency{
Source: "https://github.com/bitrise-io/bitrise-plugins-analytics.git",
MinVersion: "0.10.2",
MinVersion: "0.10.3",
},
}

Expand Down
Loading

0 comments on commit 85fcf1f

Please sign in to comment.