Skip to content

chore: add java-shared-config to safe.directory and mark docker validation check as required #688

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 16, 2023
Merged

chore: add java-shared-config to safe.directory and mark docker validation check as required #688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
765a0e0
test: troubleshoot kokoro docker image for validate docker check
mpeddada1 Oct 16, 2023
a4d1e10
add git config command as recommended
mpeddada1 Oct 16, 2023
2f181de
remove unused arg
mpeddada1 Oct 16, 2023
9f77889
remove debugging statements; mark check as required
mpeddada1 Oct 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/sync-repo-settings.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ branchProtectionRules:
- "Kokoro - Test: Integration"
- "Kokoro - Test: Java GraalVM Native Image"
- "Kokoro - Test: Java 17 GraalVM Native Image"
- "Kokoro - Test: Docker Image Validation"
- "dependencies (11, java-bigquery)"
- "dependencies (11, java-spanner)"
- "dependencies (11, java-storage)"
Expand Down
6 changes: 4 additions & 2 deletions .kokoro/verify-docker-images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ function fetch_image_names() {
echo "$imageNames"
}

git config --global --add safe.directory /tmpfs/src/github/java-shared-config

# Get the directory of the build script
scriptDir=$(realpath "$(dirname "${BASH_SOURCE[0]}")")
# cd to the parent directory, i.e. the root of the git repo
Expand All @@ -16,8 +18,8 @@ cd ${scriptDir}/.. || exit
# Fetch the java-shared-config version in source of the current commit.
javaSharedConfigVersion="$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)"

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

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