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:57:30 UTC
[calcite-avatica] branch master updated (4406b8c -> d5f6b29)
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.
discard 4406b8c [CALCITE-3573] Upgrade to Gradle 6.0 container to build releases and javadoc
new d5f6b29 [CALCITE-3573] Upgrade to Gradle 6.0 container to build releases and javadoc
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (4406b8c)
\
N -- N -- N refs/heads/master (d5f6b29)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 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:
site/docker-compose.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[calcite-avatica] 01/01: [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 d5f6b29e4f48a057c0c6b0a1e108ff4f1f4e02b0
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 | 8 ++++----
2 files changed, 9 insertions(+), 9 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..6c163d8 100644
--- a/site/docker-compose.yml
+++ b/site/docker-compose.yml
@@ -28,13 +28,13 @@ 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:
+ gradle-cache:
# End docker-compose.yml