Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitdf4385e

Browse files
authored
chore: add java-shared-config to safe.directory and mark docker validation check as required (#688)
* test: troubleshoot kokoro docker image for validate docker check* add git config command as recommended* remove unused arg* remove debugging statements; mark check as required
1 parent3ccfd4e commitdf4385e

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

‎.github/sync-repo-settings.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ branchProtectionRules:
3636
-"Kokoro - Test: Integration"
3737
-"Kokoro - Test: Java GraalVM Native Image"
3838
-"Kokoro - Test: Java 17 GraalVM Native Image"
39+
-"Kokoro - Test: Docker Image Validation"
3940
-"dependencies (11, java-bigquery)"
4041
-"dependencies (11, java-spanner)"
4142
-"dependencies (11, java-storage)"

‎.kokoro/verify-docker-images.sh‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ function fetch_image_names() {
88
echo"$imageNames"
99
}
1010

11+
git config --global --add safe.directory /tmpfs/src/github/java-shared-config
12+
1113
# Get the directory of the build script
1214
scriptDir=$(realpath"$(dirname"${BASH_SOURCE[0]}")")
1315
# cd to the parent directory, i.e. the root of the git repo
@@ -16,8 +18,8 @@ cd ${scriptDir}/.. || exit
1618
# Fetch the java-shared-config version in source of the current commit.
1719
javaSharedConfigVersion="$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)"
1820

19-
branchName=$(git name-rev"$KOKORO_GIT_COMMIT"| sed's/.* //')
20-
gitCommitMessage=$(git log -1"$(git rev-parse --short"$KOKORO_GIT_COMMIT")"| grep"chore(main): release *")
21+
branchName=$(git name-rev"${KOKORO_GIT_COMMIT}"| sed's/.* //')
22+
gitCommitMessage=$(git log -1"$(git rev-parse --short"${KOKORO_GIT_COMMIT}")"| grep"chore(main): release *")
2123

2224
# GraalVM docker images are not tagged with SNAPSHOT versions.
2325
if [["${branchName}"==*"release-please--branches--main"* ]]&& [[!$gitCommitMessage=~"SNAPSHOT" ]];then

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp