This is an automated email from the ASF dual-hosted git repository.
francischuang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/calcite-avatica.git
The following commit(s) were added to refs/heads/main by this push:
new ed9e218a6 [CALCITE-6106] Switch from gradle to eclipse-temurin image
for avatica docker-compose release commands
ed9e218a6 is described below
commit ed9e218a649f5069005068c407c8069326addcca
Author: Francis Chuang <[email protected]>
AuthorDate: Sat Nov 11 19:04:32 2023 +1100
[CALCITE-6106] Switch from gradle to eclipse-temurin image for avatica
docker-compose release commands
---
docker-compose.yml | 10 +++++-----
docker.sh | 10 +++++-----
site/docker-compose.yml | 2 +-
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index 2f5281189..b26b6a53f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,7 +17,7 @@
version: '3'
services:
dry-run:
- image: gradle:7.4.2-jdk17
+ image: eclipse-temurin:19
working_dir: /src
command: sh -c "./docker.sh dry-run"
network_mode: "host"
@@ -26,7 +26,7 @@ services:
- gradle-cache:/home/gradle/.gradle
publish-release-for-voting:
- image: gradle:7.4.2-jdk17
+ image: eclipse-temurin:19
working_dir: /src
command: sh -c "./docker.sh publish-release-for-voting"
volumes:
@@ -34,7 +34,7 @@ services:
- gradle-cache:/home/gradle/.gradle
clean:
- image: gradle:7.4.2-jdk17
+ image: eclipse-temurin:19
working_dir: /src
command: sh -c "./docker.sh clean"
volumes:
@@ -42,7 +42,7 @@ services:
- gradle-cache:/home/gradle/.gradle
promote-release:
- image: gradle:7.4.2-jdk17
+ image: eclipse-temurin:19
working_dir: /src
command: sh -c "./docker.sh promote-release"
volumes:
@@ -50,7 +50,7 @@ services:
- gradle-cache:/home/gradle/.gradle
test:
- image: gradle:7.4.2-jdk17
+ image: eclipse-temurin:19
working_dir: /src
command: sh -c "./docker.sh test"
volumes:
diff --git a/docker.sh b/docker.sh
index b03ebfa5a..3c7981dd0 100755
--- a/docker.sh
+++ b/docker.sh
@@ -248,7 +248,7 @@ promote_release(){
fi
get_asf_credentials
- gradle publishDist -Pasf -PasfSvnUsername=$ASF_USERNAME
-PasfSvnPassword=$ASF_PASSWORD -PasfNexusUsername=$ASF_USERNAME
-PasfNexusPassword=$ASF_PASSWORD -PasfGitSourceUsername=$ASF_USERNAME
-PasfGitSourcePassword=$ASF_PASSWORD -Prc=$RC_NUMBER
-Pasf.git.pushRepositoryProvider=GITBOX
+ ./gradlew publishDist -Pasf -PasfSvnUsername=$ASF_USERNAME
-PasfSvnPassword=$ASF_PASSWORD -PasfNexusUsername=$ASF_USERNAME
-PasfNexusPassword=$ASF_PASSWORD -PasfGitSourceUsername=$ASF_USERNAME
-PasfGitSourcePassword=$ASF_PASSWORD -Prc=$RC_NUMBER
-Pasf.git.pushRepositoryProvider=GITBOX
# If there is more than 1 release, delete all of them, except for the
newest one
# To do this, we do the following:
@@ -285,7 +285,7 @@ case $1 in
select_gpg_key
get_dry_run_build_configuration
- gradle prepareVote -PasfTestSvnUsername=test -PasfTestSvnPassword=test
-PasfTestNexusUsername=test -PasfTestNexusPassword=test
-PasfTestGitSourceUsername=test -PasfTestGitSourcePassword=test -Prc=$RC_NUMBER
-PuseGpgCmd -Psigning.gnupg.keyName=$SELECTED_GPG_KEY
+ ./gradlew prepareVote -PasfTestSvnUsername=test
-PasfTestSvnPassword=test -PasfTestNexusUsername=test
-PasfTestNexusPassword=test -PasfTestGitSourceUsername=test
-PasfTestGitSourcePassword=test -Prc=$RC_NUMBER -PuseGpgCmd
-Psigning.gnupg.keyName=$SELECTED_GPG_KEY
;;
publish-release-for-voting)
@@ -295,11 +295,11 @@ case $1 in
get_build_configuration
get_asf_credentials
- gradle prepareVote -Pasf -PasfCommitterId=$ASF_USERNAME
-PasfSvnUsername=$ASF_USERNAME -PasfSvnPassword=$ASF_PASSWORD
-PasfNexusUsername=$ASF_USERNAME -PasfNexusPassword=$ASF_PASSWORD
-PasfGitSourceUsername=$ASF_USERNAME -PasfGitSourcePassword=$ASF_PASSWORD
-Prc=$RC_NUMBER -PuseGpgCmd -Psigning.gnupg.keyName=$SELECTED_GPG_KEY
-Pasf.git.pushRepositoryProvider=GITBOX
+ ./gradlew prepareVote -Pasf -PasfCommitterId=$ASF_USERNAME
-PasfSvnUsername=$ASF_USERNAME -PasfSvnPassword=$ASF_PASSWORD
-PasfNexusUsername=$ASF_USERNAME -PasfNexusPassword=$ASF_PASSWORD
-PasfGitSourceUsername=$ASF_USERNAME -PasfGitSourcePassword=$ASF_PASSWORD
-Prc=$RC_NUMBER -PuseGpgCmd -Psigning.gnupg.keyName=$SELECTED_GPG_KEY
-Pasf.git.pushRepositoryProvider=GITBOX
;;
clean)
- gradle clean
+ ./gradlew clean
;;
promote-release)
@@ -307,7 +307,7 @@ case $1 in
;;
test)
- gradle test
+ ./gradlew test
;;
*)
diff --git a/site/docker-compose.yml b/site/docker-compose.yml
index 5a15308da..f6cd6fba3 100644
--- a/site/docker-compose.yml
+++ b/site/docker-compose.yml
@@ -29,7 +29,7 @@ services:
volumes:
- .:/srv/jekyll
generate-javadoc:
- image: openjdk:17
+ image: eclipse-temurin:19
working_dir: /usr/src/calcite-avatica
command: sh -c "./gradlew javadocAggregate; rm -rf
site/target/avatica/javadocAggregate; mkdir -p site/target/avatica; mv
build/docs/javadocAggregate site/target/avatica"
volumes:
