Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Promote to version 2.42.1 #2058

Merged
merged 2 commits into from
Jul 4, 2023
Merged

Promote to version 2.42.1 #2058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
649d7eb
Promote to version 2.42.1
yahavi Jul 4, 2023
f326641
Skip Poetry tests
yahavi Jul 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/npm/v2-jf/package-lock.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion build/npm/v2-jf/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jfrog-cli-v2-jf",
"version": "2.42.0",
"version": "2.42.1",
"description": "🐸 Command-line interface for JFrog Artifactory, Xray, Distribution, Pipelines and Mission Control 🐸",
"homepage": "https://github.com/jfrog/jfrog-cli",
"preferGlobal": true,
Expand Down
2 changes: 1 addition & 1 deletion build/npm/v2/package-lock.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion build/npm/v2/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jfrog-cli-v2",
"version": "2.42.0",
"version": "2.42.1",
"description": "🐸 Command-line interface for JFrog Artifactory, Xray, Distribution, Pipelines and Mission Control 🐸",
"homepage": "https://github.com/jfrog/jfrog-cli",
"preferGlobal": true,
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require (
github.com/gocarina/gocsv v0.0.0-20230616125104-99d496ca653d
github.com/jfrog/build-info-go v1.9.6
github.com/jfrog/gofrog v1.3.0
github.com/jfrog/jfrog-cli-core/v2 v2.37.0
github.com/jfrog/jfrog-cli-core/v2 v2.37.1
github.com/jfrog/jfrog-client-go v1.31.0
github.com/jszwec/csvutil v1.8.0
github.com/mholt/archiver/v3 v3.5.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,8 @@ github.com/jfrog/build-info-go v1.9.6 h1:lCJ2j5uXAlJsSwDe5J8WD7Co1f/hUlZvMfwfb5A
github.com/jfrog/build-info-go v1.9.6/go.mod h1:GbuFS+viHCKZYx9nWHYu7ab1DgQkFdtVN3BJPUNb2D4=
github.com/jfrog/gofrog v1.3.0 h1:o4zgsBZE4QyDbz2M7D4K6fXPTBJht+8lE87mS9bw7Gk=
github.com/jfrog/gofrog v1.3.0/go.mod h1:IFMc+V/yf7rA5WZ74CSbXe+Lgf0iApEQLxRZVzKRUR0=
github.com/jfrog/jfrog-cli-core/v2 v2.37.0 h1:lKU2+/1Yn5eKRpyxI8cogzWUEh0NBZJqeaJTxghtAa8=
github.com/jfrog/jfrog-cli-core/v2 v2.37.0/go.mod h1:i62WcX9jQbH0dJjQdkmJAGridZgFVIK1B3yIPfXayHI=
github.com/jfrog/jfrog-cli-core/v2 v2.37.1 h1:VE/6cagGor/5lWB7l+aU5FlhztoHM9q9M2FlWcn3ESo=
github.com/jfrog/jfrog-cli-core/v2 v2.37.1/go.mod h1:i62WcX9jQbH0dJjQdkmJAGridZgFVIK1B3yIPfXayHI=
github.com/jfrog/jfrog-client-go v1.31.0 h1:VIptdPkECaM0UDbKE2ZjFZh9i85W99xM65c6rFxDNj4=
github.com/jfrog/jfrog-client-go v1.31.0/go.mod h1:qEJxoe68sUtqHJ1YhXv/7pKYP/9p1D5tJrruzJKYeoI=
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
Expand Down
2 changes: 1 addition & 1 deletion utils/cliutils/cli_consts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import "time"

const (
// General CLI constants
CliVersion = "2.42.0"
CliVersion = "2.42.1"
ClientAgent = "jfrog-cli-go"

// CLI base commands constants:
Expand Down
1 change: 1 addition & 0 deletions utils/progressbar/readerprogressbar.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ func (p *ReaderProgressBar) Abort() {
}

// GetId Returns the ProgressBar ID
//
//nolint:gocritic
func (p *ReaderProgressBar) GetId() (Id int) {
return p.Id
Expand Down
1 change: 1 addition & 0 deletions utils/progressbar/simpleprogressbar.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ func (p *SimpleProgressBar) Abort() {
}

// GetId Returns the ProgressBar ID
//
//nolint:gocritic
func (p *SimpleProgressBar) GetId() (Id int) {
return p.Id
Expand Down
2 changes: 1 addition & 1 deletion utils/tests/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -793,7 +793,7 @@ func VerifySha256DetailedSummaryFromResult(t *testing.T, result *commandutils.Re
}

func SkipKnownFailingTest(t *testing.T) {
skipDate := time.Date(2023, time.July, 0, 0, 0, 0, 0, time.UTC)
skipDate := time.Date(2023, time.August, 0, 0, 0, 0, 0, time.UTC)
if time.Now().Before(skipDate) {
t.Skip("Skipping a known failing test, will resume testing after ", skipDate.String())
} else {
Expand Down
Loading