You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by fr...@apache.org on 2019/12/06 03:55:44 UTC
[calcite-avatica] branch master updated (a746b25 -> 4406b8c)
This is an automated email from the ASF dual-hosted git repository.
francischuang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/calcite-avatica.git.
from a746b25 GitHub Actions: actions/checkout@master -> v1.1.0 to avoid unexpected failures
new feba1a2 Use Gitbox for pushing tags when making a release
new 4406b8c [CALCITE-3573] Upgrade to Gradle 6.0 container to build releases and javadoc
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
docker-compose.yml | 10 +++++-----
docker.sh | 4 ++--
site/docker-compose.yml | 6 +++---
3 files changed, 10 insertions(+), 10 deletions(-)
[calcite-avatica] 01/02: Use Gitbox for pushing tags when making a
release
Posted by fr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
francischuang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/calcite-avatica.git
commit feba1a2fba3e52739ef4c7e636498d057b409fa7
Author: Francis Chuang <fr...@apache.org>
AuthorDate: Fri Dec 6 14:27:57 2019 +1100
Use Gitbox for pushing tags when making a release
---
docker.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docker.sh b/docker.sh
index be033b7..5684c17 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
+ 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
# If there is more than 1 release, delete all of them, except for the newest one
# To do this, we do the following:
@@ -292,7 +292,7 @@ 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
+ 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
;;
clean)
[calcite-avatica] 02/02: [CALCITE-3573] Upgrade to Gradle 6.0
container to build releases and javadoc
Posted by fr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
francischuang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/calcite-avatica.git
commit 4406b8c46d8ba29e84369226e1259f0fe929aae7
Author: Francis Chuang <fr...@apache.org>
AuthorDate: Fri Dec 6 14:55:15 2019 +1100
[CALCITE-3573] Upgrade to Gradle 6.0 container to build releases and javadoc
---
docker-compose.yml | 10 +++++-----
site/docker-compose.yml | 6 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index ef95550..fa69a87 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,7 +16,7 @@
version: '3'
services:
dry-run:
- image: gradle:5.6-jdk
+ image: gradle:6.0-jdk
working_dir: /src
command: sh -c "./docker.sh dry-run"
network_mode: "host"
@@ -25,7 +25,7 @@ services:
- gradle-cache:/home/gradle/.gradle
publish-release-for-voting:
- image: gradle:5.6-jdk
+ image: gradle:6.0-jdk
working_dir: /src
command: sh -c "./docker.sh publish-release-for-voting"
volumes:
@@ -33,7 +33,7 @@ services:
- gradle-cache:/home/gradle/.gradle
clean:
- image: gradle:5.6-jdk
+ image: gradle:6.0-jdk
working_dir: /src
command: sh -c "./docker.sh clean"
volumes:
@@ -41,7 +41,7 @@ services:
- gradle-cache:/home/gradle/.gradle
promote-release:
- image: gradle:5.6-jdk
+ image: gradle:6.0-jdk
working_dir: /src
command: sh -c "./docker.sh promote-release"
volumes:
@@ -49,7 +49,7 @@ services:
- gradle-cache:/home/gradle/.gradle
test:
- image: gradle:5.6-jdk
+ image: gradle:6.0-jdk
working_dir: /src
command: sh -c "./docker.sh test"
volumes:
diff --git a/site/docker-compose.yml b/site/docker-compose.yml
index 2923492..364c0c5 100644
--- a/site/docker-compose.yml
+++ b/site/docker-compose.yml
@@ -28,12 +28,12 @@ services:
volumes:
- .:/srv/jekyll
generate-javadoc:
- image: maven
+ image: gradle:6.0
working_dir: /usr/src/calcite-avatica
- command: sh -c "./gradlew javadocAggregate; rm -rf site/target/avatica/apidocs site/target/avatica/testapidocs; mkdir -p site/target/avatica; mv build/docs/javadocAggregate site/target/avatica"
+ command: sh -c "gradle javadocAggregate; rm -rf site/target/avatica/apidocs site/target/avatica/testapidocs; mkdir -p site/target/avatica; mv build/docs/javadocAggregate site/target/avatica"
volumes:
- ../:/usr/src/calcite-avatica
- - maven-repo:/root/.m2
+ - gradle-cache:/home/gradle/.gradle
volumes:
maven-repo: