Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/github-integration' into github-…
Browse files Browse the repository at this point in the history
…integration
  • Loading branch information
omerzi committed Oct 25, 2023
2 parents 930b051 + d95b3b8 commit e892258
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
4 changes: 3 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/go-git/go-git/v5 v5.9.0
github.com/golang/mock v1.6.0
github.com/google/go-github/v45 v45.2.0
github.com/jfrog/build-info-go v1.9.13
github.com/jfrog/build-info-go v1.9.14
github.com/jfrog/froggit-go v1.14.2
github.com/jfrog/gofrog v1.3.1
github.com/jfrog/jfrog-cli-core/v2 v2.45.2
Expand Down Expand Up @@ -120,3 +120,5 @@ require (
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
)

replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20231022135540-8a053f99f103
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -878,16 +878,16 @@ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOl
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
github.com/jedib0t/go-pretty/v6 v6.4.8 h1:HiNzyMSEpsBaduKhmK+CwcpulEeBrTmxutz4oX/oWkg=
github.com/jedib0t/go-pretty/v6 v6.4.8/go.mod h1:Ndk3ase2CkQbXLLNf5QDHoYb6J9WtVfmHZu9n8rk2xs=
github.com/jfrog/build-info-go v1.9.13 h1:OeoGzPVK/O4TOUYk35uL4bXg/hleyqMrjGjjmyLOYrg=
github.com/jfrog/build-info-go v1.9.13/go.mod h1:ujJ8XQZMdT2tMkLSMJNyDd1pCY+duwHdjV+9or9FLIg=
github.com/jfrog/build-info-go v1.9.14 h1:xVezJ16Vpm/boRBn3lI1THCQmkylm+6R4zYWxOQ0NSM=
github.com/jfrog/build-info-go v1.9.14/go.mod h1:ujJ8XQZMdT2tMkLSMJNyDd1pCY+duwHdjV+9or9FLIg=
github.com/jfrog/froggit-go v1.14.2 h1:55x1anQtaiARlSBMVT59aFU6Mmx90tpcvvAuuPsZm9c=
github.com/jfrog/froggit-go v1.14.2/go.mod h1:0jRAaZZusaFFnITosmx6CA60SKryuoaCasJyUrP/c1s=
github.com/jfrog/gofrog v1.3.1 h1:QqAwQXCVReT724uga1AYqG/ZyrNQ6f+iTxmzkb+YFQk=
github.com/jfrog/gofrog v1.3.1/go.mod h1:IFMc+V/yf7rA5WZ74CSbXe+Lgf0iApEQLxRZVzKRUR0=
github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYLipdsOFMY=
github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w=
github.com/jfrog/jfrog-cli-core/v2 v2.45.2 h1:xxW7qcSHXdf1i5uIFeFaKTEFqPhT7hyv2E5Pe4aaXOY=
github.com/jfrog/jfrog-cli-core/v2 v2.45.2/go.mod h1:Gkua13G8aYPmv7cZgGhAwcyjqejvxwK5q8pEutvL0TI=
github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20231022135540-8a053f99f103 h1:3Oljo49Dt5vtSRCPRkjYSWpmOkWaar32wjKTP60EgAs=
github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20231022135540-8a053f99f103/go.mod h1:5rTYHinkg5k2ALHYROR3AnE2mMQ22SFZF5dwew1sgco=
github.com/jfrog/jfrog-client-go v1.34.3 h1:kDfw3FUQQvOsTKFqonIgLlziez6CSX80xCYZIH9YYcg=
github.com/jfrog/jfrog-client-go v1.34.3/go.mod h1:fuxhYzWEkA16+ZV5cP/BJUGjA3SXVKbBoDmb8ZS6J4g=
github.com/jordan-wright/email v4.0.1-0.20210109023952-943e75fe5223+incompatible h1:jdpOPRN1zP63Td1hDQbZW73xKmzDvZHzVdNYxhnTMDA=
Expand Down
4 changes: 2 additions & 2 deletions packagehandlers/packagehandlers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package packagehandlers

import (
"fmt"
testdatautils "github.com/jfrog/build-info-go/build/testdata"
"github.com/jfrog/build-info-go/tests"
biutils "github.com/jfrog/build-info-go/utils"
"github.com/jfrog/frogbot/utils"
"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
Expand Down Expand Up @@ -583,7 +583,7 @@ func getTestDataDir(t *testing.T, directDependency bool) string {
func createTempDirAndChdir(t *testing.T, testdataDir string, tech string) func() {
// Create temp technology project
projectPath := filepath.Join(testdataDir, tech)
tmpProjectPath, cleanup := testdatautils.CreateTestProject(t, projectPath)
tmpProjectPath, cleanup := tests.CreateTestProject(t, projectPath)
currDir, err := os.Getwd()
assert.NoError(t, err)
assert.NoError(t, os.Chdir(tmpProjectPath))
Expand Down

0 comments on commit e892258

Please sign in to comment.