Verified Commit 2eddb443 authored by AtjonTV's avatar AtjonTV

CI: Update CI files for the new changes

* Use the new Gradle LintKotlin task
* Use Gradle 6.3
parent b5673fea
Pipeline #2129 passed with stages
in 4 minutes and 48 seconds
......@@ -12,7 +12,7 @@ def build():
"steps": [
{
"name": "build",
"image": "gradle:6.0.1-jdk8",
"image": "gradle:6.3-jdk8",
"commands": [
"gradle build",
"gradle shadowJar"
......@@ -20,10 +20,9 @@ def build():
},
{
"name": "lint",
"image": "gradle:6.0.1-jdk8",
"image": "gradle:6.3-jdk8",
"commands": [
"bash scripts/ktlint.sh",
"./ktlint \"src/main/**/*.kt\"",
"gradle lintKotlin"
]
}
]
......@@ -36,7 +35,7 @@ def docs():
"steps": [
{
"name": "docs",
"image": "gradle:6.0.1-jdk8",
"image": "gradle:6.3-jdk8",
"commands": [
"gradle dokka",
]
......@@ -51,7 +50,7 @@ def test():
"steps": [
{
"name": "test",
"image": "gradle:6.0.1-jdk8",
"image": "gradle:6.3-jdk8",
"commands": [
"gradle test",
]
......
......@@ -8,16 +8,15 @@ platform:
steps:
- name: build
image: gradle:6.0.1-jdk8
image: gradle:6.3-jdk8
commands:
- gradle build
- gradle shadowJar
- name: lint
image: gradle:6.0.1-jdk8
image: gradle:6.3-jdk8
commands:
- bash scripts/ktlint.sh
- ./ktlint "src/main/**/*.kt"
- gradle lintKotlin
---
kind: pipeline
......@@ -29,7 +28,7 @@ platform:
steps:
- name: test
image: gradle:6.0.1-jdk8
image: gradle:6.3-jdk8
commands:
- gradle test
......@@ -43,7 +42,7 @@ platform:
steps:
- name: docs
image: gradle:6.0.1-jdk8
image: gradle:6.3-jdk8
commands:
- gradle dokka
......
image: gradle:6.0.1-jdk8
image: gradle:6.3-jdk8
stages:
- build
......@@ -7,13 +7,11 @@ stages:
before_script:
- export GRADLE_USER_HOME=`pwd`/.gradle
- scripts/ktlint.sh
cache:
paths:
- .gradle/wrapper
- .gradle/caches
- ktlint
build:
stage: build
......@@ -51,4 +49,4 @@ test:
lint:
stage: lint
script:
- ./ktlint "src/main/**/*.kt"
- gradle lintKotlin
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment