Merge branch 'ci-test' into 'master'

Update CI

See merge request mangadex-pub/mangadex_at_home!95

.gitlab-ci.yml

@@ -1,14 +1,19 @@
 stages:
   - build
   - publish
-  - publish_docker
+  - docker
+  - push
 
-build:
+Gradle Build:
   image: openjdk:8
   stage: build
+  only:
+    - branches
+    - tags
+    - merge_requests
 
   before_script:
-    - export VERSION="$CI_COMMIT_REF_NAME"
+    - export VERSION="${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA}"
   script:
     - ./gradlew build
   artifacts:
@@ -16,18 +21,20 @@ build:
     paths:
       - "build/libs/mangadex_at_home-*-all.jar"
 
-publish:
+Publish Artifacts:
   image: alpine
   stage: publish
+  needs:
+    - Gradle Build
+  variables:
+    GIT_STRATEGY: none
 
   before_script:
     - apk update && apk add zip
-    - export VERSION="$CI_COMMIT_REF_NAME"
+    - export VERSION="${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA}"
   script:
     - cp build/libs/mangadex_at_home-${VERSION}-all.jar ./
     - zip -r9 mangadex_at_home-${VERSION}.zip mangadex_at_home-${VERSION}-all.jar settings.sample.yaml
-  dependencies:
-    - build
   artifacts:
     name: "mangadex_at_home"
     paths:
@@ -35,20 +42,55 @@ publish:
       - "mangadex_at_home-*.zip"
       - "settings.sample.yaml"
 
-publish_docker:
+Docker Build:
   image: docker:20.10.8
   services:
     - docker:20.10.8-dind
-  stage: publish
+  stage: docker
-  only:
+  needs:
-    - tags
+    - Gradle Build
 
   before_script:
     - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin ${CI_REGISTRY}
-    - export VERSION="$CI_COMMIT_REF_NAME"
+    - export VERSION="${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA}"
-  dependencies:
+    - export BASE_TAG="$CI_COMMIT_SHORT_SHA"
-    - build
+
   script:
     - mv build/libs/mangadex_at_home-${VERSION}-all.jar build/libs/mangadex_at_home.jar
-    - docker build . -t ${CI_REGISTRY_IMAGE}:${VERSION}
+    - docker build . -t $CI_REGISTRY_IMAGE:$BASE_TAG
-    - docker push ${CI_REGISTRY_IMAGE}:${VERSION}
+    - docker push $CI_REGISTRY_IMAGE:$BASE_TAG
+
+.docker_push: &docker_push
+  image: docker:20.10.8
+  services:
+    - docker:20.10.8-dind
+  stage: push
+  variables:
+    GIT_STRATEGY: none
+
+  before_script:
+    - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin ${CI_REGISTRY}
+    - export BASE_TAG="$CI_COMMIT_SHORT_SHA"
+
+  script:
+    - docker pull $CI_REGISTRY_IMAGE:$BASE_TAG
+    - docker tag $CI_REGISTRY_IMAGE:$BASE_TAG $CI_REGISTRY_IMAGE:$NEW_TAG
+    - docker push $CI_REGISTRY_IMAGE:$NEW_TAG
+
+Push Latest:
+  <<: *docker_push
+  needs:
+    - Docker Build
+  only:
+    - master
+  variables:
+    NEW_TAG: latest
+
+Push Tags:
+  <<: *docker_push
+  needs:
+    - Docker Build
+  only:
+    - tags
+  variables:
+    NEW_TAG: $CI_COMMIT_TAG

build.gradle

@@ -1,17 +1,21 @@
 plugins {
     id "jacoco"
     id "java"
-    id "org.jetbrains.kotlin.jvm" version "1.5.21"
+    id "org.jetbrains.kotlin.jvm" version "1.5.31"
-    id "org.jetbrains.kotlin.kapt" version "1.5.21"
+    id "org.jetbrains.kotlin.kapt" version "1.5.31"
     id "application"
-    id "com.github.johnrengelman.shadow" version "5.2.0"
+    id "com.github.johnrengelman.shadow" version "7.0.0"
     id "com.diffplug.spotless" version "5.8.2"
     id "net.afanasev.sekret" version "0.1.0"
+    id "com.palantir.git-version" version "0.12.3"
 }
 
 group = "com.mangadex"
-version = System.getenv().getOrDefault("VERSION", 'git describe --tags --dirty'.execute().text.trim())
+version = System.getenv("VERSION") ?: gitVersion()
-mainClassName = "mdnet.MainKt"
+
+application {
+    mainClass = "mdnet.MainKt"
+}
 
 repositories {
     mavenCentral()