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 2021/01/15 15:40:12 UTC
[groovy] branch missing-dot updated (1fc52dc -> 5d0beab)
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a change to branch missing-dot
in repository https://gitbox.apache.org/repos/asf/groovy.git.
discard 1fc52dc Try to address javadoc issue
discard 804ade1 Try to address javadoc issue
discard 847cd26 Tweak resource management in GINQ further
discard 757360b Revert "Tweak resource management in GINQ further"
new 5d0beab Try to address javadoc issue
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 (1fc52dc)
\
N -- N -- N refs/heads/missing-dot (5d0beab)
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:
.github/workflows/build-test.yml | 44 --------------
.github/workflows/gradle-snapshot-distribution.yml | 2 +-
.github/workflows/gradle-wrapper-validation.yml | 25 --------
.github/workflows/grails-joint-validation.yml | 66 ---------------------
.github/workflows/micronaut-joint-validation.yml | 67 ----------------------
.../collection/runtime/QueryableHelper.groovy | 6 ++
6 files changed, 7 insertions(+), 203 deletions(-)
delete mode 100644 .github/workflows/build-test.yml
delete mode 100644 .github/workflows/gradle-wrapper-validation.yml
delete mode 100644 .github/workflows/grails-joint-validation.yml
delete mode 100644 .github/workflows/micronaut-joint-validation.yml
[groovy] 01/01: Try to address javadoc issue
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch missing-dot
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 5d0beabeab4900d3baefbb903a2ce79fe96de12b
Author: Daniel Sun <su...@apache.org>
AuthorDate: Fri Jan 15 23:39:50 2021 +0800
Try to address javadoc issue
---
.github/workflows/build-test.yml | 44 --------------
.github/workflows/gradle-snapshot-distribution.yml | 2 +-
.github/workflows/gradle-wrapper-validation.yml | 25 --------
.github/workflows/grails-joint-validation.yml | 66 ---------------------
.github/workflows/micronaut-joint-validation.yml | 67 ----------------------
5 files changed, 1 insertion(+), 203 deletions(-)
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
deleted file mode 100644
index d374826..0000000
--- a/.github/workflows/build-test.yml
+++ /dev/null
@@ -1,44 +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.
-
-name: Build and test
-
-on: [push, pull_request]
-
-jobs:
- test:
- strategy:
- fail-fast: false
- matrix:
- os: [ubuntu-18.04]
- java: [8.0.232, 11.0.6]
- runs-on: ${{ matrix.os }}
- steps:
- - uses: actions/checkout@v1
- - name: Set up JDK
- uses: actions/setup-java@v1
- with:
- java-version: ${{ matrix.java }}
- - name: Cache Gradle Repository
- uses: actions/cache@v1
- with:
- path: ~/.gradle/caches
- key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
- restore-keys: ${{ runner.os }}-gradle
- - name: Test with Gradle
- run: ./gradlew test
- timeout-minutes: 60
- env:
- GRADLE_SCANS_ACCEPT: yes
diff --git a/.github/workflows/gradle-snapshot-distribution.yml b/.github/workflows/gradle-snapshot-distribution.yml
index ac8078c..4df4563 100644
--- a/.github/workflows/gradle-snapshot-distribution.yml
+++ b/.github/workflows/gradle-snapshot-distribution.yml
@@ -23,7 +23,7 @@ jobs:
fail-fast: true
matrix:
os: [ubuntu-18.04]
- java: [11.0.6]
+ java: [11.0.9]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v1
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
deleted file mode 100644
index c6c0844..0000000
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ /dev/null
@@ -1,25 +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.
-
-name: "Validate Gradle Wrapper"
-on: [push, pull_request]
-
-jobs:
- validation:
- name: "Validation"
- runs-on: ubuntu-18.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
deleted file mode 100644
index 01dcbb2..0000000
--- a/.github/workflows/grails-joint-validation.yml
+++ /dev/null
@@ -1,66 +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.
-
-name: "Grails Joint Validation Build"
-# GROOVY_2_5_X == Grails 4.0.x
-# GROOVY_3_0_X == grails master
-# Groovy master branch does not map to any due to changed package names.
-on:
- push:
- branches:
- - GROOVY_2_5_X
- - GROOVY_3_0_X
- # - master
- pull_request:
- branches:
- - GROOVY_2_5_X
- - GROOVY_3_0_X
-# - master
-jobs:
- build:
- strategy:
- fail-fast: true
- matrix:
- os: [ubuntu-18.04]
- java: [11.0.6]
- runs-on: ${{ matrix.os }}
- steps:
- - uses: actions/checkout@v1
- - name: Set up JDK
- uses: actions/setup-java@v1
- with:
- java-version: ${{ matrix.java }}
- - name: env
- run: env
-
- # Select correct Grails branch for this build:
- - name: Checkout Grails 4.1.x (master)
- run: cd .. && git clone --depth 1 https://github.com/grails/grails-core.git -b master
- if: ${{ (github.event_name == 'pull_request' && github.base_ref == 'GROOVY_3_0_X') || github.ref == 'refs/heads/GROOVY_3_0_X' }}
- - name: Checkout Grails 4.0.x (4.0.x)
- run: cd .. && git clone --depth 1 https://github.com/grails/grails-core.git -b 4.0.x
- if: ${{ (github.event_name == 'pull_request' && github.base_ref == 'GROOVY_2_5_X') || github.ref == 'refs/heads/GROOVY_2_5_X' }}
-
- - name: Build and install groovy (no docs)
- run: ./gradlew clean install -x groovydoc -x javadoc -x javadocAll -x groovydocAll -x asciidoc -x docGDK --no-build-cache --no-scan --no-daemon
- timeout-minutes: 60
-
- - name: Set CI_GROOVY_VERSION for Grails
- run: echo "CI_GROOVY_VERSION=$(cat gradle.properties | grep groovyVersion | cut -d\= -f2 | tr -d '[:space:]')" >> $GITHUB_ENV
- - name: echo CI_GROOVY_VERSION
- run: echo $CI_GROOVY_VERSION
- - name: Build Grails
- run: cd ../grails-core && ./gradlew clean build test -x groovydoc --no-build-cache --no-scan --no-daemon
- timeout-minutes: 60
diff --git a/.github/workflows/micronaut-joint-validation.yml b/.github/workflows/micronaut-joint-validation.yml
deleted file mode 100644
index 0f5e89c..0000000
--- a/.github/workflows/micronaut-joint-validation.yml
+++ /dev/null
@@ -1,67 +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.
-
-name: "Micronaut Joint Validation Build"
-on:
- push:
- branches:
- - GROOVY_3_0_X
- pull_request:
- branches:
- - GROOVY_3_0_X
-jobs:
- build:
- strategy:
- fail-fast: true
- matrix:
- os: [ubuntu-18.04]
- java: [11.0.6]
- runs-on: ${{ matrix.os }}
- steps:
- - uses: actions/checkout@v1
- - name: Set up JDK
- uses: actions/setup-java@v1
- with:
- java-version: ${{ matrix.java }}
- - name: env
- run: env
-
- # Create mavenLocal init script
- - name: Create init script to enable mavenLocal()
- run: cd .. && echo "allprojects { repositories { mavenLocal() } }" > maven-local-init.gradle
-
- # Clone Micronaut Repos
- - name: Checkout Micronaut Core
- run: cd .. && git clone --depth 1 https://github.com/micronaut-projects/micronaut-core -b 2.2.x
-
- - name: Checkout Micronaut Groovy
- run: cd .. && git clone --depth 1 https://github.com/micronaut-projects/micronaut-groovy -b master
-
- - name: Build and install groovy (no docs)
- run: ./gradlew clean install -x groovydoc -x javadoc -x javadocAll -x groovydocAll -x asciidoc -x docGDK --no-build-cache --no-scan --no-daemon
- timeout-minutes: 60
-
- - name: Set CI_GROOVY_VERSION
- run: echo "CI_GROOVY_VERSION=$(cat gradle.properties | grep groovyVersion | cut -d\= -f2 | tr -d '[:space:]')" >> $GITHUB_ENV
- - name: echo CI_GROOVY_VERSION
- run: echo $CI_GROOVY_VERSION
-
- - name: Check Micronaut Core
- run: cd ../micronaut-core && ./gradlew clean check --no-build-cache --no-scan --no-daemon -PgroovyVersion=$CI_GROOVY_VERSION --init-script ../maven-local-init.gradle
- timeout-minutes: 60
-
- - name: Check Micronaut Groovy
- run: cd ../micronaut-groovy && ./gradlew clean check --no-build-cache --no-scan --no-daemon -PgroovyVersion=$CI_GROOVY_VERSION --init-script ../maven-local-init.gradle
- timeout-minutes: 60