diff --git a/.github/workflows/fossology-scan.yaml b/.github/workflows/fossology-scan.yaml index 97a57a8..904a32a 100644 --- a/.github/workflows/fossology-scan.yaml +++ b/.github/workflows/fossology-scan.yaml @@ -34,10 +34,6 @@ name: Check diff for license with Fossology on: pull_request: -# inputs: -# file-path: -# description: 'test_keyword.conf' -# required: false jobs: build-docker-image: @@ -123,25 +119,26 @@ jobs: FILE_PATH=${{vars.KEYWORD_CONF_FILE_PATH || '' }} echo "File Path : $FILE_PATH" - - name: Run Fossology Scanner + - name: Run Fossology Scanner with custom keywords run: | - if [ -n "$FILE_PATH" ]; then - docker run --rm --name "fossologyscanner" -w "/opt/repo" -v ${PWD}:/opt/repo \ - -e GITHUB_TOKEN=${{ github.token }} \ - -e GITHUB_PULL_REQUEST=${{ github.event.number }} \ - -e GITHUB_REPOSITORY=${{ github.repository }} \ - -e GITHUB_API=${{ github.api_url }} \ - -e GITHUB_REPO_URL=${{ github.repositoryUrl }} \ - -e GITHUB_REPO_OWNER=${{ github.repository_owner }} \ - -e GITHUB_ACTIONS \ - rjknightmare/fo-ci-test:latest "/bin/fossologyscanner" copyright keyword --keyword-conf "$FILE_PATH" - else - docker run --rm --name "fossologyscanner" -w "/opt/repo" -v ${PWD}:/opt/repo \ - -e GITHUB_TOKEN=${{ github.token }} \ - -e GITHUB_PULL_REQUEST=${{ github.event.number }} \ - -e GITHUB_REPOSITORY=${{ github.repository }} \ - -e GITHUB_API=${{ github.api_url }} \ - -e GITHUB_REPO_URL=${{ github.repositoryUrl }} \ - -e GITHUB_REPO_OWNER=${{ github.repository_owner }} \ - -e GITHUB_ACTIONS \ - rjknightmare/fo-ci-test:latest "/bin/fossologyscanner" copyright keyword + docker run --rm --name "fossologyscanner" -w "/opt/repo" -v ${PWD}:/opt/repo \ + -e GITHUB_TOKEN=${{ github.token }} \ + -e GITHUB_PULL_REQUEST=${{ github.event.number }} \ + -e GITHUB_REPOSITORY=${{ github.repository }} \ + -e GITHUB_API=${{ github.api_url }} \ + -e GITHUB_REPO_URL=${{ github.repositoryUrl }} \ + -e GITHUB_REPO_OWNER=${{ github.repository_owner }} \ + -e GITHUB_ACTIONS \ + rjknightmare/fo-ci-test:latest "/bin/fossologyscanner" copyright keyword --keyword-conf "$FILE_PATH" + + - name: Run fossology scanner + run : | + docker run --rm --name "fossologyscanner" -w "/opt/repo" -v ${PWD}:/opt/repo \ + -e GITHUB_TOKEN=${{ github.token }} \ + -e GITHUB_PULL_REQUEST=${{ github.event.number }} \ + -e GITHUB_REPOSITORY=${{ github.repository }} \ + -e GITHUB_API=${{ github.api_url }} \ + -e GITHUB_REPO_URL=${{ github.repositoryUrl }} \ + -e GITHUB_REPO_OWNER=${{ github.repository_owner }} \ + -e GITHUB_ACTIONS \ + rjknightmare/fo-ci-test:latest "/bin/fossologyscanner" copyright keyword