This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_2_5_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/GROOVY_2_5_X by this push:
new 1521dc5 Fixes Grails joint validation workflow (closes #1423)
1521dc5 is described below
commit 1521dc54298cfeb3afc050aaaa7289647e6ff300
Author: Jason Schindler <[email protected]>
AuthorDate: Wed Nov 18 22:19:36 2020 -0600
Fixes Grails joint validation workflow (closes #1423)
---
.github/workflows/grails-joint-validation.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/grails-joint-validation.yml
b/.github/workflows/grails-joint-validation.yml
index 1d3c168..01dcbb2 100644
--- a/.github/workflows/grails-joint-validation.yml
+++ b/.github/workflows/grails-joint-validation.yml
@@ -48,17 +48,17 @@ jobs:
# 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.ref == 'refs/heads/GROOVY_3_0_X' }}
+ 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.ref == 'refs/heads/GROOVY_2_5_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 "::set-env name=CI_GROOVY_VERSION::$(cat gradle.properties |
grep groovyVersion | cut -d\= -f2 | tr -d '[:space:]')"
+ 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
