This commit is contained in:
Erik C. Thauvin 2021-06-11 20:22:57 -07:00
parent b2dcf781c2
commit e35d112b28
3 changed files with 17 additions and 9 deletions

View file

@ -5,22 +5,28 @@ on: [push, pull_request, workflow_dispatch]
jobs: jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
env: env:
GRADLE_OPTS: "-Dorg.gradle.jvmargs=-XX:MaxMetaspaceSize=512m" GRADLE_OPTS: "-Dorg.gradle.jvmargs=-XX:MaxMetaspaceSize=512m"
SONAR_JDK: "11" SONAR_JDK: "11"
strategy: strategy:
matrix: matrix:
java-version: [ 11, 15 ] java-version: [ 11, 15 ]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
fetch-depth: 0 fetch-depth: 0
- name: Set up JDK ${{ matrix.java-version }} - name: Set up JDK ${{ matrix.java-version }}
uses: actions/setup-java@v1 uses: actions/setup-java@v1
with: with:
java-version: ${{ matrix.java-version }} java-version: ${{ matrix.java-version }}
- name: Grant execute permission for gradlew - name: Grant execute permission for gradlew
run: chmod +x gradlew run: chmod +x gradlew
- name: Cache SonarCloud packages - name: Cache SonarCloud packages
if: matrix.java-version == env.SONAR_JDK if: matrix.java-version == env.SONAR_JDK
uses: actions/cache@v1 uses: actions/cache@v1
@ -28,6 +34,7 @@ jobs:
path: ~/.sonar/cache path: ~/.sonar/cache
key: ${{ runner.os }}-sonar key: ${{ runner.os }}-sonar
restore-keys: ${{ runner.os }}-sonar restore-keys: ${{ runner.os }}-sonar
- name: Cache Gradle packages - name: Cache Gradle packages
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
@ -37,6 +44,7 @@ jobs:
key: ${{ runner.os }}-gradle-${{ matrix.java-version }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} key: ${{ runner.os }}-gradle-${{ matrix.java-version }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: | restore-keys: |
${{ runner.os }}-gradle-${{ matrix.java-version }}- ${{ runner.os }}-gradle-${{ matrix.java-version }}-
- name: Test with Gradle - name: Test with Gradle
env: env:
CI_NAME: "GitHub CI" CI_NAME: "GitHub CI"
@ -51,12 +59,14 @@ jobs:
TWITTER_TOKEN: ${{ secrets.TWITTER_TOKEN }} TWITTER_TOKEN: ${{ secrets.TWITTER_TOKEN }}
TWITTER_TOKENSECRET: ${{ secrets.TWITTER_TOKENSECRET }} TWITTER_TOKENSECRET: ${{ secrets.TWITTER_TOKENSECRET }}
run: ./gradlew build check --stacktrace run: ./gradlew build check --stacktrace
- name: SonarCloud - name: SonarCloud
if: success() && matrix.java-version == env.SONAR_JDK if: success() && matrix.java-version == env.SONAR_JDK
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: ./gradlew sonarqube run: ./gradlew sonarqube
- name: Cleanup Gradle Cache - name: Cleanup Gradle Cache
run: | run: |
rm -f ~/.gradle/caches/modules-2/modules-2.lock rm -f ~/.gradle/caches/modules-2/modules-2.lock

View file

@ -9,7 +9,7 @@ plugins {
id 'net.thauvin.erik.gradle.semver' version '1.0.4' id 'net.thauvin.erik.gradle.semver' version '1.0.4'
id 'org.jetbrains.kotlin.jvm' version '1.5.10' id 'org.jetbrains.kotlin.jvm' version '1.5.10'
id 'org.jetbrains.kotlin.kapt' version '1.5.10' id 'org.jetbrains.kotlin.kapt' version '1.5.10'
id 'org.sonarqube' version '3.2.0' id 'org.sonarqube' version '3.3'
id 'pmd' id 'pmd'
} }
@ -19,6 +19,8 @@ final def packageName = 'net.thauvin.erik.mobibot'
final def deployDir = 'deploy' final def deployDir = 'deploy'
final def semverProcessor = "net.thauvin.erik:semver:1.2.0" final def semverProcessor = "net.thauvin.erik:semver:1.2.0"
mainClassName = packageName + '.Mobibot'
ext.versions = [ ext.versions = [
log4j : '2.14.1', log4j : '2.14.1',
pmd : '6.35.0', pmd : '6.35.0',
@ -84,10 +86,6 @@ kapt {
} }
} }
application {
mainClassName = packageName + '.Mobibot'
}
tasks.withType(JavaCompile) { tasks.withType(JavaCompile) {
options.encoding = 'UTF-8' options.encoding = 'UTF-8'
} }
@ -129,7 +127,7 @@ clean {
} }
run { run {
args('-d') args('-h')
} }
incrementBuildMeta { incrementBuildMeta {

View file

@ -1,9 +1,9 @@
#Generated by the Semver Plugin for Gradle #Generated by the Semver Plugin for Gradle
#Sat May 29 22:00:14 PDT 2021 #Mon May 31 14:55:18 PDT 2021
version.buildmeta=866 version.buildmeta=870
version.major=0 version.major=0
version.minor=8 version.minor=8
version.patch=0 version.patch=0
version.prerelease=beta version.prerelease=beta
version.project=mobibot version.project=mobibot
version.semver=0.8.0-beta+866 version.semver=0.8.0-beta+870