Skip to content

Commit 04bb03d

Browse files
committed
chore: use single job ID in build.sh, minor feedback
1 parent ae25611 commit 04bb03d

File tree

7 files changed

+10
-19
lines changed

7 files changed

+10
-19
lines changed

hermetic_build/library_generation/owlbot/templates/java_library/.github/sync-repo-settings.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,9 @@ branchProtectionRules:
4949
- "Kokoro - Test: Integration"
5050
- "cla/google"
5151
- "OwlBot Post Processor"
52-
- "Kokoro - Test: Java GraalVM Native Image"
53-
- "Kokoro - Test: Java 17 GraalVM Native Image"
52+
- "Kokoro - Test: Java GraalVM Native Image A"
53+
- "Kokoro - Test: Java GraalVM Native Image B"
54+
- "Kokoro - Test: Java GraalVM Native Image C"
5455
# List of explicit permissions to add (additive only)
5556
permissionRules:
5657
- team: yoshi-admins

hermetic_build/library_generation/owlbot/templates/java_library/.github/workflows/renovate_config_check.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
renovate_bot_config_validation:
10-
runs-on: ubuntu-22.04
10+
runs-on: ubuntu-24.04
1111

1212
steps:
1313
- name: Checkout code
@@ -16,7 +16,7 @@ jobs:
1616
- name: Set up Node.js
1717
uses: actions/setup-node@v4
1818
with:
19-
node-version: '20'
19+
node-version: '22'
2020

2121
- name: Install Renovate and Config Validator
2222
run: |

hermetic_build/library_generation/owlbot/templates/java_library/.github/workflows/update_generation_config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ on:
2121
{% raw %}
2222
jobs:
2323
update-generation-config:
24-
runs-on: ubuntu-22.04
24+
runs-on: ubuntu-24.04
2525
env:
2626
# the branch into which the pull request is merged
2727
base_branch: main

hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/build.sh

+1-11
Original file line numberDiff line numberDiff line change
@@ -77,17 +77,7 @@ integration)
7777
verify
7878
RETURN_CODE=$?
7979
;;
80-
graalvmA)
81-
# Run Unit and Integration Tests with Native Image
82-
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test
83-
RETURN_CODE=$?
84-
;;
85-
graalvmB)
86-
# Run Unit and Integration Tests with Native Image
87-
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test
88-
RETURN_CODE=$?
89-
;;
90-
graalvmC)
80+
graalvm)
9181
# Run Unit and Integration Tests with Native Image
9282
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test
9383
RETURN_CODE=$?

hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-a.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ env_vars: {
88

99
env_vars: {
1010
key: "JOB_TYPE"
11-
value: "graalvmA"
11+
value: "graalvm"
1212
}
1313

1414
# TODO: remove this after we've migrated all tests and scripts

hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-b.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ env_vars: {
88

99
env_vars: {
1010
key: "JOB_TYPE"
11-
value: "graalvmB"
11+
value: "graalvm"
1212
}
1313

1414
# TODO: remove this after we've migrated all tests and scripts

hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-c.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ env_vars: {
88

99
env_vars: {
1010
key: "JOB_TYPE"
11-
value: "graalvmC"
11+
value: "graalvm"
1212
}
1313

1414
# TODO: remove this after we've migrated all tests and scripts

0 commit comments

Comments
 (0)