Skip to content

Commit 5e75228

Browse files
authored
Revert "Ruby erlang" (#37)
* Revert "Ruby erlang (#36)" This reverts commit 0531f2a. * Revert partial Signed-off-by: sandhi <sagarwal@progress.com> --------- Signed-off-by: sandhi <sagarwal@progress.com>
1 parent 0531f2a commit 5e75228

File tree

1 file changed

+7
-26
lines changed

1 file changed

+7
-26
lines changed

.github/workflows/sbom.yml

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ on:
8383
type: boolean
8484
default: false
8585
language:
86-
description: 'Primary programming language of the project, used for SBOM enrichment (e.g., "ruby", "go", "python", "erlang", "ruby-erlang")'
86+
description: 'Primary programming language of the project, used for SBOM enrichment (e.g., "ruby", "go", "python")'
8787
required: false
8888
type: string
8989
default: 'ruby'
@@ -234,15 +234,15 @@ jobs:
234234
uses: actions/checkout@v6
235235

236236
- name: Set up Ruby and run bundle install
237-
if: inputs.language == 'ruby' || inputs.language == 'ruby-erlang'
237+
if: inputs.language == 'ruby'
238238
uses: ruby/setup-ruby@v1
239239
with:
240240
ruby-version: '3.4.2'
241241
bundler-cache: false
242242
working-directory: ${{ inputs.ruby-app-directory != '' && inputs.ruby-app-directory || '.' }}
243243

244244
- name: Configure Bundler for private Ruby gems
245-
if: ${{ inputs.run-bundle-install == true && (inputs.language == 'ruby' || inputs.language == 'ruby-erlang') }}
245+
if: ${{ inputs.run-bundle-install == true && inputs.language == 'ruby' }}
246246
run: |
247247
if [ -z "${{ secrets.PRIVATE_ACCESS_KITCHEN_CHEF_ENTERPRISE }}" ]; then
248248
echo "Skipping: PRIVATE_ACCESS_KITCHEN_CHEF_ENTERPRISE secret not configured or not in scope"
@@ -251,28 +251,20 @@ jobs:
251251
bundle config set --local github.com "x-access-token:${{ secrets.PRIVATE_ACCESS_KITCHEN_CHEF_ENTERPRISE }}"
252252
253253
- name: Set up Erlang/OTP and rebar3
254-
if: inputs.language == 'erlang' || inputs.language == 'ruby-erlang'
254+
if: inputs.language == 'erlang'
255255
uses: erlef/setup-beam@v1
256256
with:
257257
otp-version: '25.3.2.16'
258258
rebar3-version: '3.22.0'
259259

260-
- name: Verify rebar3 installation and add to PATH
261-
if: inputs.language == 'erlang' || inputs.language == 'ruby-erlang'
262-
run: |
263-
echo "Checking for rebar3..."
264-
which rebar3 || echo "rebar3 not found in PATH"
265-
rebar3 version || echo "rebar3 command failed"
266-
echo "PATH: $PATH"
267-
268260
- name: Configure git for private Go modules
269261
if : ${{ inputs.go-private-modules != '' }}
270262
env:
271263
GOPRIVATE: ${{ inputs.go-private-modules }}
272264
run: git config --global url."https://${{ secrets.GH_TOKEN }}@github.com/".insteadOf "https://github.com/"
273265

274266
- name: generate Gemfile.lock if needed for Ruby projects
275-
if: ${{ inputs.run-bundle-install == true && (inputs.language == 'ruby' || inputs.language == 'ruby-erlang') }}
267+
if: ${{ inputs.run-bundle-install == true && inputs.language == 'ruby' }}
276268
continue-on-error: true
277269
working-directory: ${{ inputs.ruby-app-directory != '' && inputs.ruby-app-directory || '.' }}
278270
run: |
@@ -281,7 +273,7 @@ jobs:
281273
fi
282274
283275
- name: attach artifact for Gemfile.lock for debugging
284-
if: ${{ inputs.language == 'ruby' || inputs.language == 'ruby-erlang' }}
276+
if: ${{ inputs.language == 'ruby' }}
285277
uses: actions/upload-artifact@v4
286278
continue-on-error: true
287279
with:
@@ -291,20 +283,9 @@ jobs:
291283
- name: Construct BlackDuck detect arguments
292284
id: detect-args
293285
run: |
294-
echo "DEBUG: Language parameter is: ${{ inputs.language }}"
295-
296286
# Start with base arguments (always exclude PIP detector)
297287
DETECT_ARGS="--detect.excluded.detector.types=PIP"
298288
299-
# For Erlang projects, also exclude HEX detector if rebar3 setup fails
300-
# The Signature Scanner will still scan the code
301-
if [[ "${{ inputs.language }}" == "erlang" || "${{ inputs.language }}" == "ruby-erlang" ]]; then
302-
echo "DEBUG: Excluding HEX detector for Erlang project"
303-
DETECT_ARGS="--detect.excluded.detector.types=PIP,HEX"
304-
else
305-
echo "DEBUG: Not an Erlang project, keeping default exclusions"
306-
fi
307-
308289
# Add timeout configurations to prevent FAILURE_TIMEOUT errors
309290
DETECT_ARGS="${DETECT_ARGS} --detect.timeout=1800"
310291
@@ -358,7 +339,7 @@ jobs:
358339
# Persists a baseline to the BlackDuck server so PR scans can diff against it.
359340
- name: BlackDuck SCA Full Scan
360341
id: blackduck-full-scan
361-
if: ${{ inputs.github-event-name != 'pull_request' || inputs.github-event-name == 'workflow_dispatch' }}
342+
if: ${{ inputs.github-event-name != 'pull_request' }}
362343
uses: blackduck-inc/black-duck-security-scan@v2.1.1
363344
continue-on-error: false
364345
env:

0 commit comments

Comments
 (0)