Skip to content

Commit 7f75373

Browse files
committed
debug downstream_unmanaged test
1 parent 1455388 commit 7f75373

File tree

6 files changed

+12
-103
lines changed

6 files changed

+12
-103
lines changed

.github/workflows/generated_files_sync.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ jobs:
172172
invalid_files=$(find . -name '*.java' \
173173
|grep --invert-match 'java/com/google' \
174174
|grep --invert-match '/test/' \
175+
|grep --invert-match '/tests/' \
175176
|grep --invert-match samples \
176177
|grep --invert-match grafeas \
177178
|grep --invert-match 'cloud-build.*v2' \

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
pull_request:
66
paths:
77
- .github/workflows/sdk-platform-java-downstream_unmanaged_dependency_check.yaml
8-
- java-shared-dependencies/**
8+
- sdk-platform-java/java-shared-dependencies/**
99

1010
name: sdk-platform-java Downstream Unmanaged Dependency Check
1111
env:
@@ -38,7 +38,7 @@ jobs:
3838
- name: Checkout sdk-platform-java
3939
uses: actions/checkout@v3
4040
with:
41-
path: sdk-platform-java
41+
path: google-cloud-java
4242
- name: Checkout the downstream repo
4343
uses: actions/checkout@v4
4444
with:
@@ -57,17 +57,19 @@ jobs:
5757
cache: maven
5858
- name: Install the modules of sdk-platform-java
5959
shell: bash
60-
working-directory: sdk-platform-java
60+
working-directory: google-cloud-java/sdk-platform-java
6161
run: |
6262
set -euo pipefail
6363
# gapic-generator-java is irrelevant
6464
mvn -q -B -ntp install \
6565
-Dcheckstyle.skip -Dfmt.skip -DskipTests -T 1C
6666
- name: Build unmanaged dependency check
6767
shell: bash
68-
working-directory: sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check
68+
working-directory: google-cloud-java/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check
6969
run: |
7070
set -euo pipefail
71+
pwd
72+
pwd
7173
echo "Install Unmanaged Dependency Check in $(pwd)"
7274
mvn clean install -V --batch-mode --no-transfer-progress -DskipTests
7375
- name: Install the modules of the downstream repository
@@ -85,7 +87,7 @@ jobs:
8587
# BOM to list the artifacts generated by that repository.
8688
bom_dir=$(find ${{ matrix.repo }} -type d -name 'google-*-bom' ! -name '*-deps-bom')
8789
bom_absolute_path=$(realpath "${bom_dir}/pom.xml")
88-
cd sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check
90+
cd google-cloud-java/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check
8991
echo "Running Unmanaged Dependency Check against ${bom_absolute_path}"
9092
unmanaged_dependencies=$(mvn exec:java -Dexec.args="../pom.xml ${bom_absolute_path}" -q)
9193
if [[ "${unmanaged_dependencies}" != "[]" ]]; then

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

Lines changed: 0 additions & 95 deletions
This file was deleted.

.github/workflows/unmanaged_dependency_check.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
on:
22
pull_request:
3-
name: Unmanaged dependency check
3+
name: sdk-platform-java Unmanaged dependency check
44
jobs:
55
unmanaged_dependency_check:
66
runs-on: ubuntu-latest
@@ -14,6 +14,6 @@ jobs:
1414
shell: bash
1515
run: mvn install -B -ntp -T 1C -DskipTests -Dclirr.skip -Dcheckstyle.skip -Denforcer.skip
1616
- name: Unmanaged dependency check
17-
uses: ./java-shared-dependencies/unmanaged-dependency-check
17+
uses: ./sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check
1818
with:
1919
bom-path: gapic-libraries-bom/pom.xml

generation/check_non_release_please_versions.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ for pomFile in $(find . -mindepth 2 -name pom.xml | sort ); do
1111
[[ "${pomFile}" =~ .*java-bigquerystorage.* ]] || \
1212
[[ "${pomFile}" =~ .*java-datastore.* ]] || \
1313
[[ "${pomFile}" =~ .*java-logging-logback.* ]] || \
14+
[[ "${pomFile}" =~ .*java-showcase-.* ]] || \
1415
[[ "${pomFile}" =~ .*.github*. ]]; then
1516
continue
1617
fi

google-cloud-jar-parent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<dependency>
2828
<groupId>com.google.cloud</groupId>
2929
<artifactId>google-cloud-shared-dependencies</artifactId>
30-
<version>${google-cloud-shared-dependencies.version}</version>
30+
<version>3.57.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-shared-dependencies:current} -->
3131
<type>pom</type>
3232
<scope>import</scope>
3333
</dependency>

0 commit comments

Comments
 (0)