From f81530e3de175aa6cb1d5dcfb3250269705e43bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20G=C3=B6drei?= Date: Tue, 11 Feb 2020 17:22:27 +0100 Subject: [PATCH] Prepare for release (#701) * godeps update, dependent tools version update * version bump (1.38.0 -> 1.39.0) --- Gopkg.lock | 4 ++-- _tests/integration/version_test.go | 4 ++-- bitrise/setup.go | 6 +++--- vendor/golang.org/x/crypto/ssh/terminal/terminal.go | 13 +++++++++++-- version/version.go | 2 +- 5 files changed, 19 insertions(+), 10 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 94cdb5d78..89a6660a6 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -147,11 +147,11 @@ [[projects]] branch = "master" - digest = "1:c8b0363634b7f813bd07d829fa98af420d99c68d9e88077a7c86fad8e6e31e27" + digest = "1:ad2bf20798504fbde0c5bdf5ee83d3354fb101d32c5b2267f811c1958b91b0ab" name = "golang.org/x/crypto" packages = ["ssh/terminal"] pruneopts = "UT" - revision = "69ecbb4d6d5dab05e49161c6e77ea40a030884e1" + revision = "86ce3cb696783b739e41e834e2eead3e1b4aa3fb" [[projects]] branch = "master" diff --git a/_tests/integration/version_test.go b/_tests/integration/version_test.go index 6bc560c65..921aaf1bb 100644 --- a/_tests/integration/version_test.go +++ b/_tests/integration/version_test.go @@ -14,7 +14,7 @@ func Test_VersionOutput(t *testing.T) { { out, err := command.RunCommandAndReturnCombinedStdoutAndStderr(binPath(), "version") require.NoError(t, err) - require.Equal(t, "1.38.0", out) + require.Equal(t, "1.39.0", out) } t.Log("Version --full") @@ -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.38.0 + expectedVersionOut := fmt.Sprintf(`version: 1.39.0 format version: 10 os: %s go: %s diff --git a/bitrise/setup.go b/bitrise/setup.go index 0cc8e76b8..e70d2cb8d 100644 --- a/bitrise/setup.go +++ b/bitrise/setup.go @@ -15,7 +15,7 @@ import ( const ( minEnvmanVersion = "2.2.11" - minStepmanVersion = "0.11.13" + minStepmanVersion = "0.12.0" ) // PluginDependency .. @@ -36,11 +36,11 @@ var PluginDependencyMap = map[string]PluginDependency{ }, "workflow-editor": PluginDependency{ Source: "https://github.com/bitrise-io/bitrise-workflow-editor.git", - MinVersion: "1.1.68", + MinVersion: "1.1.72", }, "analytics": PluginDependency{ Source: "https://github.com/bitrise-io/bitrise-plugins-analytics.git", - MinVersion: "0.10.4", + MinVersion: "0.10.5", }, } diff --git a/vendor/golang.org/x/crypto/ssh/terminal/terminal.go b/vendor/golang.org/x/crypto/ssh/terminal/terminal.go index dd7378c8a..d1b4fca3a 100644 --- a/vendor/golang.org/x/crypto/ssh/terminal/terminal.go +++ b/vendor/golang.org/x/crypto/ssh/terminal/terminal.go @@ -7,6 +7,7 @@ package terminal import ( "bytes" "io" + "runtime" "strconv" "sync" "unicode/utf8" @@ -939,6 +940,8 @@ func (s *stRingBuffer) NthPreviousEntry(n int) (value string, ok bool) { // readPasswordLine reads from reader until it finds \n or io.EOF. // The slice returned does not include the \n. // readPasswordLine also ignores any \r it finds. +// Windows uses \r as end of line. So, on Windows, readPasswordLine +// reads until it finds \r and ignores any \n it finds during processing. func readPasswordLine(reader io.Reader) ([]byte, error) { var buf [1]byte var ret []byte @@ -952,9 +955,15 @@ func readPasswordLine(reader io.Reader) ([]byte, error) { ret = ret[:len(ret)-1] } case '\n': - return ret, nil + if runtime.GOOS != "windows" { + return ret, nil + } + // otherwise ignore \n case '\r': - // remove \r from passwords on Windows + if runtime.GOOS == "windows" { + return ret, nil + } + // otherwise ignore \r default: ret = append(ret, buf[0]) } diff --git a/version/version.go b/version/version.go index 0b1f251d6..b0860e048 100644 --- a/version/version.go +++ b/version/version.go @@ -1,4 +1,4 @@ package version // VERSION ... -const VERSION = "1.38.0" +const VERSION = "1.39.0"