Skip to content

Commit 0d8dec3

Browse files
Revert test changes
Signed-off-by: shanmugapriya-tr <shanmugapriya.tiruchengoderamanathan@progress.com>
1 parent ba9779c commit 0d8dec3

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

.github/workflows/ci-main-pull-request.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1317,7 +1317,7 @@ jobs:
13171317

13181318
BlackDuck-Polaris-SAST:
13191319
name: 'BlackDuck Polaris SAST scan'
1320-
if: ${{ inputs.perform-blackduck-polaris && (github.event_name == 'push' || github.event_name == 'pull_request') }} # TODO: revert to 'push' only after ruby-erlang testing is complete
1320+
if: ${{ inputs.perform-blackduck-polaris && github.event_name == 'push' }}
13211321
uses: chef/common-github-actions/.github/workflows/polaris-sast.yml@main
13221322
needs: checkout
13231323
secrets: inherit
@@ -1585,15 +1585,15 @@ jobs:
15851585
name: 'Generating SBOM'
15861586
# Create software bill-of-materials (SBOM) using SPDX format
15871587
if: ${{ inputs.generate-sbom == true }}
1588-
uses: chef/common-github-actions/.github/workflows/sbom.yml@ruby-erlang-fix # TODO: revert to @main after ruby-erlang-fix is merged
1588+
uses: chef/common-github-actions/.github/workflows/sbom.yml@main
15891589
needs: checkout # TODO: fix set-application-version
15901590
secrets: inherit
15911591
with:
15921592
github-event-name: ${{ inputs.github-event-name }}
15931593
github-branch-name: ${{ inputs.github-branch-name }}
15941594
version: ${{ inputs.version }}
15951595
export-github-sbom: ${{ inputs.export-github-sbom }}
1596-
perform-blackduck-sca-scan: ${{ inputs.perform-blackduck-sca-scan && (github.event_name == 'push' || github.event_name == 'pull_request') }} # TODO: revert to 'push' only after ruby-erlang testing is complete
1596+
perform-blackduck-sca-scan: ${{ inputs.perform-blackduck-sca-scan && github.event_name == 'push' }}
15971597
# generate-blackduck-sbom: ${{ inputs.generate-blackduck-sbom }} # obsolete, remove TODO
15981598
blackduck-project-group-name: ${{ inputs.blackduck-project-group-name }}
15991599
blackduck-project-name: ${{ inputs.blackduck-project-name }}

.github/workflows/sbom.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ jobs:
302302
# Run `rebar3 get-deps` in every directory containing a rebar.config to generate
303303
# the lock files that the HEX detector relies on.
304304
# Also calculate the maximum nesting depth of rebar.config files so the detector
305-
# search depth can be set dynamically — works for any repo layout, not just chef-server.
305+
# search depth can be set dynamically — works for any repo layout.
306306
echo "Resolving Erlang/HEX dependencies via rebar3..."
307307
MAX_DEPTH=0
308308
while IFS= read -r cfg; do

0 commit comments

Comments
 (0)