Merge pull request #8 from philips-software/bring-your-own-ort

Add ort-input for bringing your own ORT file
philips-software · Feb 26, 2021 · 4f7bdfe · 4f7bdfe
2 parents 245ccb1 + 37e81c8
commit 4f7bdfe
Showing 1 changed file with 18 additions and 4 deletions.
diff --git a/action.yml b/action.yml
@@ -24,14 +24,18 @@ inputs:
     required: false
   ort-version:
     description: "philipssoftware/ort version"
-    required: true
+    required: false
     default: 'latest'
+  ort-file:
+    description: "Specifies an ort-file to override ORT scanning in this action."
+    required: false
 
 runs:
   using: "composite"
   steps:
     - name: Scan with ORT 
       run: |
+        [ -n "${ORT_FILE}" ] && echo "We have our own ORT_FILE so we don't need to scan it here"; exit 0
         # Allow ORT to fail. When one repository can't be found, the rest still makes sense to analyse 
         echo "--------------------------------------------------------------------"
         echo " Running ORT scanner"
@@ -40,15 +44,18 @@ runs:
         docker run -v ${{ github.workspace }}:/project philipssoftware/ort:${{ inputs.ort-version}} --info analyze -f JSON -i /project -o /project/ort
         set -e
       shell: bash
+      env:
+        ORT_FILE: ${{ inputs.ort-file }}
     - name: Create SPDX file
       id: spdx
       run: |
         echo "--------------------------------------------------------------------"
         echo " Creating SPDX file for ${PROJECT}. "
         echo "--------------------------------------------------------------------"
         echo " Inputs: "
-        echo "    PROJECT    : ${PROJECT} "
-        echo "    SCANNER_URL: ${SCANNER_URL} "
+        echo "    PROJECT              : ${PROJECT} "
+        echo "    SCANNER_URL          : ${SCANNER_URL} "
+        echo "    ORT_FILE             : ${ORT_FILE} "
         echo "--------------------------------------------------------------------"
         echo ""
         echo "--------------------------------------------------------------------"
@@ -59,15 +66,22 @@ runs:
         echo " Set SCANNER_ARG"
         echo "--------------------------------------------------------------------"
         [ -z "$SCANNER_URL" ] && SCANNER_ARG="" || SCANNER_ARG="--scanner ${SCANNER_URL}"
+        echo "          SCANNER_ARG: ${SCANNER_ARG}"
+        echo "--------------------------------------------------------------------"
+        echo " Set input-file"
+        echo "--------------------------------------------------------------------"
+        [ -n "$ORT_FILE" ] && INPUT_FILE=${ORT_FILE} || INPUT_FILE="ort/analyzer-result.json"
+        echo "          INPUT_FILE: ${INPUT_FILE}"
         echo "--------------------------------------------------------------------"
         echo " Running SPDX-builder"
         echo "--------------------------------------------------------------------"
-        java -jar spdx-builder.jar -c .spdx-builder.yml -o ${PROJECT}.spdx ort/analyzer-result.json ${SCANNER_ARG}
+        java -jar spdx-builder.jar -c .spdx-builder.yml -o ${PROJECT}.spdx ${INPUT_FILE} ${SCANNER_ARG}
         echo "--------------------------------------------------------------------"
         echo "Finished!"
         echo "--------------------------------------------------------------------"
         echo "::set-output name=spdx-file::${PROJECT}.spdx"
       env:
         PROJECT: ${{ inputs.project }}
         SCANNER_URL: ${{ inputs.scanner-url }}
+        ORT_FILE: ${{ inputs.ort-file }}
       shell: bash