Compare commits
10 Commits
771db5062f
...
024713cc95
Author | SHA1 | Date |
---|---|---|
Uwe Kubosch | 024713cc95 | |
Uwe Kubosch | c7f87b1944 | |
Uwe Kubosch | 89740f105b | |
Uwe Kubosch | d1566c674e | |
Uwe Kubosch | b9941aa4eb | |
Uwe Kubosch | 3a744909bd | |
Uwe Kubosch | b13fa01a8e | |
Uwe Kubosch | e56aafd9f9 | |
Uwe Kubosch | 4076c2cf26 | |
Uwe Kubosch | 3136c014d1 |
|
@ -1,26 +1,15 @@
|
||||||
name: Build
|
name: Build
|
||||||
on: [push, pull_request]
|
on: [ push, pull_request ]
|
||||||
jobs:
|
jobs:
|
||||||
check:
|
check:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v1
|
- uses: actions/checkout@v1
|
||||||
- uses: actions/setup-java@v1
|
- uses: actions/setup-java@v3
|
||||||
with:
|
with:
|
||||||
java-version: 11
|
distribution: 'temurin'
|
||||||
# Cache
|
java-version: '11'
|
||||||
- name: Cache .gradle/caches
|
cache: 'gradle'
|
||||||
uses: actions/cache@v1
|
|
||||||
with:
|
|
||||||
path: ~/.gradle/caches
|
|
||||||
key: ${{ runner.os }}-gradle-cache-${{ hashFiles('**/*.gradle') }}
|
|
||||||
restore-keys: ${{ runner.os }}-gradle-cache-
|
|
||||||
- name: Cache .gradle/wrapper
|
|
||||||
uses: actions/cache@v1
|
|
||||||
with:
|
|
||||||
path: ~/.gradle/wrapper
|
|
||||||
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/*.gradle') }}
|
|
||||||
restore-keys: ${{ runner.os }}-gradle-wrapper-
|
|
||||||
# Licensing
|
# Licensing
|
||||||
- name: Licensing
|
- name: Licensing
|
||||||
uses: eskatos/gradle-command-action@v1
|
uses: eskatos/gradle-command-action@v1
|
||||||
|
@ -38,22 +27,11 @@ jobs:
|
||||||
# use a short path to avoid exceeding the path limit on Windows... sigh
|
# use a short path to avoid exceeding the path limit on Windows... sigh
|
||||||
with:
|
with:
|
||||||
path: 'w'
|
path: 'w'
|
||||||
- uses: actions/setup-java@v1
|
- uses: actions/setup-java@v3
|
||||||
with:
|
with:
|
||||||
java-version: 11
|
distribution: 'temurin'
|
||||||
# Cache
|
java-version: '11'
|
||||||
- name: Cache .gradle/caches
|
cache: 'gradle'
|
||||||
uses: actions/cache@v1
|
|
||||||
with:
|
|
||||||
path: ~/.gradle/caches
|
|
||||||
key: ${{ runner.os }}-gradle-cache-${{ hashFiles('**/*.gradle') }}
|
|
||||||
restore-keys: ${{ runner.os }}-gradle-cache-
|
|
||||||
- name: Cache .gradle/wrapper
|
|
||||||
uses: actions/cache@v1
|
|
||||||
with:
|
|
||||||
path: ~/.gradle/wrapper
|
|
||||||
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/*.gradle') }}
|
|
||||||
restore-keys: ${{ runner.os }}-gradle-wrapper-
|
|
||||||
# Build
|
# Build
|
||||||
- name: Build
|
- name: Build
|
||||||
uses: eskatos/gradle-command-action@v1
|
uses: eskatos/gradle-command-action@v1
|
||||||
|
@ -89,84 +67,60 @@ jobs:
|
||||||
build:
|
build:
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
os: [ubuntu-latest, macos-latest]
|
os: [ ubuntu-latest, macos-latest ]
|
||||||
java: [ 8, 11 ]
|
java: [ 8, 11 ]
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v1
|
- uses: actions/checkout@v1
|
||||||
- uses: actions/setup-java@v1
|
- uses: actions/setup-java@v3
|
||||||
with:
|
with:
|
||||||
java-version: ${{ matrix.java }}
|
distribution: 'temurin'
|
||||||
# Cache
|
java-version: ${{ matrix.java }}
|
||||||
- name: Cache .gradle/caches
|
cache: 'gradle'
|
||||||
uses: actions/cache@v1
|
# Build
|
||||||
with:
|
- name: Build
|
||||||
path: ~/.gradle/caches
|
uses: eskatos/gradle-command-action@v1
|
||||||
key: ${{ runner.os }}-gradle-cache-${{ hashFiles('**/*.gradle') }}
|
with:
|
||||||
restore-keys: ${{ runner.os }}-gradle-cache-
|
arguments: -i -S --console=plain --no-build-cache assemble validateTaskProperties
|
||||||
- name: Cache .gradle/wrapper
|
# Unit tests
|
||||||
uses: actions/cache@v1
|
- name: Unit tests
|
||||||
with:
|
uses: eskatos/gradle-command-action@v1
|
||||||
path: ~/.gradle/wrapper
|
with:
|
||||||
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/*.gradle') }}
|
arguments: -i -s --console=plain --no-build-cache test
|
||||||
restore-keys: ${{ runner.os }}-gradle-wrapper-
|
# Integration tests
|
||||||
# Build
|
- name: Integration tests
|
||||||
- name: Build
|
uses: eskatos/gradle-command-action@v1
|
||||||
uses: eskatos/gradle-command-action@v1
|
with:
|
||||||
with:
|
arguments: -i -s --console=plain --no-build-cache intTest
|
||||||
arguments: -i -S --console=plain --no-build-cache assemble validateTaskProperties
|
# Gradle tests
|
||||||
# Unit tests
|
- name: Compatibility tests
|
||||||
- name: Unit tests
|
uses: eskatos/gradle-command-action@v1
|
||||||
uses: eskatos/gradle-command-action@v1
|
with:
|
||||||
with:
|
arguments: -i -s --console=plain --no-build-cache gradleTest
|
||||||
arguments: -i -s --console=plain --no-build-cache test
|
- name: Store reports
|
||||||
# Integration tests
|
uses: actions/upload-artifact@v2
|
||||||
- name: Integration tests
|
if: always()
|
||||||
uses: eskatos/gradle-command-action@v1
|
with:
|
||||||
with:
|
name: Test reports
|
||||||
arguments: -i -s --console=plain --no-build-cache intTest
|
path: "**/build/reports/**"
|
||||||
# Gradle tests
|
retention-days: 5
|
||||||
- name: Compatibility tests
|
|
||||||
uses: eskatos/gradle-command-action@v1
|
|
||||||
with:
|
|
||||||
arguments: -i -s --console=plain --no-build-cache gradleTest
|
|
||||||
- name: Store reports
|
|
||||||
uses: actions/upload-artifact@v2
|
|
||||||
if: always()
|
|
||||||
with:
|
|
||||||
name: Test reports
|
|
||||||
path: "**/build/reports/**"
|
|
||||||
retention-days: 5
|
|
||||||
publish:
|
publish:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
# on:
|
|
||||||
# push:
|
|
||||||
# branches:
|
|
||||||
# - release
|
|
||||||
needs: build
|
needs: build
|
||||||
if: ${{ github.repository == 'jruby-gradle/jruby-gradle-plugin' && github.ref == 'refs/heads/release' }}
|
if: ${{ github.repository == 'jruby-gradle/jruby-gradle-plugin' && github.ref == 'refs/heads/release' }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v1
|
- uses: actions/checkout@v1
|
||||||
- uses: actions/setup-java@v1
|
- uses: actions/setup-java@v3
|
||||||
with:
|
with:
|
||||||
java-version: 8
|
distribution: 'temurin'
|
||||||
- name: Cache .gradle/caches
|
java-version: '8'
|
||||||
uses: actions/cache@v1
|
cache: 'gradle'
|
||||||
with:
|
- name: Publish to Gradle Portal
|
||||||
path: ~/.gradle/caches
|
uses: eskatos/gradle-command-action@v1
|
||||||
key: ${{ runner.os }}-gradle-cache-${{ hashFiles('**/*.gradle') }}
|
with:
|
||||||
restore-keys: ${{ runner.os }}-gradle-cache-
|
arguments: -i --console=plain --no-build-cache assemble publishPlugins -Dgradle.publish.key=${{ secrets.PUBLISH_KEY }} -Dgradle.publish.secret=${{ secrets.PUBLISH_SECRET }}
|
||||||
- name: Cache .gradle/wrapper
|
- name: Publish documentation
|
||||||
uses: actions/cache@v1
|
uses: eskatos/gradle-command-action@v1
|
||||||
with:
|
with:
|
||||||
path: ~/.gradle/wrapper
|
# arguments: -i --console=plain --no-build-cache docs:publishGhPages -Dorg.ajoberstar.grgit.auth.username=${{ secrets.GH_PAGES_PUSH_USER }} -Dorg.ajoberstar.grgit.auth.password=${{ secrets.GH_PAGES_PUSH_TOKEN }} -Dorg.ajoberstar.grgit.auth.force=hardcoded
|
||||||
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/*.gradle') }}
|
arguments: -i --console=plain --no-build-cache docs:assembleDocs
|
||||||
restore-keys: ${{ runner.os }}-gradle-wrapper-
|
|
||||||
- name: Publish to Gradle Portal
|
|
||||||
uses: eskatos/gradle-command-action@v1
|
|
||||||
with:
|
|
||||||
arguments: -i --console=plain --no-build-cache assemble publishPlugins -Dgradle.publish.key=${{ secrets.PUBLISH_KEY }} -Dgradle.publish.secret=${{ secrets.PUBLISH_SECRET }}
|
|
||||||
- name: Publish documentation
|
|
||||||
uses: eskatos/gradle-command-action@v1
|
|
||||||
with:
|
|
||||||
arguments: -i --console=plain --no-build-cache docs:publishGhPages -Dorg.ajoberstar.grgit.auth.username=${{ secrets.GH_PAGES_PUSH_USER }} -Dorg.ajoberstar.grgit.auth.password=${{ secrets.GH_PAGES_PUSH_TOKEN }} -Dorg.ajoberstar.grgit.auth.force=hardcoded
|
|
||||||
|
|
13
build.gradle
13
build.gradle
|
@ -4,7 +4,7 @@ plugins {
|
||||||
id 'org.ajoberstar.github-pages' version '1.2.0' apply false
|
id 'org.ajoberstar.github-pages' version '1.2.0' apply false
|
||||||
id 'com.github.hierynomus.license' version '0.14.0' apply false
|
id 'com.github.hierynomus.license' version '0.14.0' apply false
|
||||||
id 'io.ratpack.ratpack-java' version "1.6.1" apply false
|
id 'io.ratpack.ratpack-java' version "1.6.1" apply false
|
||||||
id 'com.gradle.plugin-publish' version '0.14.0' apply false
|
id 'com.gradle.plugin-publish' version '1.1.0'
|
||||||
}
|
}
|
||||||
|
|
||||||
buildScan {
|
buildScan {
|
||||||
|
@ -27,7 +27,7 @@ allprojects {
|
||||||
olderJRubyVersion = '9.4.1.0'
|
olderJRubyVersion = '9.4.1.0'
|
||||||
spockVersion = "org.spockframework:spock-core:1.2-groovy-2.4"
|
spockVersion = "org.spockframework:spock-core:1.2-groovy-2.4"
|
||||||
pluginExtraText = (version.contains('-alpha') || version.contains('-beta')) ?
|
pluginExtraText = (version.contains('-alpha') || version.contains('-beta')) ?
|
||||||
'(If you need a production-ready version of the JRuby/Gradle plugin use a 1.7.x release instead)': ''
|
'(If you need a production-ready version of the JRuby/Gradle plugin use a 1.7.x release instead)' : ''
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -78,7 +78,7 @@ subprojects {
|
||||||
} else {
|
} else {
|
||||||
versions '4.10.2', '5.3.1', '6.0.1', '6.7', '7.6.1'
|
versions '4.10.2', '5.3.1', '6.0.1', '6.7', '7.6.1'
|
||||||
|
|
||||||
if(project.name == 'jruby-gradle-core-plugin' ) {
|
if (project.name == 'jruby-gradle-core-plugin') {
|
||||||
versions '4.3'
|
versions '4.3'
|
||||||
} else {
|
} else {
|
||||||
versions '4.9'
|
versions '4.9'
|
||||||
|
@ -87,8 +87,8 @@ subprojects {
|
||||||
|
|
||||||
dependsOn jar
|
dependsOn jar
|
||||||
}
|
}
|
||||||
|
|
||||||
pluginBundle {
|
gradlePlugin {
|
||||||
website = 'https://github.com/jruby-gradle/jruby-gradle-plugin' // 'http://jruby-gradle.org/'
|
website = 'https://github.com/jruby-gradle/jruby-gradle-plugin' // 'http://jruby-gradle.org/'
|
||||||
vcsUrl = 'https://github.com/jruby-gradle/jruby-gradle-plugin.git'
|
vcsUrl = 'https://github.com/jruby-gradle/jruby-gradle-plugin.git'
|
||||||
}
|
}
|
||||||
|
@ -103,7 +103,7 @@ subprojects {
|
||||||
def reportName = (codenarcSourceSetTask.name - 'codenarc').uncapitalize()
|
def reportName = (codenarcSourceSetTask.name - 'codenarc').uncapitalize()
|
||||||
def ideReport = reports.add(org.gradle.api.reporting.internal.TaskGeneratedSingleFileReport, 'ide', reports.task)
|
def ideReport = reports.add(org.gradle.api.reporting.internal.TaskGeneratedSingleFileReport, 'ide', reports.task)
|
||||||
ideReport.enabled = true
|
ideReport.enabled = true
|
||||||
ideReport.destination = file( "${project.codenarc.reportsDir}/${reportName}.ide.txt")
|
ideReport.destination = file("${project.codenarc.reportsDir}/${reportName}.ide.txt")
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.withType(ValidateTaskProperties) { validateTaskProperties ->
|
tasks.withType(ValidateTaskProperties) { validateTaskProperties ->
|
||||||
|
@ -112,7 +112,6 @@ subprojects {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
idea {
|
idea {
|
||||||
module {
|
module {
|
||||||
downloadJavadoc = true
|
downloadJavadoc = true
|
||||||
|
|
|
@ -5,7 +5,8 @@ buildscript {
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
/* wow. so recursion */
|
/* wow. so recursion */
|
||||||
classpath "com.github.jruby-gradle:jruby-gradle-plugin:2.1.0-alpha.2"
|
classpath "com.github.jruby-gradle:jruby-gradle-plugin:2.0.2"
|
||||||
|
classpath 'org.ysb33r.gradle:grolifant:0.17.0'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
apply plugin: 'groovy'
|
apply plugin: 'groovy'
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
version=2.1.0-beta.2
|
version=2.1.0-beta.6
|
||||||
group=com.github.jruby-gradle
|
group=com.github.jruby-gradle
|
||||||
copyrightYear=2014-2023
|
copyrightYear=2014-2023
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue