Skip to content

Commit 6934b62

Browse files
committed
ci: fix YAML syntax errors and duplicate keys in BOM workflows to enable GHA parsing
1 parent 28cc410 commit 6934b62

3 files changed

Lines changed: 11 additions & 14 deletions

File tree

.github/workflows/java-cloud-bom-bom-content-test.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,8 @@ jobs:
2323
- 'google-auth-library-java/**'
2424
bom-content-test:
2525
needs: filter
26-
if: ${{ needs.filter.outputs.library == 'true' }}
26+
if: ${{ needs.filter.outputs.library == 'true' && github.repository_owner == 'googleapis' }}
2727
runs-on: ubuntu-latest
28-
if: github.repository_owner == 'googleapis'
2928
steps:
3029
- uses: actions/checkout@v4
3130
- uses: actions/setup-java@v5
@@ -57,10 +56,9 @@ jobs:
5756

5857
bom-assertion-test:
5958
needs: filter
60-
if: ${{ needs.filter.outputs.library == 'true' }}
59+
if: ${{ needs.filter.outputs.library == 'true' && github.repository_owner == 'googleapis' }}
6160
name: BomContentAssertionsTest (Test for assertion logic in BomContentTest)
6261
runs-on: ubuntu-latest
63-
if: github.repository_owner == 'googleapis'
6462
steps:
6563
- uses: actions/checkout@v4
6664
- uses: actions/setup-java@v5

.github/workflows/java-cloud-bom-ci.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,14 @@ jobs:
8383
with:
8484
java-version: 17
8585
distribution: temurin
86-
- name: Pre-install all BOM modules to populate local cache
87-
run: |
88-
for f in $(find . -mindepth 2 -name "pom.xml" | grep "\-bom/pom.xml" | grep -v "samples" | grep -v "/tests/" | grep -v "/resources/"); do
89-
grep -q "<packaging>pom</packaging>" "$f" && echo "$f"
90-
done | sed 's|^\./||' | sed 's|/pom.xml$||' | tr '\n' ',' | sed 's/,$//' > bom_projects.txt
91-
mvn install -pl $(cat bom_projects.txt) -am -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V -q
92-
rm bom_projects.txt
93-
shell: bash
86+
- name: Pre-install all BOM modules to populate local cache
87+
run: |
88+
for f in $(find . -mindepth 2 -name "pom.xml" | grep "\-bom/pom.xml" | grep -v "samples" | grep -v "/tests/" | grep -v "/resources/"); do
89+
grep -q "<packaging>pom</packaging>" "$f" && echo "$f"
90+
done | sed 's|^\./||' | sed 's|/pom.xml$||' | tr '\n' ',' | sed 's/,$//' > bom_projects.txt
91+
mvn install -pl $(cat bom_projects.txt) -am -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V -q
92+
rm bom_projects.txt
93+
shell: bash
9494
- run: .kokoro/build.sh
9595
env:
9696
JOB_TYPE: test

.github/workflows/java-cloud-bom-dashboard.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,8 @@ jobs:
3838
JOB_TYPE: dashboard-units-check
3939
shared-dependencies-convergence:
4040
needs: filter
41-
if: ${{ needs.filter.outputs.library == 'true' }}
41+
if: ${{ needs.filter.outputs.library == 'true' && github.repository_owner == 'googleapis' && github.head_ref == 'release-please--branches--main' }}
4242
runs-on: ubuntu-latest
43-
if: github.repository_owner == 'googleapis' && github.head_ref == 'release-please--branches--main'
4443
steps:
4544
- uses: actions/checkout@v4
4645
- uses: actions/setup-java@v5

0 commit comments

Comments
 (0)