From 22d82a7ddb089359b1e4e562e4fcf6c9dc587e95 Mon Sep 17 00:00:00 2001 From: Damian Reeves <957246+DamianReeves@users.noreply.github.com> Date: Fri, 4 Oct 2024 10:30:59 -0500 Subject: [PATCH] re-enable sonatype scanning --- .github/workflows/ci-cd.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 8931fe1..21eebf7 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -159,7 +159,7 @@ jobs: ############### SONATYPE SCAN ############### sonatype-scan: - if: false + if: always() needs: [ci] runs-on: ubuntu-latest steps: @@ -188,8 +188,8 @@ jobs: - name: Sonatype Lifecycle SCA Scan uses: sonatype-nexus-community/iq-github-action@main with: - username: ${{ secrets.ORG_MORPHIR_SONATYPE_USER }} - password: ${{ secrets.ORG_MORPHIR_SONATYPE_PASSWORD }} + username: ${{ secrets.SONATYPE_SCANNER_USERNAME }} + password: ${{ secrets.SONATYPE_SCANNER_PASSWORD }} serverUrl: ${{ env.SonatypeUrl }} applicationId: ${{ env.SonatypeAppId }} stage: ${{ env.SonatypeStage }} @@ -199,7 +199,7 @@ jobs: if: always() run: | mkdir reports/ - iqCredentials="${{ secrets.ORG_MORPHIR_SONATYPE_USER }}:${{ secrets.ORG_MORPHIR_SONATYPE_PASSWORD }}" + iqCredentials="${{ secrets.SONATYPE_SCANNER_USERNAME }}:${{ secrets.SONATYPE_SCANNER_PASSWORD }}" echo 'Get internal app ID for public ID: '$SonatypeAppId res=$(curl -u $iqCredentials --location $SonatypeUrl'api/v2/applications?publicId='$SonatypeAppId) IFS='"' read -a array <<< "$res"