8000 chore(do not merge): demo of template files fix · googleapis/java-datastore@f6ccaca · GitHub
[go: up one dir, main page]
Skip to content

Commit f6ccaca

Browse files
diegomarquezpdiegomarquezp
committed
chore(do not merge): demo of template files fix
1 parent 2a82de0 commit f6ccaca

File tree

8 files changed

+17
-26
lines changed

8 files changed

+17
-26
lines changed

‎.github/scripts/update_generation_config.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,15 @@ set -e
1515
function get_latest_released_version() {
1616
local group_id=$1
1717
local artifact_id=$2
18-
latest=$(curl -s "https://search.maven.org/solrsearch/select?q=g:${group_id}+AND+a:${artifact_id}&core=gav&rows=500&wt=json" | jq -r '.response.docs[] | select(.v | test("^[0-9]+(\\.[0-9]+)*$")) | .v' | sort -V | tail -n 1)
19-
echo "${latest}"
18+
json_content=$(curl -s "https://search.maven.org/solrsearch/select?q=g:${group_id}+AND+a:${artifact_id}&core=gav&rows=500&wt=json")
19+
latest=$(jq -r '.response.docs[] | select(.v | test("^[0-9]+(\\.[0-9]+)*$")) | .v' <<< "${json_content}" | sort -V | tail -n 1)
20+
if [[ -z "${latest}" ]]; then
21+
echo "The latest version of ${group_id}:${artifact_id} is empty."
22+
echo "The returned json from maven.org is invalid: ${json_content}"
23+
exit 1
24+
else
25+
echo "${latest}"
26+
fi
2027
}
2128

2229
# Update a key to a new value in the generation config.

‎.github/workflows/ci.yaml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,23 +59,15 @@ jobs:
5959
env:
6060
JOB_TYPE: test
6161
windows:
62-
# Building using Java 11 and run the tests with Java 8 runtime
6362
runs-on: windows-latest
6463
steps:
6564
- name: Support longpaths
6665
run: git config --system core.longpaths true
6766
- uses: actions/checkout@v4
68-
- uses: actions/setup-java@v4
69-
with:
70-
java-version: 8
71-
distribution: temurin
72-
- name: "Set jvm system property environment variable for surefire plugin (unit tests)"
73-
run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}\bin\java" >> $GITHUB_ENV
74-
shell: bash
7567
- uses: actions/setup-java@v4
7668
with:
7769
distribution: temurin
78-
java-version: 11
70+
java-version: 8
7971
- run: java -version
8072
- run: .kokoro/build.bat
8173
env:

‎.github/workflows/update_generation_config.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ jobs:
2828
steps:
2929
- uses: actions/checkout@v4
3030
with:
31+
fetch-depth: 0
3132
token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
3233
- name: Update params in generation config to latest
3334
shell: bash
@@ -36,7 +37,8 @@ jobs:
3637
[ -z "$(git config user.email)" ] && git config --global user.email "cloud-java-bot@google.com"
3738
[ -z "$(git config user.name)" ] && git config --global user.name "cloud-java-bot"
3839
bash .github/scripts/update_generation_config.sh \
39-
--base_branch "${base_branch}"\
40+
--base_branch "${base_branch}" \
4041
--repo ${{ github.repository }}
4142
env:
4243
GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
44+

‎.kokoro/build.sh

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -60,18 +60,6 @@ javadoc)
6060
RETURN_CODE=$?
6161
;;
6262
integration)
63-
# Kokoro integration tests use both JDK 11 and JDK 8. Integration
64-
# tests require JDK 11 export as JAVA env variable to run cloud datastore
65-
# emulator (https://cloud.google.com/sdk/docs/release-notes#39300_2022-07-12).
66-
# For Java 8 environment, we will still run the tests using Java 8 with
67-
# SUREFIRE_JVM_OPT for Maven surefire plugin:
68-
# https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#jvm
69-
if [[ -n "${JAVA11_HOME}" && -n "${JAVA8_HOME}" ]]
70-
then
71-
export JAVA=${JAVA11_HOME}/bin/java
72-
export SUREFIRE_JVM_OPT=-Djvm=${JAVA8_HOME}/bin/java
73-
fi
74-
7563
mvn -B ${INTEGRATION_TEST_ARGS} \
7664
-ntp \
7765
-Penable-integration-tests \

‎.kokoro/common.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ function retry_with_backoff {
5252
return $exit_code
5353
}
5454

55-
## Helper functions
55+
## Helper functionss
5656
function now() { date +"%Y-%m-%d %H:%M:%S" | tr -d '\n'; }
5757
function msg() { println "$*" >&2; }
5858
function println() { printf '%s\n' "$(now) $*"; }

‎.kokoro/trampoline.sh

100644100755
File mode changed.

‎generation_config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
gapic_generator_version: 2.55.1
1+
gapic_generator_version: 2.55.2-SNAPSHOT
22
googleapis_commitish: 6155d42e99f45ebf53100d492852be1561916137
33
libraries_bom_version: 26.56.0
44
libraries:

‎owlbot.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@
4646

4747
s.remove_staging_dirs()
4848
java.common_templates(excludes=[
49+
'.kokoro/continuous.cfg',
50+
'.kokoro/presubmit.cfg',
4951
'.kokoro/presubmit/integration.cfg',
5052
'.kokoro/presubmit/graalvm-native.cfg',
5153
'.kokoro/presubmit/graalvm-native-17.cfg',

0 commit comments

Comments
 (0)
0