Fixes for GH Actions

This commit is contained in:
Jeroen van Erp
2020-04-14 20:39:46 +02:00
parent c2d25a9d62
commit 27a5039831
3 changed files with 24 additions and 16 deletions

View File

@@ -11,28 +11,36 @@ on:
branches: [ master ] branches: [ master ]
jobs: jobs:
build: java8:
name: Build with Java ${{ matrix.java }} name: Build with Java 8
strategy:
matrix:
java: [ 8, 9 ]
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- run: git fetch --depth=1 origin +refs/tags/*:refs/tags/* - name: Set up JDK 8
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v1 uses: actions/setup-java@v1
with: with:
java-version: ${{ matrix.java }} java-version: 8
- name: Grant execute permission for gradlew - name: Grant execute permission for gradlew
run: chmod +x gradlew run: chmod +x gradlew
- name: Build with Gradle - name: Build with Gradle
run: ./gradlew check run: ./gradlew check
java9:
name: Build with Java 9
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 9
uses: actions/setup-java@v1
with:
java-version: 9
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
run: ./gradlew check -xanimalSnifferMain
integration: integration:
name: Integration test name: Integration test
needs: [build] needs: [java8]
runs-on: [ubuntu-latest] runs-on: [ubuntu-latest]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@@ -44,4 +52,4 @@ jobs:
run: chmod +x gradlew run: chmod +x gradlew
- name: Build with Gradle - name: Build with Gradle
run: ./gradlew integrationTest run: ./gradlew integrationTest

View File

@@ -6,7 +6,7 @@ plugins {
id "java" id "java"
id "groovy" id "groovy"
id "jacoco" id "jacoco"
id "osgi" id "com.github.blindpirate.osgi" version '0.0.3'
id "maven-publish" id "maven-publish"
id 'pl.allegro.tech.build.axion-release' version '1.11.0' id 'pl.allegro.tech.build.axion-release' version '1.11.0'
id "com.bmuschko.docker-remote-api" version "3.2.1" id "com.bmuschko.docker-remote-api" version "3.2.1"
@@ -15,7 +15,7 @@ plugins {
id 'ru.vyarus.java-lib' version '1.0.5' id 'ru.vyarus.java-lib' version '1.0.5'
// id 'ru.vyarus.pom' version '1.0.3' // id 'ru.vyarus.pom' version '1.0.3'
id 'ru.vyarus.github-info' version '1.1.0' id 'ru.vyarus.github-info' version '1.1.0'
id 'ru.vyarus.animalsniffer' version '1.4.2' id 'ru.vyarus.animalsniffer' version '1.5.0'
} }
group = "com.hierynomus" group = "com.hierynomus"

View File

@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionSha256Sum=8626cbf206b4e201ade7b87779090690447054bc93f052954c78480fa6ed186e distributionSha256Sum=038794feef1f4745c6347107b6726279d1c824f3fc634b60f86ace1e9fbd1768
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists