diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 47ba1c804..1ca4f246d 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -10,8 +10,16 @@ jobs: build: runs-on: ubuntu-latest + env: + GOPATH: ${{ github.workspace }} + defaults: + run: + working-directory: ${{ env.GOPATH }}/src/github.com/hyperledger-labs/fabric-smart-client steps: - - uses: actions/checkout@v2 + - name: Checkout code + uses: actions/checkout@v2 + with: + path: ${{ env.GOPATH }}/src/github.com/hyperledger-labs/fabric-smart-client - name: Set up Go uses: actions/setup-go@v2 diff --git a/.gitignore b/.gitignore index 85e7c1dfc..ec29afb38 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /.idea/ +.DS_Store diff --git a/integration/nwo/fabric/network/network_support.go b/integration/nwo/fabric/network/network_support.go index 9ecf924f2..d0078dbf8 100755 --- a/integration/nwo/fabric/network/network_support.go +++ b/integration/nwo/fabric/network/network_support.go @@ -583,10 +583,10 @@ func (n *Network) CheckTopology() { cwd, err := os.Getwd() Expect(err).NotTo(HaveOccurred()) - substring := "github.com/hyperledger-labs/fabric-smart-client" + substring := "fabric-smart-client" n.ExternalBuilders = []fabricconfig.ExternalBuilder{{ Path: filepath.Join( - cwd[:strings.Index(cwd, substring)], + cwd[:strings.LastIndex(cwd, substring)], substring, "integration", "nwo",