Skip to content

Commit 3a0921f

Browse files
committed
Setup
1 parent 672e640 commit 3a0921f

File tree

4 files changed

+33
-7
lines changed

4 files changed

+33
-7
lines changed

.github/workflows/test-master.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,13 @@ jobs:
1414
- name: Set up JDK
1515
uses: actions/setup-java@v3
1616
with:
17-
java-version: "21"
17+
java-version: "17"
1818
distribution: "adopt"
1919

2020
- name: Build classes
21-
run: "./gradlew classes"
21+
run: |
22+
./gradlew classes || true
23+
./gradlew classes
2224
2325
- name: Build tests
2426
run: "./gradlew testClasses"

.github/workflows/test-pr.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,13 @@ jobs:
2121
- name: Set up JDK
2222
uses: actions/setup-java@v3
2323
with:
24-
java-version: "21"
24+
java-version: "17"
2525
distribution: "adopt"
2626

2727
- name: Build classes
28-
run: "./gradlew classes"
28+
run: |
29+
./gradlew classes || true
30+
./gradlew classes
2931
3032
- name: Build tests
3133
run: "./gradlew testClasses"

README.md

+9-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
[![GitHub Action](https://github.com/kora-projects/kora-java-crud-template/workflows/Build%20Master/badge.svg)](https://github.com/kora-projects/kora-java-crud-template/actions?query=workflow%3A%22Build%20Master%22++)
1+
[![GitHub Action](https://github.com/kora-projects/kora-kotlin-crud-template/workflows/Build%20Master/badge.svg)](https://github.com/kora-projects/kora-kotlin-crud-template/actions?query=workflow%3A%22Build%20Master%22++)
22

3-
# Шаблон приложения Kora Java CRUD
3+
# Шаблон приложения Kora Kotlin CRUD
44

5-
Пример сервиса реализованного на Kora с HTTP [CRUD](https://github.com/swagger-api/swagger-petstore) API,
5+
Пример Kotlin сервиса реализованного на Kora с HTTP [CRUD](https://github.com/swagger-api/swagger-petstore) API,
66
в качестве базы данных выступает Postgres, используется кэш Caffeine, а также другие модули которые использовались бы в реальном приложении в бою.
77

88
В примере использовались модули:
@@ -18,6 +18,12 @@
1818

1919
## Build
2020

21+
Собрать классы (может потребоваться запустить 2 раза из-за APT):
22+
23+
```shell
24+
./gradlew classes
25+
```
26+
2127
Собрать артефакт:
2228

2329
```shell

build.gradle.kts

+16
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@ buildscript {
1111
plugins {
1212
id("org.openapi.generator") version ("7.4.0")
1313
id("application")
14+
id("jacoco")
1415
kotlin("kapt") version ("1.9.10")
1516
kotlin("jvm") version ("1.9.10")
17+
id("org.flywaydb.flyway") version ("8.4.2")
1618
id("com.google.devtools.ksp") version ("1.9.10-1.0.13")
1719
}
1820

@@ -116,6 +118,13 @@ tasks.withType<JavaExec> {
116118
)
117119
}
118120

121+
flyway {
122+
url = "jdbc:postgresql://$postgresHost:$postgresPort/$postgresDatabase"
123+
user = postgresUser
124+
password = postgresPassword
125+
locations = arrayOf("classpath:db/migration")
126+
}
127+
119128
tasks.distTar {
120129
archiveFileName.set("application.tar")
121130
}
@@ -131,3 +140,10 @@ tasks.test {
131140
junitXml.required = false
132141
}
133142
}
143+
144+
tasks.jacocoTestReport {
145+
reports {
146+
xml.required = true
147+
html.outputLocation = layout.buildDirectory.dir("jacocoHtml")
148+
}
149+
}

0 commit comments

Comments
 (0)