Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 guides/jfrog-cli-plugins-developer-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ maintainers:
- github-username2
# Optional:
relativePath: build-info-analyzer
# You may set either branch or tag, but noth both
# You may set either branch or tag, but not both
branch: my-release-branch
tag: my-release-tag
```
Expand Down
2 changes: 1 addition & 1 deletion plugins/utils/signatureutils.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ func getPluginsSignatures() ([]*components.PluginSignature, error) {
}

func logSkippablePluginsError(msg, pluginName string, err error) {
log.Error(fmt.Sprintf("%s%s: '%s'. Skiping...", pluginsErrorPrefix, msg, pluginName))
log.Error(fmt.Sprintf("%s%s: '%s'. Skipping...", pluginsErrorPrefix, msg, pluginName))
if err != nil {
log.Error("Error was: " + err.Error())
}
Expand Down
4 changes: 2 additions & 2 deletions transfer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ func TestTransferTwoRepos(t *testing.T) {
// Execute transfer-files
assert.NoError(t, artifactoryCli.WithoutCredentials().Exec("transfer-files", inttestutils.SourceServerId, inttestutils.TargetServerId, "--include-repos="+tests.RtRepo1+";"+tests.RtRepo2))

// Verify again that that files are exist the source Artifactory
// Verify again that the files exist in the source Artifactory
inttestutils.VerifyExistInArtifactory(tests.GetTransferExpectedRepo1(), repo1Spec, serverDetails, t)
inttestutils.VerifyExistInArtifactory(tests.GetTransferExpectedRepo2(), repo2Spec, serverDetails, t)

Expand All @@ -124,7 +124,7 @@ func TestTransferExcludeRepo(t *testing.T) {
// Execute transfer-files
assert.NoError(t, artifactoryCli.WithoutCredentials().Exec("transfer-files", inttestutils.SourceServerId, inttestutils.TargetServerId, "--include-repos="+tests.RtRepo1+";"+tests.RtRepo2, "--exclude-repos="+tests.RtRepo2))

// Verify again that that files are exist the source Artifactory
// Verify again that the files exist in the source Artifactory
inttestutils.VerifyExistInArtifactory(tests.GetTransferExpectedRepo1(), repo1Spec, serverDetails, t)
inttestutils.VerifyExistInArtifactory(tests.GetTransferExpectedRepo2(), repo2Spec, serverDetails, t)

Expand Down
2 changes: 1 addition & 1 deletion utils/cliutils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -673,7 +673,7 @@ func shouldCheckLatestCliVersion() (shouldCheck bool, err error) {
timeNow := time.Now().UnixMilli()
if latestVersionCheckTime != nil &&
(timeNow-*latestVersionCheckTime) < LatestCliVersionCheckInterval.Milliseconds() {
// Timestamp file exists and updated less than 6 hours ago, therefor no need to check version again
// Timestamp file exists and updated less than 6 hours ago, therefore no need to check version again
return
}
if err = setCliLatestVersionCheckTime(timeNow); err != nil {
Expand Down
Loading