You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2022/08/05 20:16:20 UTC
[groovy] branch GROOVY_4_0_X updated (0e83050e38 -> 7681e68f48)
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a change to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
from 0e83050e38 GROOVY-10715: Make StreamingTemplateEngine support reusing ClassLoader
new 521f12426c Remove freaky travis CI and use GitHub actions only
new 600aa2ffc9 GINQ requires relevant version of groovy-macro
new 7681e68f48 Use ubuntu-20.04
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:
.github/workflows/gradle-wrapper-validation.yml | 2 +-
.github/workflows/grails-joint-validation.yml | 2 +-
.github/workflows/groovy-build-dist.yml | 2 +-
.github/workflows/groovy-build-test-ea.yml | 2 +-
.github/workflows/groovy-build-test.yml | 4 +-
.github/workflows/micronaut-joint-validation.yml | 2 +-
.travis.yml | 69 ------------------------
subprojects/groovy-ginq/build.gradle | 4 +-
8 files changed, 9 insertions(+), 78 deletions(-)
delete mode 100644 .travis.yml
[groovy] 02/03: GINQ requires relevant version of groovy-macro
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 600aa2ffc96752e37775c69e005fcab5698879f4
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Aug 6 03:31:22 2022 +0800
GINQ requires relevant version of groovy-macro
(cherry picked from commit 7b96a4016353cf2374cc4d908586c226a354778f)
---
subprojects/groovy-ginq/build.gradle | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/subprojects/groovy-ginq/build.gradle b/subprojects/groovy-ginq/build.gradle
index e308bed9c2..c009144011 100644
--- a/subprojects/groovy-ginq/build.gradle
+++ b/subprojects/groovy-ginq/build.gradle
@@ -21,8 +21,8 @@ plugins {
}
dependencies {
- implementation rootProject
- implementation project(':groovy-macro')
+ api rootProject
+ api project(':groovy-macro')
testImplementation project(':groovy-test')
testImplementation project(':groovy-json')
testImplementation project(':groovy-console')
[groovy] 01/03: Remove freaky travis CI and use GitHub actions only
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 521f12426c2f1edec82f56a8faaa1e9596550416
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Aug 6 03:10:50 2022 +0800
Remove freaky travis CI and use GitHub actions only
(cherry picked from commit 1838b78c3347597d1473ca2c232a97ce54d983f6)
---
.github/workflows/groovy-build-test.yml | 2 +-
.travis.yml | 69 ---------------------------------
2 files changed, 1 insertion(+), 70 deletions(-)
diff --git a/.github/workflows/groovy-build-test.yml b/.github/workflows/groovy-build-test.yml
index 0a7a8a27cf..1803d57e2f 100644
--- a/.github/workflows/groovy-build-test.yml
+++ b/.github/workflows/groovy-build-test.yml
@@ -23,7 +23,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-18.04]
- java: [8, 11, 17, 18]
+ java: [8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index e9e489f786..0000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,69 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-language: groovy
-
-# set sudo required for non-container vm with more mem even though we don't need sudo
-# https://docs.travis-ci.com/user/reference/overview/
-sudo: required
-dist: trusty
-
-install:
- - git fetch --unshallow
-
-matrix:
- include:
-# - env: BC='indy' FEATURE='19' TARGET_JAVA_HOME="/home/travis/openjdk$FEATURE" LICENSE='GPL'
-# jdk: openjdk17
- - env: BC='indy' FEATURE='18' TARGET_JAVA_HOME="/home/travis/openjdk$FEATURE" LICENSE='GPL'
- jdk: openjdk17
- - env: BC='indy'
- jdk: openjdk17
- - env: BC='indy'
- jdk: openjdk16
- - env: BC='indy'
- jdk: openjdk15
- - env: BC='indy'
- jdk: openjdk14
- - env: BC='indy'
- jdk: openjdk13
- - env: BC='indy'
- jdk: openjdk12
- - env: BC='indy'
- jdk: openjdk11
- - env: BC='indy'
- jdk: openjdk10
- - env: BC='indy'
- jdk: oraclejdk9
- - env: BC='indy'
- jdk: oraclejdk8
-
-# - env: BC='sonar'
-# jdk: openjdk11
-
-before_script:
- - unset _JAVA_OPTIONS
-
-script:
- - ./gradlew -version
- - if [ "$TARGET_JAVA_HOME" != "" ]; then wget https://github.com/sormuras/bach/raw/master/install-jdk.sh -P /tmp/ && chmod 755 /tmp/install-jdk.sh; fi
- - if [ "$TARGET_JAVA_HOME" != "" ]; then /tmp/install-jdk.sh --target "$TARGET_JAVA_HOME" --workspace "/home/travis/.cache/install-jdk" --feature "$FEATURE" --license "$LICENSE" --cacerts; fi
- - if [ "$BC" == "indy" ]; then travis_wait 60 ./gradlew test -Ptarget.java.home=$TARGET_JAVA_HOME; elif [ "$BC" == "sonar" ]; then travis_wait 60 ./gradlew sonarqube -Dsonar.login=$SONAR_LOGIN -Pcoverage=true; fi
-
-
-after_failure:
- - find /home/travis/build/apache/groovy/build/reports/dependency-verification -type f -name "*.html" | xargs cat
- - ./gradlew --write-verification-metadata pgp,sha512 --dry-run
- - diff -u /home/travis/build/apache/groovy/gradle/verification-metadata.xml /home/travis/build/apache/groovy/gradle/verification-metadata.dryrun.xml
\ No newline at end of file
[groovy] 03/03: Use ubuntu-20.04
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 7681e68f48e61f5f4bedbee480fe8ee1bedc86c8
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Aug 6 03:33:16 2022 +0800
Use ubuntu-20.04
(cherry picked from commit ea2da634bef76a2ae48d4ed53ac5ab2360b0e1fb)
---
.github/workflows/gradle-wrapper-validation.yml | 2 +-
.github/workflows/grails-joint-validation.yml | 2 +-
.github/workflows/groovy-build-dist.yml | 2 +-
.github/workflows/groovy-build-test-ea.yml | 2 +-
.github/workflows/groovy-build-test.yml | 2 +-
.github/workflows/micronaut-joint-validation.yml | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index c6c0844a62..d1d7aedbdc 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -19,7 +19,7 @@ on: [push, pull_request]
jobs:
validation:
name: "Validation"
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: gradle/wrapper-validation-action@e2c57acffb2c9aa5a8dc6eda2bbae0b6e495bd4c #v1.0.3
diff --git a/.github/workflows/grails-joint-validation.yml b/.github/workflows/grails-joint-validation.yml
index faeecdf2bf..75cb15db6d 100644
--- a/.github/workflows/grails-joint-validation.yml
+++ b/.github/workflows/grails-joint-validation.yml
@@ -33,7 +33,7 @@ jobs:
strategy:
fail-fast: true
matrix:
- os: [ubuntu-18.04]
+ os: [ubuntu-20.04]
java: [11.0.9]
runs-on: ${{ matrix.os }}
steps:
diff --git a/.github/workflows/groovy-build-dist.yml b/.github/workflows/groovy-build-dist.yml
index e376ed68ec..4acb1025b2 100644
--- a/.github/workflows/groovy-build-dist.yml
+++ b/.github/workflows/groovy-build-dist.yml
@@ -22,7 +22,7 @@ jobs:
strategy:
fail-fast: true
matrix:
- os: [ubuntu-18.04]
+ os: [ubuntu-20.04]
java: [17]
runs-on: ${{ matrix.os }}
steps:
diff --git a/.github/workflows/groovy-build-test-ea.yml b/.github/workflows/groovy-build-test-ea.yml
index 681a18dd44..372928398b 100644
--- a/.github/workflows/groovy-build-test-ea.yml
+++ b/.github/workflows/groovy-build-test-ea.yml
@@ -22,7 +22,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- os: [ubuntu-18.04]
+ os: [ubuntu-20.04]
java: [17]
# The jdk links of "install-jdk.sh" are sometimes outdated, so we have to download openjdk releases from https://jdk.java.net/ by ourselves.
jdk: ["https://download.java.net/java/early_access/jdk19/31/GPL/openjdk-19-ea+31_linux-x64_bin.tar.gz"]
diff --git a/.github/workflows/groovy-build-test.yml b/.github/workflows/groovy-build-test.yml
index 1803d57e2f..c8b2ff5d2e 100644
--- a/.github/workflows/groovy-build-test.yml
+++ b/.github/workflows/groovy-build-test.yml
@@ -22,7 +22,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- os: [ubuntu-18.04]
+ os: [ubuntu-20.04]
java: [8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18]
runs-on: ${{ matrix.os }}
steps:
diff --git a/.github/workflows/micronaut-joint-validation.yml b/.github/workflows/micronaut-joint-validation.yml
index ba5dfb92ae..9cf277184b 100644
--- a/.github/workflows/micronaut-joint-validation.yml
+++ b/.github/workflows/micronaut-joint-validation.yml
@@ -26,7 +26,7 @@ jobs:
strategy:
fail-fast: true
matrix:
- os: [ubuntu-18.04]
+ os: [ubuntu-20.04]
java: [11.0.9]
runs-on: ${{ matrix.os }}
steps: