Skip to content

Commit 7578bbb

Browse files
committed
fix showcase paths
1 parent 98dcc3a commit 7578bbb

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

sdk-platform-java/java-showcase/scripts/generate_showcase.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ set -ex
55

66
trap cleanup ERR
77

8-
readonly ROOT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )/../.."
8+
readonly ROOT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )/../../.."
99
pushd "${ROOT_DIR}"
10-
source "${ROOT_DIR}/java-showcase/scripts/showcase_utilities.sh"
10+
source "${ROOT_DIR}/sdk-platform-java/java-showcase/scripts/showcase_utilities.sh"
1111

1212
cleanup() {
1313
if [[ -z "${api_def_dir}" ]]; then
@@ -53,7 +53,7 @@ popd
5353
append_showcase_to_api_defs "${api_def_dir}"
5454

5555
echo "building docker image"
56-
DOCKER_BUILDKIT=1 docker build --file .cloudbuild/library_generation/library_generation.Dockerfile --iidfile image-id .
56+
DOCKER_BUILDKIT=1 docker build --file sdk-platform-java/.cloudbuild/library_generation/library_generation.Dockerfile --iidfile image-id .
5757

5858
if [[ "${replace}" == "true" ]]; then
5959
generated_files_dir="${ROOT_DIR}"
@@ -69,7 +69,9 @@ else
6969
popd #ROOT_DIR
7070
fi
7171

72+
pushd sdk-platform-java
7273
GENERATOR_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout -pl gapic-generator-java)
74+
popd sdk-platform-java
7375

7476
echo "generating showcase"
7577
workspace_name="/workspace"

sdk-platform-java/java-showcase/scripts/verify.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
set -oxe
66
readonly SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
7-
readonly ROOT_DIR="${SCRIPT_DIR}/../.."
7+
readonly ROOT_DIR="${SCRIPT_DIR}/../../.."
88
source "${SCRIPT_DIR}/showcase_utilities.sh"
99
readonly SHOWCASE_DIR="${SCRIPT_DIR}/.."
1010

0 commit comments

Comments
 (0)