From bfdf6027c1b10dacf88b7411db71876c1f4ed2e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Vanden=20Bossche?= Date: Mon, 8 Apr 2024 12:27:52 +0200 Subject: [PATCH] Type pipeline --- .github/workflows/backend.yml | 32 ++++++++++++++++++++++-------- packages/backend/build.gradle.kts | 22 ++++++++++++++++---- packages/backend/gradle.properties | 1 + 3 files changed, 43 insertions(+), 12 deletions(-) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index 167bfac3..34956c1f 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -15,14 +15,12 @@ defaults: run: working-directory: packages/backend -# Build for linux & windows - - jobs: build: strategy: matrix: - os: [ ubuntu-latest, windows-latest ] + os: [ ubuntu-latest ] + java-version: [ '21' ] runs-on: ${{ matrix.os }} @@ -30,8 +28,18 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Setup gradle - uses: gradle/actions/setup-gradle@v3 +# - uses: actions/setup-java@v4 +# with: +# distribution: 'oracle' +# java-version: '21' +# cache: 'gradle' + + - name: Set up GraalVM (Java ${{ matrix.java-version }}) + uses: graalvm/setup-graalvm@v1 + with: + version: '${{ matrix.graalvm-version }}' + java-version: '${{ matrix.java-version }}' + cache: 'gradle' - name: Read rights to gradlew run: chmod +x gradlew @@ -39,5 +47,13 @@ jobs: - name: Run tests run: ./gradlew nativeTestCompile - - name: Run native compile - run: ./gradlew nativeCompile \ No newline at end of file +# - name: Run native compile +# run: ./gradlew nativeCompile + + - name: Get Project Version + id: get_version + run: echo "version=$(./gradlew -q printVersion)" >> $GITHUB_OUTPUT + + - name: echo version + run: | + echo "Version: ${{ steps.get_version.outputs.version }}" \ No newline at end of file diff --git a/packages/backend/build.gradle.kts b/packages/backend/build.gradle.kts index cf29223f..b164faf5 100644 --- a/packages/backend/build.gradle.kts +++ b/packages/backend/build.gradle.kts @@ -11,7 +11,16 @@ plugins { } group = "hollybike.api" -version = "0.0.1" +version = getV() + + +fun getV(): String { + if (hasProperty("project_version")) { + return project.findProperty("project_version") as String + } + + return "0.0.1" +} application { mainClass.set("hollybike.api.ApplicationKt") @@ -48,8 +57,8 @@ graalvmNative { binaries { all { javaLauncher.set(javaToolchains.launcherFor { - languageVersion.set(JavaLanguageVersion.of(22)) - vendor.set(JvmVendorSpec.GRAAL_VM) + languageVersion.set(JavaLanguageVersion.of(21)) + vendor.set(JvmVendorSpec.ORACLE) }) } named("main") { @@ -62,9 +71,14 @@ graalvmNative { buildArgs.add("-H:+ReportUnsupportedElementsAtRuntime") buildArgs.add("-H:+ReportExceptionStackTraces") buildArgs.add("-H:ReflectionConfigurationFiles=${project.projectDir}/src/main/resources/META-INF/native-image/reflect-config.json") -// buildArgs.add("-H:IncludeResources=\".*/openapi/documentation.yaml\"") imageName.set("hollybike-server") } } } + +tasks.register("printVersion") { + doLast { + println(project.version) + } +} \ No newline at end of file diff --git a/packages/backend/gradle.properties b/packages/backend/gradle.properties index 7752477d..557c3ea4 100644 --- a/packages/backend/gradle.properties +++ b/packages/backend/gradle.properties @@ -2,3 +2,4 @@ ktor_version=2.3.9 kotlin_version=1.9.23 logback_version=1.4.14 kotlin.code.style=official +project_version=0.0.1