Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/test SBOM analyser build #181

Merged
merged 42 commits into from
Mar 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
f1a5f29
Updated build script
CharlotteGayton Jun 15, 2023
3236a4e
Add the 'compilePhaseAzureCredentials' secret so the build job has an…
JamesDawson Jun 15, 2023
2f6d7cf
Updated workflow
CharlotteGayton Jun 16, 2023
37e33c5
Merge branch 'feature/test-sbom-analyser-build' of https://github.com…
CharlotteGayton Jun 16, 2023
5fdb7e8
Updated workflow
CharlotteGayton Jun 16, 2023
1856ee8
Added Az.Storage to build script
CharlotteGayton Jun 16, 2023
cb5387a
Updated workflow to generate new Github token
CharlotteGayton Jun 16, 2023
04536ba
Added missing quotes
CharlotteGayton Jun 16, 2023
40bda92
Testing custom github token
CharlotteGayton Jun 16, 2023
578d556
Forgotten comma
CharlotteGayton Jun 16, 2023
f88017e
Merge branch 'main' into feature/test-sbom-analyser-build
CharlotteGayton Jun 26, 2023
828b475
Added use of custom github token
CharlotteGayton Jun 26, 2023
9bba9c0
Added publish phase env
CharlotteGayton Jun 26, 2023
bef0c8b
Added missing comma
CharlotteGayton Jun 26, 2023
de56445
Updated with fail build if there are rejected components
CharlotteGayton Jun 26, 2023
8fc73fa
Updated error message
CharlotteGayton Jun 26, 2023
81a3880
Message wasn't printing
CharlotteGayton Jun 26, 2023
bcf6bfc
New error message trial
CharlotteGayton Jun 27, 2023
7512461
Add line breaks to error message
CharlotteGayton Jun 27, 2023
66275a7
New error message
CharlotteGayton Jun 27, 2023
d0de702
Fix issues
CharlotteGayton Jun 27, 2023
857e645
Missing 's'
CharlotteGayton Jun 27, 2023
5b828ff
Added updates for unknown components
CharlotteGayton Jun 27, 2023
74f0bcc
Write warning instead of Throw error for unknown components
CharlotteGayton Jun 27, 2023
438e4c9
Fix breakages
CharlotteGayton Jun 27, 2023
0276f9e
Brackets around function
CharlotteGayton Jun 27, 2023
5902801
Change order and message of error and warning messages
CharlotteGayton Jun 27, 2023
6fce28f
Final Changes
CharlotteGayton Jun 27, 2023
dcc3009
Fix errors
CharlotteGayton Jun 27, 2023
3d6211b
Changes
CharlotteGayton Aug 1, 2023
d4a6500
Remove accidentally committed files
JamesDawson Aug 2, 2023
1a8cd99
Test latest SBOM-related build changes
JamesDawson Aug 2, 2023
4f2ba2e
Merge branch 'main' into feature/test-sbom-analyser-build
JamesDawson Aug 2, 2023
bbd60ca
Remove customisations now part of the scripted build
JamesDawson Aug 2, 2023
dd6eed2
Add secret to enable the SBOM Analysis functionality
JamesDawson Aug 2, 2023
72708a4
Switch to released version of build module
JamesDawson Aug 2, 2023
fd60ecd
Merge branch 'main' into feature/test-sbom-analyser-build
HowardvanRooijen Nov 25, 2023
589d2cd
Fix-up build
JamesDawson Nov 25, 2023
be54f5d
Remove comma
JamesDawson Nov 25, 2023
6bbcca7
Add secret to enable SBOM analysis build feature
JamesDawson Nov 25, 2023
1d0debc
Merge branch 'main' into feature/test-sbom-analyser-build
JamesDawson Mar 21, 2024
2b221a1
Bump build module version
JamesDawson Mar 21, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ jobs:
BUILDVAR_NuGetPublishSource: "${{ startsWith(github.ref, 'refs/tags/') && 'https://api.nuget.org/v3/index.json' || 'https://nuget.pkg.github.com/endjin/index.json' }}"
secretsYaml: |
NUGET_API_KEY: "${{ startsWith(github.ref, 'refs/tags/') && secrets.ENDJIN_NUGET_APIKEY || secrets.ENDJIN_GITHUB_PUBLISHER_PAT }}"
SBOM_ANALYSIS_RELEASE_READER_PAT: "${{ secrets.ENDJIN_GITHUB_READER_PAT }}"

build:
needs: prepareConfig
Expand All @@ -61,4 +62,5 @@ jobs:
publishPhaseEnv: ${{ needs.prepareConfig.outputs.RESOLVED_ENV_VARS }}
secrets:
compilePhaseAzureCredentials: ${{ secrets.ENDJIN_PROD_ACR_READER_CREDENTIALS }}
compilePhaseSecrets: ${{ needs.prepareConfig.outputs.RESOLVED_SECRETS }}
publishPhaseSecrets: ${{ needs.prepareConfig.outputs.RESOLVED_SECRETS }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -401,3 +401,4 @@ FodyWeavers.xsd
*.sbom*
_codeCoverage/
_packages/
.analysis/
8 changes: 5 additions & 3 deletions build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,10 @@ param (
[string] $BuildModulePath,

[Parameter()]
[version] $BuildModuleVersion = "1.5.4",
[version] $BuildModuleVersion = "1.5.5",

[Parameter()]
[string] $BuildModulePackageVersion = $BuildModuleVersion,

[Parameter()]
[version] $InvokeBuildModuleVersion = "5.10.3"
Expand Down Expand Up @@ -105,7 +108,7 @@ if ($MyInvocation.ScriptName -notlike '*Invoke-Build.ps1') {
if (!($BuildModulePath)) {
if (!(Get-Module -ListAvailable Endjin.RecommendedPractices.Build | ? { $_.Version -eq $BuildModuleVersion })) {
Write-Information "Installing 'Endjin.RecommendedPractices.Build' module..."
Install-Module Endjin.RecommendedPractices.Build -RequiredVersion $BuildModuleVersion -Scope CurrentUser -Force -Repository PSGallery
Install-Module Endjin.RecommendedPractices.Build -RequiredVersion $BuildModulePackageVersion -Scope CurrentUser -Force -Repository PSGallery -AllowPrerelease:$($BuildModulePackageVersion -match "-")
}
$BuildModulePath = "Endjin.RecommendedPractices.Build"
}
Expand Down Expand Up @@ -169,4 +172,3 @@ task PostPackage {}
task PrePublish {}
task PostPublish {}
task RunLast {}

Loading