diff --git a/.github/workflows/ci-main-pull-request.yml b/.github/workflows/ci-main-pull-request.yml index f3c03a7..2736c91 100644 --- a/.github/workflows/ci-main-pull-request.yml +++ b/.github/workflows/ci-main-pull-request.yml @@ -463,6 +463,11 @@ jobs: with: go-version: '1.24' check-latest: true + - name: Configure git for private Go modules + if: env.GA_BUILD_LANGUAGE == 'go' + env: + GOPRIVATE: ${{ inputs.go-private-modules }} + run: git config --global url."https://${{ secrets.GH_TOKEN }}@github.com/".insteadOf "https://github.com/" - name: Go linting and security checks if: env.GA_BUILD_LANGUAGE == 'go' run: | @@ -961,4 +966,5 @@ jobs: go-private-modules: ${{ inputs.go-private-modules }} udf1: ${{ inputs.udf1 }} udf2: ${{ inputs.udf2 }} - udf3: ${{ inputs.udf3 }} \ No newline at end of file + udf3: ${{ inputs.udf3 }} + diff --git a/.github/workflows/sbom.yml b/.github/workflows/sbom.yml index 1eef02c..3ba50d1 100644 --- a/.github/workflows/sbom.yml +++ b/.github/workflows/sbom.yml @@ -190,6 +190,11 @@ jobs: - name: Checkout source uses: actions/checkout@v4 + - name: Configure git for private Go modules + env: + GOPRIVATE: ${{ inputs.go-private-modules }} + run: git config --global url."https://${{ secrets.GH_TOKEN }}@github.com/".insteadOf "https://github.com/" + - name: BlackDuck SCA scan id: black-duck-sca-scan run: | @@ -198,7 +203,9 @@ jobs: - name: BlackDuck SBOM scan uses: blackduck-inc/black-duck-security-scan@v2.1.1 + continue-on-error: true # Allow pipeline to continue even with policy violations env: + GOPRIVATE: ${{ inputs.go-private-modules }} DETECT_PROJECT_GROUP_NAME: ${{ inputs.blackduck-project-group-name}} #'Chef-Agents' # , Chef, Chef-Agents, Chef-Automate, Chef-Chef360, Chef-Habitat, Chef-Infrastructure-Server, Chef-Shared-Services DETECT_PROJECT_NAME: ${{ inputs.blackduck-project-name }} DETECT_PROJECT_VERSION_NAME: ${{ inputs.version }} # @@ -225,11 +232,10 @@ jobs: go-version: 'stable' # go-version: 1.24.2 # check-latest: true - # - name: Configure git for private modules - # env: - # GOPRIVATE: github.com/progress-platform-services/* - # use ${{ inputs.go-private-modules }} - # run: git config --global url."https://${{ secrets.GH_TOKEN }}@github.com/".insteadOf "https://github.com/" + - name: Configure git for private modules + env: + GOPRIVATE: ${{ inputs.go-private-modules }} + run: git config --global url."https://${{ secrets.GH_TOKEN }}@github.com/".insteadOf "https://github.com/" - name: create folder run: mkdir -p ./bin @@ -269,11 +275,10 @@ jobs: # go-version: 1.24.2 # check-latest: true - # - name: Configure git for private modules - # env: - # GOPRIVATE: github.com/progress-platform-services/* - # use ${{ inputs.go-private-modules }} - # run: git config --global url."https://${{ secrets.GH_TOKEN }}@github.com/".insteadOf "https://github.com/" + - name: Configure git for private modules + env: + GOPRIVATE: ${{ inputs.go-private-modules }} + run: git config --global url."https://${{ secrets.GH_TOKEN }}@github.com/".insteadOf "https://github.com/" - name: set up license_scout uses: ruby/setup-ruby@v1