Cleaned up CI workflows

ethauvin · Jul 13, 2024 · a890103 · a890103
1 parent b989f6f
commit a890103
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 9 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -9,6 +9,16 @@ defaults: &defaults
 defaults_bld: &defaults_bld
   steps:
     - checkout
+    - run:
+        name: Install Kotlin via SDKMAN!
+        command: |
+          curl -s "https://get.sdkman.io" | bash
+          echo sdkman_auto_answer=true > $HOME/.sdkman/etc/config
+          echo sdkman_auto_selfupdate=true >> $HOME/.sdkman/etc/config
+          source "$HOME/.sdkman/bin/sdkman-init.sh"
+          echo 'export SDKMAN_DIR="$HOME/.sdkman"' >> $BASH_ENV
+          echo 'source "$HOME/.sdkman/bin/sdkman-init.sh"' >> $BASH_ENV
+          sdk install kotlin 2.0.0
     - run:
         name: Download the bld dependencies
         command: ./bld download

diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         java-version: [17, 21, 22]
-        kotlin-version: [ 1.9.24, 2.0.0 ]
+        kotlin-version: [1.9.24, 2.0.0]
 
     steps:
       - name: Checkout source repository
@@ -50,7 +50,6 @@ jobs:
         run: ./bld jacoco
 
       - name: Remove pom.xml
-        if: success() && matrix.java-version == env.COVERAGE_SDK && matrix.kotlin-version == env.COVERAGE_KOTLIN
         run: rm -rf pom.xml
 
       - name: SonarCloud Scan

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,14 +1,24 @@
-image: openjdk:17
+image: ubuntu:latest
 
 variables:
   CI_NAME: "GitLab CI"
 
 stages:
   - test
 
+before_script:
+  - apt-get update -qq && apt-get install -y curl zip
+  - curl -s "https://get.sdkman.io" | bash
+  - echo sdkman_auto_answer=true > $HOME/.sdkman/etc/config
+  - echo sdkman_auto_selfupdate=true >> $HOME/.sdkman/etc/config
+  - source "$HOME/.sdkman/bin/sdkman-init.sh"
+  - sdk install java 17.0.11-tem
+  - sdk install kotlin 2.0.0
+  - source "$HOME/.sdkman/bin/sdkman-init.sh"
+
 test:
   stage: test
   script:
-      - ./bld download
-      - ./bld compile
-      - ./bld test
+    - ./bld download
+    - ./bld compile
+    - ./bld test
diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
@@ -1,10 +1,20 @@
-image: openjdk:17
+image: ubuntu:latest
 
 pipelines:
   default:
     - step:
         name: Test with bld
         script:
+          # Install Java & Kotlin via SDKMAN!
+          - apt-get update -qq && apt-get install -y curl zip
+          - curl -s "https://get.sdkman.io" | bash
+          - echo sdkman_auto_answer=true > $HOME/.sdkman/etc/config
+          - echo sdkman_auto_selfupdate=true >> $HOME/.sdkman/etc/config
+          - source "$HOME/.sdkman/bin/sdkman-init.sh"
+          - sdk install java 17.0.11-tem
+          - sdk install kotlin 2.0.0
+          - source "$HOME/.sdkman/bin/sdkman-init.sh"
+          # Download, compile and test with bld
           - ./bld download
           - ./bld compile
           - ./bld test
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/ReleaseInfo.kt b/src/main/kotlin/net/thauvin/erik/mobibot/ReleaseInfo.kt
@@ -14,12 +14,12 @@ import java.time.ZoneId
  */
 object ReleaseInfo {
     const val PROJECT = "mobibot"
-    const val VERSION = "0.8.0-rc+20240509074831"
+    const val VERSION = "0.8.0-rc+20240712110931"
 
     @JvmField
     @Suppress("MagicNumber")
     val BUILD_DATE: LocalDateTime = LocalDateTime.ofInstant(
-        Instant.ofEpochMilli(1715266111851L), ZoneId.systemDefault()
+        Instant.ofEpochMilli(1720807771484L), ZoneId.systemDefault()
     )
 
     const val WEBSITE = "https://mobitopia.org/mobibot/"