Skip to content

Commit 0095758

Browse files
committed
fix showcase paths
1 parent 823ba1c commit 0095758

3 files changed

Lines changed: 10 additions & 8 deletions

File tree

.github/workflows/sdk-platform-java-dependency_compatibility_test.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070

7171
# Set up local showcase server to run the showcase ITs
7272
- name: Parse showcase version
73-
working-directory: sdk-platform-java/java-showcase/gapic-showcase
73+
working-directory: java-showcase/gapic-showcase
7474
run: echo "SHOWCASE_VERSION=$(mvn help:evaluate -Dexpression=gapic-showcase.version -q -DforceStdout)" >> "$GITHUB_ENV"
7575
- name: Install showcase server
7676
run: |
@@ -89,8 +89,8 @@ jobs:
8989
# Need to cd out of the directory to get the scripts as this step is run inside the java-showcase directory
9090
run: |
9191
if [[ -n "${{ env.DEPENDENCIES_LIST }}" ]]; then
92-
../.github/scripts/test_dependency_compatibility.sh -l ${{ env.DEPENDENCIES_LIST }}
92+
../sdk-platform-java/.github/scripts/test_dependency_compatibility.sh -l ${{ env.DEPENDENCIES_LIST }}
9393
else
94-
../.github/scripts/test_dependency_compatibility.sh -f ../dependencies.txt
94+
../sdk-platform-java/.github/scripts/test_dependency_compatibility.sh -f ../dependencies.txt
9595
fi
96-
working-directory: sdk-platform-java/java-showcase
96+
working-directory: java-showcase

generation/check_non_release_please_versions.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ for pomFile in $(find . -mindepth 2 -name pom.xml | sort ); do
1313
[[ "${pomFile}" =~ .*java-logging-logback.* ]] || \
1414
[[ "${pomFile}" =~ .*java-bigquery.* ]] || \
1515
[[ "${pomFile}" =~ .*java-common-protos.* ]] || \
16-
[[ "${pomFile}" =~ .*sdk-platform-java.* ]] || \
16+
[[ "${pomFile}" =~ .*java-showcase.* ]] || \
17+
[[ "${pomFile}" =~ .*java-common-protos.* ]] || \
18+
[[ "${pomFile}" =~ .*java-iam.* ]] || \
1719
[[ "${pomFile}" =~ .*java-spanner.* ]] || \
1820
[[ "${pomFile}" =~ .*java-spanner-jdbc.* ]] || \
1921
[[ "${pomFile}" =~ .*google-auth-library-java.* ]] || \

java-showcase/scripts/generate_showcase.sh

Lines changed: 3 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}/sdk-platform-java/java-showcase/scripts/showcase_utilities.sh"
10+
source "${ROOT_DIR}/java-showcase/scripts/showcase_utilities.sh"
1111

1212
cleanup() {
1313
if [[ -z "${api_def_dir}" ]]; then
@@ -65,7 +65,7 @@ else
6565
# we prepare the temp folder with the minimal setup to perform an incremental
6666
# generation.
6767
pushd "${ROOT_DIR}"
68-
cp -r generation_config.yaml sdk-platform-java/java-showcase/ versions.txt "${generated_files_dir}"
68+
cp -r generation_config.yaml java-showcase/ versions.txt "${generated_files_dir}"
6969
popd #ROOT_DIR
7070
fi
7171

0 commit comments

Comments
 (0)