Skip to content

Commit fa8935b

Browse files
authored
Fix SBOM generation on the daily build (#703)
Changes to the way that `conan` is configured in the Memgraph repo need to replicated in the SBOM generation script used for MAGE. Also, deduplicated SBOM generation from daily build and release artifacts workflows. Rename workflow runs for daily/RC builds.
1 parent a49e066 commit fa8935b

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

.github/workflows/build_rc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ on:
2626
description: "Branch to start build from"
2727
default: ''
2828

29+
run-name: Build Release Candidate
30+
2931
jobs:
3032
ParseInputs:
3133
name: Parse Inputs

.github/workflows/daily_build.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ on:
2424
required: false
2525
default: true
2626

27+
run-name: Daily Build and Test
28+
2729
jobs:
2830
DailyBuildVariables:
2931
runs-on: ubuntu-latest
@@ -119,7 +121,7 @@ jobs:
119121
malloc: ${{ matrix.malloc }}
120122
cuda: ${{ matrix.cuda }}
121123
run_tests: true
122-
generate_sbom: ${{ matrix.build_arch == 'amd64' && matrix.build_type == 'Release' }}
124+
generate_sbom: ${{ matrix.build_arch == 'amd64' && matrix.build_type == 'Release' && !matrix.malloc }}
123125
secrets: inherit
124126

125127

.github/workflows/release_artifacts.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,5 +129,5 @@ jobs:
129129
run_smoke_tests: ${{ inputs.run_smoke_tests }}
130130
ref: "${{ inputs.ref }}"
131131
run_tests: ${{ inputs.run_tests }}
132-
generate_sbom: ${{ matrix.build_arch == 'amd64' && matrix.build_type == 'Release' }}
132+
generate_sbom: ${{ matrix.build_arch == 'amd64' && matrix.build_type == 'Release' && !matrix.malloc }}
133133
secrets: inherit

scripts/sbom/memgraph-sbom.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,16 @@ if [[ ! -f "$HOME/.conan2/profiles/default" ]]; then
2626
conan profile detect
2727
fi
2828

29+
conan config install conan_config
30+
2931
# This is not ideal, because it means that we need to have the cache populated with all the dependencies
3032
# or build the dependencies before generating the SBOM.
3133
BUILD_TYPE=Release
3234
MG_TOOLCHAIN_ROOT=/opt/toolchain-v7 conan install \
3335
. \
3436
--build=missing \
35-
-pr:h ./memgraph_template_profile \
36-
-pr:b ./memgraph_build_profile \
37+
-pr:h memgraph_template_profile \
38+
-pr:b memgraph_build_profile \
3739
-s build_type="$BUILD_TYPE"
3840

3941
./tools/sbom/build-sbom.sh

0 commit comments

Comments
 (0)