Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds github workflows, fixes compilation and jvm version errors #424

Merged
merged 7 commits into from
Jan 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
29 changes: 29 additions & 0 deletions .github/workflows/TEST.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: TEST

on:
push:
branches: [ "master", "main" ]
pull_request:

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

env:
CI: true
DISPLAY: ":99"
JAVA_VERSION: 11
JAVA_DISTRIBUTION: zulu

jobs:
test:
timeout-minutes: 25
runs-on: ubuntu-latest
steps:
- { uses: actions/checkout@v3 }
- { name: Set up JDK, uses: actions/setup-java@v3, with: { distribution: "${{ env.JAVA_DISTRIBUTION }}", java-version: "${{ env.JAVA_VERSION }}" } }
- { name: Prepare Gradle, uses: gradle/gradle-build-action@ef76a971e2fa3f867b617efd72f2fbd72cf6f8bc } # v2.8.0
- { name: Initialize Gradle, run: ./gradlew }
- { name: Gradle Test JVM, run: ./gradlew jvmTest }
- { name: Gradle Test JS, run: ./gradlew jsTest }
#- { name: Gradle Sonarqube, run: ./gradlew sonarqube, if: false }
10 changes: 9 additions & 1 deletion zircon.core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@ plugins {
id("signing")
}

val javaVersion = JavaVersion.VERSION_11

java {
sourceCompatibility = javaVersion
targetCompatibility = javaVersion
}

kotlin {

jvm {
Expand All @@ -26,7 +33,8 @@ kotlin {
kotlinOptions {
apiVersion = "1.9"
languageVersion = "1.9"
jvmTarget = "15"
jvmTarget = javaVersion.toString()

}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ abstract class BaseApplication<R : Any, A : Application, V>(
delay(renderIntervalMs - elapsedTimeMs)
}
} catch (e: Exception) {
logger.error(e) { "Render failed" }
logger.error({ "Render failed" }, e)
}
}
}
Expand Down