File tree 8 files changed +17
-26
lines changed
8 files changed +17
-26
lines changed Original file line number Diff line number Diff line change @@ -15,8 +15,15 @@ set -e
15
15
function get_latest_released_version() {
16
16
local group_id=$1
17
17
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
20
27
}
21
28
22
29
# Update a key to a new value in the generation config.
Original file line number Diff line number Diff line change @@ -59,23 +59,15 @@ jobs:
59
59
env :
60
60
JOB_TYPE : test
61
61
windows :
62
- # Building using Java 11 and run the tests with Java 8 runtime
63
62
runs-on : windows-latest
64
63
steps :
65
64
- name : Support longpaths
66
65
run : git config --system core.longpaths true
67
66
- 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
75
67
- uses : actions/setup-java@v4
76
68
with :
77
69
distribution : temurin
78
- java-version : 11
70
+ java-version : 8
79
71
- run : java -version
80
72
- run : .kokoro/build.bat
81
73
env :
Original file line number Diff line number Diff line change 28
28
steps :
29
29
- uses : actions/checkout@v4
30
30
with :
31
+ fetch-depth : 0
31
32
token : ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
32
33
- name : Update params in generation config to latest
33
34
shell : bash
36
37
[ -z "$(git config user.email)" ] && git config --global user.email "[email protected] "
37
38
[ -z "$(git config user.name)" ] && git config --global user.name "cloud-java-bot"
38
39
bash .github/scripts/update_generation_config.sh \
39
- --base_branch "${base_branch}"\
40
+ --base_branch "${base_branch}" \
40
41
--repo ${{ github.repository }}
41
42
env :
42
43
GH_TOKEN : ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
44
+
Original file line number Diff line number Diff line change @@ -60,18 +60,6 @@ javadoc)
60
60
RETURN_CODE=$?
61
61
;;
62
62
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
-
75
63
mvn -B ${INTEGRATION_TEST_ARGS} \
76
64
-ntp \
77
65
-Penable-integration-tests \
Original file line number Diff line number Diff line change @@ -52,7 +52,7 @@ function retry_with_backoff {
52
52
return $exit_code
53
53
}
54
54
55
- # # Helper functions
55
+ # # Helper functionss
56
56
function now() { date +" %Y-%m-%d %H:%M:%S" | tr -d ' \n' ; }
57
57
function msg() { println " $* " >&2 ; }
58
58
function println() { printf ' %s\n' " $( now) $* " ; }
Original file line number Diff line number Diff line change 1
- gapic_generator_version : 2.55.1
1
+ gapic_generator_version : 2.55.2-SNAPSHOT
2
2
googleapis_commitish : 6155d42e99f45ebf53100d492852be1561916137
3
3
libraries_bom_version : 26.56.0
4
4
libraries :
Original file line number Diff line number Diff line change 46
46
47
47
s .remove_staging_dirs ()
48
48
java .common_templates (excludes = [
49
+ '.kokoro/continuous.cfg' ,
50
+ '.kokoro/presubmit.cfg' ,
49
51
'.kokoro/presubmit/integration.cfg' ,
50
52
'.kokoro/presubmit/graalvm-native.cfg' ,
51
53
'.kokoro/presubmit/graalvm-native-17.cfg' ,
You can’t perform that action at this time.
0 commit comments