diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml index 151911b2fbbb..13fe5e7ff6bd 100644 --- a/.github/workflows/conformance.yaml +++ b/.github/workflows/conformance.yaml @@ -28,8 +28,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - with: - path: google-cloud-go - uses: actions/checkout@v3 with: repository: googleapis/cloud-bigtable-clients-test @@ -39,6 +37,6 @@ jobs: with: go-version: '>=1.20.2' - run: go install github.com/jstemmer/go-junit-report/v2@latest - - run: chmod +x ./google-cloud-go/bigtable/conformance_test.sh + - run: chmod +x ./bigtable/conformance_test.sh - run: go version - - run: ./google-cloud-go/bigtable/conformance_test.sh \ No newline at end of file + - run: ./bigtable/conformance_test.sh \ No newline at end of file diff --git a/bigtable/conformance_test.sh b/bigtable/conformance_test.sh index b274f31628ea..eec43c214e00 100755 --- a/bigtable/conformance_test.sh +++ b/bigtable/conformance_test.sh @@ -21,10 +21,10 @@ set -eo pipefail set -x ## cd to the parent directory, i.e. the root of the git repo -cd $(dirname $0)/../.. +cd $(dirname $0)/.. rootDir=$(pwd) -clientLibHome=$rootDir/google-cloud-go/bigtable +clientLibHome=$rootDir/bigtable testProxyHome=$clientLibHome/internal/testproxy testProxyPort=9999 conformanceTestsHome=$rootDir/cloud-bigtable-clients-test/tests