From 6ee192c377c64cb843c7d5cd0c85fb89ba4d0d26 Mon Sep 17 00:00:00 2001 From: Sayantan Roychowdhury Date: Sun, 21 Jul 2024 05:56:28 +0530 Subject: [PATCH 1/4] update build.gradle.kts --- build.gradle.kts | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index eb3dd5f..d4a1f6d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,8 +5,8 @@ repositories { mavenCentral() } -group="com.github.bitfireAT" -version=System.getenv("GIT_COMMIT") // set by jitpack.io +group="foundation.e.dav4jvm" +version=System.getenv("CI_COMMIT_SHA") // set by jitpack.io plugins { alias(libs.plugins.kotlin.jvm) @@ -19,13 +19,21 @@ publishing { publications { create("maven") { from(components["java"]) + artifact("${layout.buildDirectory}/libs/${project.name}.jar") } } repositories { maven { - name = "dav4jvm" - url = uri(layout.buildDirectory.dir("repo")) + name = "GitLab" + url = uri("https://gitlab.e.foundation/api/v4/projects/1687/packages/maven") + credentials(HttpHeaderCredentials::class) { + name = "Job-Token" + value = System.getenv("CI_JOB_TOKEN") + } + authentication { + create("header") + } } } } -- GitLab From 4935642c9fe42789eb623372bdd15605e1d55480 Mon Sep 17 00:00:00 2001 From: Sayantan Roychowdhury Date: Sun, 21 Jul 2024 06:03:20 +0530 Subject: [PATCH 2/4] add .gitlab-ci.yml --- .gitlab-ci.yml | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..3578ccd --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,40 @@ +image: "registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:latest" + +stages: + - build + - publish + +before_script: + - export GRADLE_USER_HOME=$(pwd)/.gradle + - chmod +x ./gradlew + +cache: + key: ${CI_PROJECT_ID} + paths: + - .gradle/ + +build: + stage: build + rules: + - if: '$CI_COMMIT_TAG !~ "/^$/"' + when: always + - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' + when: always + - when: manual + script: + - ./gradlew assemble + artifacts: + paths: + - build/libs/ + +publish: + stage: publish + needs: + - build + rules: + - if: '$CI_COMMIT_TAG !~ "/^$/"' + when: always + - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' + when: manual + script: + - ./gradlew publish -- GitLab From b340b2fa17605b4d28a1a7f9aa295f779644f4d3 Mon Sep 17 00:00:00 2001 From: Sayantan Roychowdhury Date: Sun, 21 Jul 2024 06:12:04 +0530 Subject: [PATCH 3/4] don't specify artifact location --- build.gradle.kts | 1 - 1 file changed, 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index d4a1f6d..41576cb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -19,7 +19,6 @@ publishing { publications { create("maven") { from(components["java"]) - artifact("${layout.buildDirectory}/libs/${project.name}.jar") } } -- GitLab From 9c941d773bc251a44223781ee3d90e84c74d2222 Mon Sep 17 00:00:00 2001 From: Sayantan Roychowdhury Date: Sun, 21 Jul 2024 06:19:40 +0530 Subject: [PATCH 4/4] set version as shortened commit sha --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 41576cb..919c833 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,7 +6,7 @@ repositories { } group="foundation.e.dav4jvm" -version=System.getenv("CI_COMMIT_SHA") // set by jitpack.io +version=System.getenv("CI_COMMIT_SHA")?.substring(0, 8) ?: "" plugins { alias(libs.plugins.kotlin.jvm) -- GitLab