Skip to content

Commit 4fdfbd3

Browse files
authored
Merge pull request #50 from s-prak/ml-depcheck-utility
fix: sbom generation in github release
2 parents 7c0349e + 289f392 commit 4fdfbd3

4 files changed

Lines changed: 6 additions & 4 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ project settings CircleCI. Then include the following in your `.circleci/config.
1616
version: 2.1
1717
setup: true
1818
orbs:
19-
build: mojaloop/build@1.0.74
19+
build: mojaloop/build@1.0.75
2020
workflows:
2121
setup:
2222
jobs:

‎src/examples/build_and_test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ usage:
44
version: 2.1
55
setup: true
66
orbs:
7-
build: mojaloop/build@1.0.74
7+
build: mojaloop/build@1.0.75
88
workflows:
99
setup:
1010
jobs:

‎src/jobs/github_release.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ steps:
4545
name: Generate SBOM
4646
command: |
4747
if ls | grep -Eq '^sbom-v[0-9]+\.[0-9]+\.[0-9]+\.csv$'; then
48-
git pull origin "${CIRCLE_BRANCH}" || echo "Git pull failed"
48+
git fetch origin "$CIRCLE_BRANCH"
49+
git checkout -B "$CIRCLE_BRANCH" "origin/$CIRCLE_BRANCH"
50+
git pull --rebase origin "${CIRCLE_BRANCH}" || echo "Git pull failed"
4951
echo "Found SBOM file"
5052
rm -f sbom-*.csv
5153
# Generate new SBOM

‎src/workflows/build_and_test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
version: 2.1
22
orbs:
3-
build: mojaloop/build@1.0.74
3+
build: mojaloop/build@1.0.75
44
parameters:
55
git_tag:
66
type: string

0 commit comments

Comments
 (0)