Try ORT CI API

valkey-io · Feb 8, 2024 · 9b75a06 · 9b75a06
1 parent c99685b
commit 9b75a06
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 19 deletions.
diff --git a/.github/workflows/ort.yml b/.github/workflows/ort.yml
@@ -34,7 +34,7 @@ jobs:
               uses: actions/checkout@v4
               with:
                   submodules: "true"
-
+            
             - name: Set up JDK 11 for the ORT package
               uses: actions/setup-java@v3
               with:
@@ -114,11 +114,27 @@ jobs:
                 envsubst < package.json.tmpl > "package.json"
                 cat package.json
             
-            - name: Run ORT tools for Node
-              uses: ./.github/workflows/run-ort-tools
+            - name: Make result dirs
+              run: |
+                mkdir python/ort-results
+                mkdir node/ort-results
+                mkdir glide-core/ort-results
+                
+            - name: Run GitHub Action for ORT for NodeJS
+              uses: oss-review-toolkit/ort-ci-github-action@v1
               with:
-                folder_name: "node"
-
+                allow-dynamic-versions: "true"
+                ort-home-path: "work/glide-for-redis/glide-for-redis/node"
+                report-formats: "PlainTextTemplate"
+                run: >
+                  analyzer,
+                  reporter
+                
+            # - name: Run ORT tools for Node
+            #   uses: ./.github/workflows/run-ort-tools
+            #   with:
+            #     folder_name: "node"
+
           ### Python ###
 
             - name: Set up Python 3.10
@@ -132,23 +148,39 @@ jobs:
                   python -m pip install --upgrade pip
                   pip install git+https://github.com/nexB/python-inspector
 
-            - name: Run ORT tools for Python
-              uses: ./.github/workflows/run-ort-tools
+            # - name: Run ORT tools for Python
+            #   uses: ./.github/workflows/run-ort-tools
+            #   with:
+            #     folder_name: "python"
+            - name: Run GitHub Action for ORT for NodeJS
+              uses: oss-review-toolkit/ort-ci-github-action@v1
               with:
-                folder_name: "python"
-
+                allow-dynamic-versions: "true"
+                ort-home-path: "work/glide-for-redis/glide-for-redis/python"
+                report-formats: "PlainTextTemplate"
+                run: >
+                  analyzer,
+                  reporter
             ### Rust ###
-
-            - name: Run ORT tools for Rust
-              uses: ./.github/workflows/run-ort-tools
+            - name: Run GitHub Action for ORT for NodeJS
+              uses: oss-review-toolkit/ort-ci-github-action@v1
               with:
-                folder_name: "glide-core"
+                allow-dynamic-versions: "true"
+                ort-home-path: "work/glide-for-redis/glide-for-redis/glide-core"
+                report-formats: "PlainTextTemplate"
+                run: >
+                  analyzer,
+                  reporter
+            # - name: Run ORT tools for Rust
+            #   uses: ./.github/workflows/run-ort-tools
+            #   with:
+            #     folder_name: "glide-core"
 
             - name: Check for diff
               run: |
-                cp python/ort_results/NOTICE_DEFAULT $PYTHON_ATTRIBUIOTNS
-                cp node/ort_results/NOTICE_DEFAULT $NODE_ATTRIBUIOTNS
-                cp glide-core/ort_results/NOTICE_DEFAULT $RUST_ATTRIBUIOTNS
+                cp python/ort-results/NOTICE_DEFAULT $PYTHON_ATTRIBUIOTNS
+                cp node/ort-results/NOTICE_DEFAULT $NODE_ATTRIBUIOTNS
+                cp glide-core/ort-results/NOTICE_DEFAULT $RUST_ATTRIBUIOTNS
                 GIT_DIFF=`git diff $PYTHON_ATTRIBUIOTNS $NODE_ATTRIBUIOTNS $RUST_ATTRIBUIOTNS`
                 if [ -n "$GIT_DIFF" ]; then
                 echo "FOUND_DIFF=true" >> $GITHUB_ENV

diff --git a/utils/get_licenses_from_ort.py b/utils/get_licenses_from_ort.py
@@ -50,9 +50,9 @@ def __init__(self, name: str, ort_results_folder: str) -> None:
 
 
 ort_results_per_lang = [
-    OrtResults("Python", "python/ort_results"),
-    OrtResults("Node", "node/ort_results"),
-    OrtResults("Rust", "glide-core/ort_results"),
+    OrtResults("Python", "python/ort-results"),
+    OrtResults("Node", "node/ort-results"),
+    OrtResults("Rust", "glide-core/ort-results"),
 ]
 
 licenses_set = set()