Skip to content

Commit 21708aa

Browse files
authored
Merge branch 'dev' into add-test-case-multi-tag-build
2 parents 6e23b07 + 1c0e2ed commit 21708aa

File tree

8 files changed

+14
-7
lines changed

8 files changed

+14
-7
lines changed

.github/workflows/scriptTests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
suite:
2323
- os: "ubuntu-latest"
2424

25-
- os: "ubuntu-20.04"
25+
- os: "ubuntu-22.04"
2626

2727
- os: "macos-latest"
2828

.github/workflows/transferTests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
if: contains(github.event.pull_request.labels.*.name, 'safe to test') || github.event_name == 'push'
4444
name: artifactory-6
4545
# Fixed runner image to set the java tools needed for artifactory 6
46-
runs-on: ubuntu-20.04
46+
runs-on: ubuntu-22.04
4747
steps:
4848
- name: Checkout code
4949
uses: actions/checkout@v4

build/npm/v2-jf/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/npm/v2-jf/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jfrog-cli-v2-jf",
3-
"version": "2.74.1",
3+
"version": "2.75.0",
44
"description": "🐸 Command-line interface for JFrog Artifactory, Xray, Distribution, Pipelines and Mission Control 🐸",
55
"homepage": "https://github.com/jfrog/jfrog-cli",
66
"preferGlobal": true,

build/npm/v2/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/npm/v2/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jfrog-cli-v2",
3-
"version": "2.74.1",
3+
"version": "2.75.0",
44
"description": "🐸 Command-line interface for JFrog Artifactory, Xray, Distribution, Pipelines and Mission Control 🐸",
55
"homepage": "https://github.com/jfrog/jfrog-cli",
66
"preferGlobal": true,

buildinfo_test.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -678,6 +678,7 @@ func TestBuildPublishWithOverwrite(t *testing.T) {
678678
buildNumber := "1"
679679
preReleaseBuildNumber := "1-rc"
680680
defaultNumberOfBuilds := 5
681+
nonExistingBuildNumber := "1-x-rc"
681682

682683
// Clean old build tests if exists
683684
inttestutils.DeleteBuild(serverDetails.ArtifactoryUrl, buildName, artHttpDetails)
@@ -728,6 +729,12 @@ func TestBuildPublishWithOverwrite(t *testing.T) {
728729
// Verify even though overwrite is used when no build infos are available build info should be published
729730
assertBuildNumberOccurrencesForGivenBuildNameAndNumber(t, publishedBuildInfo, 1, found, buildNumber, err)
730731

732+
// Run build-publish with overwrite flag and build should be published
733+
runRt(t, "bp", buildName, nonExistingBuildNumber, "--overwrite=true")
734+
publishedBuildInfo, found, err = tests.GetBuildRuns(serverDetails, buildName)
735+
// Verify even though overwrite is used when no build infos are available build info should be published
736+
assertBuildNumberOccurrencesForGivenBuildNameAndNumber(t, publishedBuildInfo, 1, found, nonExistingBuildNumber, err)
737+
731738
// Cleanup
732739
inttestutils.DeleteBuild(serverDetails.ArtifactoryUrl, buildName, artHttpDetails)
733740
cleanArtifactoryTest()

utils/cliutils/cli_consts.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import "time"
44

55
const (
66
// General CLI constants
7-
CliVersion = "2.74.1"
7+
CliVersion = "2.75.0"
88
ClientAgent = "jfrog-cli-go"
99

1010
// CLI base commands constants:

0 commit comments

Comments
 (0)