You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2020/03/11 15:01:10 UTC

[cayenne] branch master updated (ece80bd -> c368277)

This is an automated email from the ASF dual-hosted git repository.

ntimofeev pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git.


    from ece80bd  CAY-2651 Support multiple IDs in the SelectById query  use ObjectSelect instead of SelectQuery
     new d8f4706  change travis configuration
     new 1d98e63  Merge remote-tracking branch 'remotes/parent/pr/415' into asf-master
     new c368277  update travis config

The 3 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:
 .travis.yml | 33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)


[cayenne] 03/03: update travis config

Posted by nt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git

commit c368277e279b16ac08101cc15681123491d7fd93
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Wed Mar 11 18:00:59 2020 +0300

    update travis config
---
 .travis.yml | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ae3e962..0e4e15e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,11 +13,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+language: java
+
+os: linux
+dist: bionic
+
 services:
   - docker
 
-language: java
-
 env:
   jobs:
     - DB_PROFILE=hsql
@@ -37,11 +40,6 @@ jdk:
   - openjdk11
   - openjdk-ea
 
-os:
-  - linux
-
-dist: bionic
-
 script:
   - travis_wait mvn verify -q $EXCLUDE_MODULES -DcayenneTestConnection=$DB_PROFILE -DcayenneLogLevel=ERROR
 
@@ -49,10 +47,10 @@ jobs:
   allow_failures:
     - jdk: openjdk-ea
   include:
-  - stage: deploy
-    script: mvn deploy -DskipTests --settings .travis-mvn-settings.xml
-    jdk: openjdk8
-    if: type = push AND branch = master AND repo = apache/cayenne
+    - stage: deploy
+      script: mvn deploy -DskipTests --settings .travis-mvn-settings.xml
+      jdk: openjdk8
+      if: type = push AND branch = master AND repo = apache/cayenne
 
 # prevent Travis from unneeded "mvn install" run
 install: true


[cayenne] 02/03: Merge remote-tracking branch 'remotes/parent/pr/415' into asf-master

Posted by nt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git

commit 1d98e63f9e034ffc38ba871a13c2af3272ce0662
Merge: ece80bd d8f4706
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Wed Mar 11 17:59:35 2020 +0300

    Merge remote-tracking branch 'remotes/parent/pr/415' into asf-master

 .travis.yml | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)


[cayenne] 01/03: change travis configuration

Posted by nt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git

commit d8f47069cf904722c44c692eb515df770f2ecd83
Author: alex-byi <al...@mail.ru>
AuthorDate: Wed Mar 11 17:47:44 2020 +0300

    change travis configuration
---
 .travis.yml | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6b4c8f8..ae3e962 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,19 +13,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Since 4GB is not enough for the build, we use 'sudo' environment with 7.5GB RAM
-# Downside: It's starts a little bit slower
-# How to fix: Change build setting or fix code.
-# https://docs.travis-ci.com/user/ci-environment/#Virtualization-environments
-sudo: required
-
 services:
   - docker
 
 language: java
 
 env:
-  matrix:
+  jobs:
     - DB_PROFILE=hsql
     - DB_PROFILE=h2
     - DB_PROFILE=derby
@@ -43,14 +37,17 @@ jdk:
   - openjdk11
   - openjdk-ea
 
-matrix:
-  allow_failures:
-    - jdk: openjdk-ea
+os:
+  - linux
+
+dist: bionic
 
 script:
   - travis_wait mvn verify -q $EXCLUDE_MODULES -DcayenneTestConnection=$DB_PROFILE -DcayenneLogLevel=ERROR
 
 jobs:
+  allow_failures:
+    - jdk: openjdk-ea
   include:
   - stage: deploy
     script: mvn deploy -DskipTests --settings .travis-mvn-settings.xml
@@ -60,6 +57,6 @@ jobs:
 # prevent Travis from unneeded "mvn install" run
 install: true
 
-#cache:
-#  directories:
-#    - $HOME/.m2
+cache:
+  directories:
+    - $HOME/.m2