Merge pull request #269 from Vacxe/master

Prefinal 1.3.0

Author: Vacxe

.github/workflows/publish_package.yml

@@ -2,10 +2,11 @@ name: Release distribution
 
 on:
   release:
-    types: [created]
+    types: [ created ]
 
 jobs:
   dangerKotlinLibrary-shadowJar:
+    name: Build Library
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -24,11 +25,12 @@ jobs:
           path: danger-kotlin-library/build/libs/danger-kotlin.jar
 
   dangerKotlin-build-and-distribute:
+    name: Build and Attach binary to release
     needs: [ dangerKotlinLibrary-shadowJar ]
     strategy:
       fail-fast: false
       matrix:
-        target: [ {os: ubuntu-latest, compiler: linuxX64}, {os: macos-latest, compiler: macosX64}, {os: macos-latest, compiler: macosArm64}  ]
+        target: [ { os: ubuntu-latest, compiler: linuxX64 }, { os: macos-latest, compiler: macosX64 }, { os: macos-latest, compiler: macosArm64 } ]
 
     runs-on: ${{ matrix.target.os }}
 
@@ -48,15 +50,14 @@ jobs:
         run: ./gradlew danger-kotlin:build -PtargetOS="${{ matrix.target.compiler }}"
       - name: Prepare distribution package
         run: |
-          mkdir -p dist
-          mkdir -p dist/lib/danger
-          mkdir -p dist/bin
-          mv "danger-kotlin.jar" "dist/lib/danger"
-          mv "danger-kotlin/build/bin/runner/releaseExecutable/danger-kotlin.kexe" "dist/bin/danger-kotlin"
-          chmod +x dist/bin/danger-kotlin
+          mkdir -p lib/danger
+          mkdir -p bin
+          mv "danger-kotlin.jar" "lib/danger"
+          mv "danger-kotlin/build/bin/runner/releaseExecutable/danger-kotlin.kexe" "bin/danger-kotlin"
+          chmod +x bin/danger-kotlin
       - name: Tar files
-        run: | 
-          tar -cvf danger-kotlin-${{ matrix.target.compiler }}.tar dist
+        run: |
+          tar -cvf danger-kotlin-${{ matrix.target.compiler }}.tar bin lib
           shasum -a 256 danger-kotlin-${{ matrix.target.compiler }}.tar
       - name: Get release information
         id: get_release
@@ -72,3 +73,32 @@ jobs:
           asset_path: ./danger-kotlin-${{ matrix.target.compiler }}.tar
           asset_name: danger-kotlin-${{ matrix.target.compiler }}.tar
           asset_content_type: application/x-tar
+
+  docker-build-push:
+    name: Build and Push Docker image
+    runs-on: ubuntu-latest
+    needs: [ dangerKotlin-build-and-distribute ]
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Get release information
+        id: get_release
+        uses: bruceadams/get-release@v1.3.2
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+
+      - name: Docker Login
+        run: echo $PACKAGES_WRITE_TOKEN | docker login ghcr.io -u $USERNAME --password-stdin
+        env:
+          PACKAGES_WRITE_TOKEN: ${{ secrets.DOCKER_GITHUB_PASSWORD }}
+          USERNAME: ${{ secrets.DOCKER_GITHUB_USERNAME }}
+
+      - name: Docker Build
+        run: docker build -t ghcr.io/danger/danger-kotlin:$VERSION .
+        env:
+          VERSION: ${{ steps.get_release.outputs.tag_name }}
+
+      - name: Deploy
+        run: docker push ghcr.io/danger/danger-kotlin:$VERSION
+        env:
+          VERSION: ${{ steps.get_release.outputs.tag_name }}

.github/workflows/publish_release.yml

@@ -24,10 +24,6 @@ ENV PATH $PATH:/usr/lib/kotlinc/bin
 RUN npm install -g danger
 
 # Install Danger-Kotlin
-RUN wget -q "https://github.com/danger/kotlin/releases/download/$DANGER_KOTLIN_VERSION/danger-kotlin-$DANGER_KOTLIN_VERSION-linux.zip" && \
-    unzip "danger-kotlin-$DANGER_KOTLIN_VERSION-linux.zip" -d /usr/local && \
-    rm "danger-kotlin-$DANGER_KOTLIN_VERSION-linux.zip"
-
-RUN mkdir "/usr/local/lib/danger/libs"
-
-ENTRYPOINT ["danger-kotlin", "ci"]
+RUN wget -q "https://github.com/danger/kotlin/releases/download/$DANGER_KOTLIN_VERSION/danger-kotlin-linuxX64.tar" && \
+    tar -xvf "danger-kotlin-linuxX64.tar" -C /usr/local &&  \
+    rm "danger-kotlin-linuxX64.tar"

Dockerfile

@@ -63,12 +63,17 @@ object DangerFileScriptDefinition : ScriptCompilationConfiguration(
 )
 
 class DangerFileKtsConfigurator : RefineScriptCompilationConfigurationHandler {
-
-    private val resolver = CompoundDependenciesResolver(
-        FileSystemDependenciesResolver(DANGER_LIBS_FLAT_DIR),
-        FileSystemDependenciesResolver(),
+    private val externalDependenciesResolvers = setOf(
         MavenDependenciesResolver()
     )
+    private val resolvers = DANGER_DEFAULT_FLAT_DIRS
+        .map { File(it) }
+        .filter { it.exists() }
+        .map { FileSystemDependenciesResolver(it) } +
+            FileSystemDependenciesResolver() +
+            externalDependenciesResolvers
+
+    private val resolver = CompoundDependenciesResolver(resolvers)
 
     override operator fun invoke(context: ScriptConfigurationRefinementContext): ResultWithDiagnostics<ScriptCompilationConfiguration> =
         processAnnotations(context)
@@ -136,7 +141,13 @@ class DangerFileKtsConfigurator : RefineScriptCompilationConfigurationHandler {
     }
 
     private companion object {
-        const val DANGER_DEFAULT_FLAT_DIR = "/usr/local/lib/danger/libs"
-        private val DANGER_LIBS_FLAT_DIR = File(DANGER_DEFAULT_FLAT_DIR)
+        val DANGER_DEFAULT_FLAT_DIRS = setOf(
+            "/usr/local", // x86 location
+            "/opt/local", // Arm
+            "/opt/homebrew", // Homebrew Arm
+            "/usr", // Fallback
+        ).map {
+            "$it/lib/danger/libs"
+        }
     }
-}
+}

danger-kotlin-kts/src/main/kotlin/systems/danger/kts/DangerFileScriptDefinition.kt

@@ -8,8 +8,24 @@ import systems.danger.Log
 object DangerFile : DangerFileBridge {
     private const val DANGERFILE_EXTENSION = ".df.kts"
     private const val DANGERFILE = "Dangerfile$DANGERFILE_EXTENSION"
+    private val platformExpectedLibLocations = setOf(
+        "/usr/local", // x86 location
+        "/opt/local", // Arm
+        "/opt/homebrew", // Homebrew Arm
+        "/usr", // Fallback
+    )
 
     override fun execute(inputJson: String, outputJson: String) {
+        val dangerKotlinJarPath = platformExpectedLibLocations
+            .map { "$it/lib/danger/danger-kotlin.jar" }
+            .filter { access(it, F_OK) == 0 }
+            .also {
+                if (it.isEmpty()) {
+                    Log.error("lib/danger/danger-kotlin.jar not found in following location ${platformExpectedLibLocations.joinToString()}")
+                    exit(1)
+                }
+            }.first()
+
         val dangerfile = dangerfileParameter(inputJson) ?: DANGERFILE
 
         if (!dangerfile.endsWith(DANGERFILE_EXTENSION)) {
@@ -23,7 +39,7 @@ object DangerFile : DangerFileBridge {
             "-script-templates",
             "systems.danger.kts.DangerFileScript",
             "-cp",
-            "/usr/local/lib/danger/danger-kotlin.jar",
+            dangerKotlinJarPath,
             "-script",
             dangerfile,
             inputJson,