Skip to content

Commit 325f146

Browse files
committed
Revert "chore: moving the conformance .sh file to a more appropriate directory and making changes to the workflow as applicable"
This reverts commit bb169e2.
1 parent bb169e2 commit 325f146

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

.github/workflows/bigtable-conformance.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ on:
1818
branches:
1919
- main
2020
pull_request:
21-
paths:
22-
- '**[Bb]ig[Tt]able**'
2321
name: bigtable-conformance
2422
jobs:
2523
conformance:
@@ -41,4 +39,4 @@ jobs:
4139
go-version: '>=1.20.2'
4240
- run: dotnet --version
4341
- run: go version
44-
- run: bash apis/Google.Cloud.Bigtable.V2/Google.Cloud.Bigtable.V2.ConformanceTests/bigtable-conformance.sh
42+
- run: bash .kokoro/bigtable-conformance.sh
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#!/bin/bash
12
# Copyright 2025 Google LLC
23
#
34
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,19 +13,18 @@
1213
# See the License for the specific language governing permissions and
1314
# limitations under the License.
1415

15-
#!/bin/bash
16-
1716
set -eo pipefail
1817

1918
## Get the directory of the build script
20-
SCRIPT=$(readlink -f "$0")
21-
SCRIPT_DIR=$(dirname "$SCRIPT")
22-
23-
pushd .
19+
scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
2420
## cd to the parent directory, i.e. the root of the git repo
25-
cd ${SCRIPT_DIR}/..
21+
cd ${scriptDir}/..
22+
23+
set +e
2624

2725
# Build the proxy
26+
pushd .
27+
cd apis/Google.Cloud.Bigtable.V2/Google.Cloud.Bigtable.V2.ConformanceTests
2828
dotnet build
2929
# Start the proxy in a separate process
3030
dotnet run &

0 commit comments

Comments
 (0)