Skip to content

Commit 1023198

Browse files
elaguerta-nrelaguerta-nr
authored
Merge pull request #56 from newrelic/fossa-team
specify team name for fossa analyze
2 parents 8ee98d8 + 676aea0 commit 1023198

File tree

6 files changed

+12
-30
lines changed

6 files changed

+12
-30
lines changed

‎.github/workflows/fossa-caos.yml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
name: FOSSA CLI Analysis
22
on:
3-
push:
4-
branches: [ $default-branch ]
53
pull_request:
64
branches: [ $default-branch ]
7-
workflow_dispatch:
85

96
jobs:
107
check_env:
@@ -19,7 +16,7 @@ jobs:
1916

2017
fossa:
2118
needs: check_env
22-
if: ${{ needs.check_env.HAS_FOSSA_API_KEY }}
19+
if: ${{ needs.check_env.outputs.HAS_FOSSA_API_KEY == 'true' }}
2320
runs-on: ubuntu-latest
2421
env:
2522
FOSSA_API_KEY: ${{secrets.FOSSA_API_KEY}}
@@ -71,7 +68,7 @@ jobs:
7168
run: |
7269
export ANALYZE_OUT_FILE=${{ runner.temp }}/analyze_out.txt
7370
export ANALYZE_ERR_FILE=${{ runner.temp }}/analyze_err.txt
74-
fossa analyze --policy='New Relic Public Github' 1>$ANALYZE_OUT_FILE 2>$ANALYZE_ERR_FILE || true
71+
fossa analyze --team='Service Accounts' --policy='New Relic Public Github' 1>$ANALYZE_OUT_FILE 2>$ANALYZE_ERR_FILE || true
7572
if [[ $(grep "ERROR" $ANALYZE_ERR_FILE | wc -l) -gt 0 ]]
7673
then
7774
echo "::error::fossa analyze ran with errors."

‎.github/workflows/fossa-default.yml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
name: FOSSA CLI Analysis
22
on:
3-
push:
4-
branches: [ $default-branch ]
53
pull_request:
64
branches: [ $default-branch ]
7-
workflow_dispatch:
85

96
jobs:
107
check_env:
@@ -19,7 +16,7 @@ jobs:
1916

2017
fossa:
2118
needs: check_env
22-
if: ${{ needs.check_env.HAS_FOSSA_API_KEY }}
19+
if: ${{ needs.check_env.outputs.HAS_FOSSA_API_KEY == 'true' }}
2320
runs-on: ubuntu-latest
2421
env:
2522
FOSSA_API_KEY: ${{secrets.FOSSA_API_KEY}}
@@ -67,7 +64,7 @@ jobs:
6764
run: |
6865
export ANALYZE_OUT_FILE=${{ runner.temp }}/analyze_out.txt
6966
export ANALYZE_ERR_FILE=${{ runner.temp }}/analyze_err.txt
70-
fossa analyze --policy='New Relic Public Github' 1>$ANALYZE_OUT_FILE 2>$ANALYZE_ERR_FILE || true
67+
fossa analyze --team='Service Accounts' --policy='New Relic Public Github' 1>$ANALYZE_OUT_FILE 2>$ANALYZE_ERR_FILE || true
7168
if [[ $(grep "ERROR" $ANALYZE_ERR_FILE | wc -l) -gt 0 ]]
7269
then
7370
echo "::error::fossa analyze ran with errors."

‎.github/workflows/fossa-elixir.yml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
name: FOSSA CLI Analysis
22
on:
3-
push:
4-
branches: [ $default-branch ]
53
pull_request:
64
branches: [ $default-branch ]
7-
workflow_dispatch:
85

96
jobs:
107
check_env:
@@ -19,7 +16,7 @@ jobs:
1916

2017
fossa:
2118
needs: check_env
22-
if: ${{ needs.check_env.HAS_FOSSA_API_KEY }}
19+
if: ${{ needs.check_env.outputs.HAS_FOSSA_API_KEY == 'true' }}
2320
runs-on: ubuntu-latest
2421
env:
2522
FOSSA_API_KEY: ${{secrets.FOSSA_API_KEY}}
@@ -71,7 +68,7 @@ jobs:
7168
run: |
7269
export ANALYZE_OUT_FILE=${{ runner.temp }}/analyze_out.txt
7370
export ANALZYE_ERR_FILE=${{ runner.temp }}/analyze_err.txt
74-
fossa analyze --policy='New Relic Public Github' 1>$ANALYZE_OUT_FILE 2>$ANALZYE_ERR_FILE || true
71+
fossa analyze --team='Service Accounts' --policy='New Relic Public Github' 1>$ANALYZE_OUT_FILE 2>$ANALZYE_ERR_FILE || true
7572
if [[ $(grep -i "error" $ANALYZE_ERR_FILE | wc -l) -gt 0 ]]
7673
then
7774
echo "::error::fossa analyze ran with errors."

‎.github/workflows/fossa-gradle.yml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
name: FOSSA CLI Analysis
22
on:
3-
push:
4-
branches: [ $default-branch ]
53
pull_request:
64
branches: [ $default-branch ]
7-
workflow_dispatch:
85

96
jobs:
107
check_env:
@@ -19,7 +16,7 @@ jobs:
1916

2017
fossa:
2118
needs: check_env
22-
if: ${{ needs.check_env.HAS_FOSSA_API_KEY }}
19+
if: ${{ needs.check_env.outputs.HAS_FOSSA_API_KEY == 'true' }}
2320
runs-on: ubuntu-latest
2421
env:
2522
FOSSA_API_KEY: ${{secrets.FOSSA_API_KEY}}
@@ -90,7 +87,7 @@ jobs:
9087
run: |
9188
export ANALYZE_OUT_FILE=${{ runner.temp }}/analyze_out.txt
9289
export ANALZYE_ERR_FILE=${{ runner.temp }}/analyze_err.txt
93-
fossa analyze --policy='New Relic Public Github' 1>$ANALYZE_OUT_FILE 2>$ANALZYE_ERR_FILE || true
90+
fossa analyze --team='Service Accounts' --policy='New Relic Public Github' 1>$ANALYZE_OUT_FILE 2>$ANALZYE_ERR_FILE || true
9491
if [[ $(grep -i "error" $ANALYZE_ERR_FILE | wc -l) -gt 0 ]]
9592
then
9693
echo "::error::fossa analyze ran with errors."

‎.github/workflows/fossa-ruby-bundler.yml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
name: FOSSA CLI Analysis
22
on:
3-
push:
4-
branches: [ $default-branch ]
53
pull_request:
64
branches: [ $default-branch ]
7-
workflow_dispatch:
85

96
jobs:
107
check_env:
@@ -19,7 +16,7 @@ jobs:
1916

2017
fossa:
2118
needs: check_env
22-
if: ${{ needs.check_env.HAS_FOSSA_API_KEY }}
19+
if: ${{ needs.check_env.outputs.HAS_FOSSA_API_KEY == 'true' }}
2320
runs-on: ubuntu-latest
2421
env:
2522
FOSSA_API_KEY: ${{secrets.FOSSA_API_KEY}}
@@ -70,7 +67,7 @@ jobs:
7067
run: |
7168
export ANALYZE_OUT_FILE=${{ runner.temp }}/analyze_out.txt
7269
export ANALZYE_ERR_FILE=${{ runner.temp }}/analyze_err.txt
73-
fossa analyze --policy='New Relic Public Github' 1>$ANALYZE_OUT_FILE 2>$ANALZYE_ERR_FILE || true
70+
fossa analyze --team='Service Accounts' --policy='New Relic Public Github' 1>$ANALYZE_OUT_FILE 2>$ANALZYE_ERR_FILE || true
7471
if [[ $(grep -i "error" $ANALYZE_ERR_FILE | wc -l) -gt 0 ]]
7572
then
7673
echo "::error::fossa analyze ran with errors."

‎.github/workflows/fossa-scala.yml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
name: FOSSA CLI Analysis - Scala
22
on:
3-
push:
4-
branches: [ $default-branch ]
53
pull_request:
64
branches: [ $default-branch ]
7-
workflow_dispatch:
85

96
jobs:
107
check_env:
@@ -19,7 +16,7 @@ jobs:
1916

2017
fossa:
2118
needs: check_env
22-
if: ${{ needs.check_env.HAS_FOSSA_API_KEY }}
19+
if: ${{ needs.check_env.outputs.HAS_FOSSA_API_KEY == 'true' }}
2320
runs-on: ubuntu-latest
2421
env:
2522
FOSSA_API_KEY: ${{secrets.FOSSA_API_KEY}}
@@ -72,7 +69,7 @@ jobs:
7269
run: |
7370
export ANALYZE_OUT_FILE=${{ runner.temp }}/analyze_out.txt
7471
export ANALZYE_ERR_FILE=${{ runner.temp }}/analyze_err.txt
75-
fossa analyze --policy='New Relic Public Github' 1>$ANALYZE_OUT_FILE 2>$ANALZYE_ERR_FILE || true
72+
fossa analyze --team='Service Accounts' --policy='New Relic Public Github' 1>$ANALYZE_OUT_FILE 2>$ANALZYE_ERR_FILE || true
7673
if [[ $(grep -i "error" $ANALYZE_ERR_FILE | wc -l) -gt 0 ]]
7774
then
7875
echo "::error::fossa analyze ran with errors."

0 commit comments

Comments
 (0)