Merge pull request #56 from newrelic/fossa-team

specify team name for fossa analyze
newrelic · May 22, 2024 · 1023198 · 1023198
2 parents 8ee98d8 + 676aea0
commit 1023198
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 30 deletions.
diff --git a/.github/workflows/fossa-caos.yml b/.github/workflows/fossa-caos.yml
@@ -1,10 +1,7 @@
 name: FOSSA CLI Analysis
 on:
-  push:
-    branches: [ $default-branch ]
   pull_request:
     branches: [ $default-branch ]
-  workflow_dispatch:
 
 jobs:
   check_env:
@@ -19,7 +16,7 @@ jobs:
 
   fossa:
     needs: check_env
-    if: ${{ needs.check_env.HAS_FOSSA_API_KEY }}
+    if: ${{ needs.check_env.outputs.HAS_FOSSA_API_KEY == 'true' }}
     runs-on: ubuntu-latest
     env:
       FOSSA_API_KEY: ${{secrets.FOSSA_API_KEY}}
@@ -71,7 +68,7 @@ jobs:
         run: |
           export ANALYZE_OUT_FILE=${{ runner.temp }}/analyze_out.txt
           export ANALYZE_ERR_FILE=${{ runner.temp }}/analyze_err.txt
-          fossa analyze --policy='New Relic Public Github' 1>$ANALYZE_OUT_FILE 2>$ANALYZE_ERR_FILE || true
+          fossa analyze --team='Service Accounts' --policy='New Relic Public Github' 1>$ANALYZE_OUT_FILE 2>$ANALYZE_ERR_FILE || true
           if [[ $(grep "ERROR" $ANALYZE_ERR_FILE | wc -l) -gt 0 ]]
           then
               echo "::error::fossa analyze ran with errors."

diff --git a/.github/workflows/fossa-default.yml b/.github/workflows/fossa-default.yml
@@ -1,10 +1,7 @@
 name: FOSSA CLI Analysis
 on:
-  push:
-    branches: [ $default-branch ]
   pull_request:
     branches: [ $default-branch ]
-  workflow_dispatch:
 
 jobs:
   check_env:
@@ -19,7 +16,7 @@ jobs:
 
   fossa:
     needs: check_env
-    if: ${{ needs.check_env.HAS_FOSSA_API_KEY }}
+    if: ${{ needs.check_env.outputs.HAS_FOSSA_API_KEY == 'true' }}
     runs-on: ubuntu-latest
     env:
       FOSSA_API_KEY: ${{secrets.FOSSA_API_KEY}}
@@ -67,7 +64,7 @@ jobs:
         run: |
           export ANALYZE_OUT_FILE=${{ runner.temp }}/analyze_out.txt
           export ANALYZE_ERR_FILE=${{ runner.temp }}/analyze_err.txt
-          fossa analyze --policy='New Relic Public Github' 1>$ANALYZE_OUT_FILE 2>$ANALYZE_ERR_FILE || true
+          fossa analyze --team='Service Accounts' --policy='New Relic Public Github' 1>$ANALYZE_OUT_FILE 2>$ANALYZE_ERR_FILE || true
           if [[ $(grep "ERROR" $ANALYZE_ERR_FILE | wc -l) -gt 0 ]]
           then
               echo "::error::fossa analyze ran with errors."

diff --git a/.github/workflows/fossa-elixir.yml b/.github/workflows/fossa-elixir.yml
@@ -1,10 +1,7 @@
 name: FOSSA CLI Analysis
 on:
-  push:
-    branches: [ $default-branch ]
   pull_request:
     branches: [ $default-branch ]
-  workflow_dispatch:
 
 jobs:
   check_env:
@@ -19,7 +16,7 @@ jobs:
 
   fossa:
     needs: check_env
-    if: ${{ needs.check_env.HAS_FOSSA_API_KEY }}
+    if: ${{ needs.check_env.outputs.HAS_FOSSA_API_KEY == 'true' }}
     runs-on: ubuntu-latest
     env:
       FOSSA_API_KEY: ${{secrets.FOSSA_API_KEY}}
@@ -71,7 +68,7 @@ jobs:
         run: |
           export ANALYZE_OUT_FILE=${{ runner.temp }}/analyze_out.txt
           export ANALZYE_ERR_FILE=${{ runner.temp }}/analyze_err.txt
-          fossa analyze --policy='New Relic Public Github' 1>$ANALYZE_OUT_FILE 2>$ANALZYE_ERR_FILE || true
+          fossa analyze --team='Service Accounts' --policy='New Relic Public Github' 1>$ANALYZE_OUT_FILE 2>$ANALZYE_ERR_FILE || true
           if [[ $(grep -i "error" $ANALYZE_ERR_FILE | wc -l) -gt 0 ]]
           then
               echo "::error::fossa analyze ran with errors."

diff --git a/.github/workflows/fossa-gradle.yml b/.github/workflows/fossa-gradle.yml
@@ -1,10 +1,7 @@
 name: FOSSA CLI Analysis
 on:
-  push:
-    branches: [ $default-branch ]
   pull_request:
     branches: [ $default-branch ]
-  workflow_dispatch:
 
 jobs:
   check_env:
@@ -19,7 +16,7 @@ jobs:
 
   fossa:
     needs: check_env
-    if: ${{ needs.check_env.HAS_FOSSA_API_KEY }}
+    if: ${{ needs.check_env.outputs.HAS_FOSSA_API_KEY == 'true' }}
     runs-on: ubuntu-latest
     env:
       FOSSA_API_KEY: ${{secrets.FOSSA_API_KEY}}
@@ -90,7 +87,7 @@ jobs:
         run: |
           export ANALYZE_OUT_FILE=${{ runner.temp }}/analyze_out.txt
           export ANALZYE_ERR_FILE=${{ runner.temp }}/analyze_err.txt
-          fossa analyze --policy='New Relic Public Github' 1>$ANALYZE_OUT_FILE 2>$ANALZYE_ERR_FILE || true
+          fossa analyze --team='Service Accounts' --policy='New Relic Public Github' 1>$ANALYZE_OUT_FILE 2>$ANALZYE_ERR_FILE || true
           if [[ $(grep -i "error" $ANALYZE_ERR_FILE | wc -l) -gt 0 ]]
           then
               echo "::error::fossa analyze ran with errors."

diff --git a/.github/workflows/fossa-ruby-bundler.yml b/.github/workflows/fossa-ruby-bundler.yml
@@ -1,10 +1,7 @@
 name: FOSSA CLI Analysis
 on:
-  push:
-    branches: [ $default-branch ]
   pull_request:
     branches: [ $default-branch ]
-  workflow_dispatch:
 
 jobs:
   check_env:
@@ -19,7 +16,7 @@ jobs:
 
   fossa:
     needs: check_env
-    if: ${{ needs.check_env.HAS_FOSSA_API_KEY }}
+    if: ${{ needs.check_env.outputs.HAS_FOSSA_API_KEY == 'true' }}
     runs-on: ubuntu-latest
     env:
       FOSSA_API_KEY: ${{secrets.FOSSA_API_KEY}}
@@ -70,7 +67,7 @@ jobs:
         run: |
           export ANALYZE_OUT_FILE=${{ runner.temp }}/analyze_out.txt
           export ANALZYE_ERR_FILE=${{ runner.temp }}/analyze_err.txt
-          fossa analyze --policy='New Relic Public Github' 1>$ANALYZE_OUT_FILE 2>$ANALZYE_ERR_FILE || true
+          fossa analyze --team='Service Accounts' --policy='New Relic Public Github' 1>$ANALYZE_OUT_FILE 2>$ANALZYE_ERR_FILE || true
           if [[ $(grep -i "error" $ANALYZE_ERR_FILE | wc -l) -gt 0 ]]
           then
               echo "::error::fossa analyze ran with errors."

diff --git a/.github/workflows/fossa-scala.yml b/.github/workflows/fossa-scala.yml
@@ -1,10 +1,7 @@
 name: FOSSA CLI Analysis - Scala
 on:
-  push:
-    branches: [ $default-branch ]
   pull_request:
     branches: [ $default-branch ]
-  workflow_dispatch:
 
 jobs:
   check_env:
@@ -19,7 +16,7 @@ jobs:
 
   fossa:
     needs: check_env
-    if: ${{ needs.check_env.HAS_FOSSA_API_KEY }}
+    if: ${{ needs.check_env.outputs.HAS_FOSSA_API_KEY == 'true' }}
     runs-on: ubuntu-latest
     env:
       FOSSA_API_KEY: ${{secrets.FOSSA_API_KEY}}
@@ -72,7 +69,7 @@ jobs:
         run: |
           export ANALYZE_OUT_FILE=${{ runner.temp }}/analyze_out.txt
           export ANALZYE_ERR_FILE=${{ runner.temp }}/analyze_err.txt
-          fossa analyze --policy='New Relic Public Github' 1>$ANALYZE_OUT_FILE 2>$ANALZYE_ERR_FILE || true
+          fossa analyze --team='Service Accounts' --policy='New Relic Public Github' 1>$ANALYZE_OUT_FILE 2>$ANALZYE_ERR_FILE || true
           if [[ $(grep -i "error" $ANALYZE_ERR_FILE | wc -l) -gt 0 ]]
           then
               echo "::error::fossa analyze ran with errors."