Skip to content

Commit 9751e1d

Browse files
authored
Use specific trivy action hash (#461)
* Update github reusable workflow ref * Update Azure DevOps CI pipeline * Increase yaml line length to 200 * Fix typo in git check * Update github reusable workflow
1 parent 707ad22 commit 9751e1d

5 files changed

Lines changed: 10 additions & 13 deletions

File tree

.azure/pipelines/ci.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ stages:
5050
script: >
5151
dotnet test
5252
--configuration $(BuildConfiguration)
53-
-- --filter-query "/[Category=UnitTests]"
53+
-- --filter-query "/[(Category=UnitTests)]"
5454
env:
5555
AllowedOrigins__0: "5207"
5656
Features__IsScalarEnabled: true
@@ -107,10 +107,7 @@ stages:
107107
inputs:
108108
command: "test"
109109
projects: "$(TestProjects)"
110-
arguments: |
111-
--configuration $(BuildConfiguration)
112-
--report-xunit-trx --coverage --coverage-output-format cobertura
113-
-- --filter-query "/[(Category=UnitTests)|(Mode=Readonly)]"
110+
arguments: '--configuration $(BuildConfiguration) --report-xunit-trx --coverage --coverage-output-format cobertura -- --filter-query "/[(Category=UnitTests)|(Mode=Readonly)]"'
114111
env:
115112
AllowedOrigins__0: "5207"
116113
Features__IsScalarEnabled: true

.github/workflows/ci.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ jobs:
3737

3838
markup-lint:
3939
name: Markup
40-
uses: devpro/github-workflow-parts/.github/workflows/reusable-markup-lint.yml@5a5d1cd0a00c94ebec1e096e9086f2b88cc5eb96
40+
uses: devpro/github-workflow-parts/.github/workflows/reusable-markup-lint.yml@c90ba46a93ca90123f57744b47e49c1a73962cea
4141

4242
code-quality:
4343
name: Code
4444
needs: git-check
4545
if: needs.git-check.outputs.app_changed == 'true' || (github.event_name == 'workflow_dispatch' && inputs.run-code-quality)
46-
uses: devpro/github-workflow-parts/.github/workflows/reusable-dotnet-quality.yml@5a5d1cd0a00c94ebec1e096e9086f2b88cc5eb96
46+
uses: devpro/github-workflow-parts/.github/workflows/reusable-dotnet-quality.yml@c90ba46a93ca90123f57744b47e49c1a73962cea
4747
with:
4848
custom-commands: |
4949
./scripts/mongodb-install.sh
@@ -62,7 +62,7 @@ jobs:
6262
sonar-organization: ${{ vars.SONAR_ORG }}
6363
sonar-project-key: ${{ vars.SONAR_PROJECT_KEY }}
6464
sonar-project-name: Keeptrack
65-
workflow-parts-version: 5a5d1cd0a00c94ebec1e096e9086f2b88cc5eb96
65+
workflow-parts-version: c90ba46a93ca90123f57744b47e49c1a73962cea
6666
secrets:
6767
fossa-api-key: ${{ secrets.FOSSA_API_KEY }}
6868
sonar-token: ${{ secrets.SONAR_TOKEN }}
@@ -90,7 +90,7 @@ jobs:
9090
- name: "Web Api"
9191
image-name: "keeptrack-webapi"
9292
image-definition: "src/WebApi/Dockerfile"
93-
uses: devpro/github-workflow-parts/.github/workflows/reusable-container-scan.yml@5a5d1cd0a00c94ebec1e096e9086f2b88cc5eb96
93+
uses: devpro/github-workflow-parts/.github/workflows/reusable-container-scan.yml@c90ba46a93ca90123f57744b47e49c1a73962cea
9494
with:
9595
image-definition: ${{ matrix.image-definition }}
9696
image-name: ${{ matrix.image-name }}

.github/workflows/pkg.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
permissions:
2929
id-token: write
3030
contents: read
31-
uses: devpro/github-workflow-parts/.github/workflows/reusable-container-publication.yml@5a5d1cd0a00c94ebec1e096e9086f2b88cc5eb96
31+
uses: devpro/github-workflow-parts/.github/workflows/reusable-container-publication.yml@c90ba46a93ca90123f57744b47e49c1a73962cea
3232
with:
3333
create-latest: ${{ github.ref_name == 'main' }}
3434
image-definition: ${{ matrix.image-definition }}

.github/workflows/reusable-git-check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
echo "No relevant changes"
7070
echo "app_changed=false" >> $GITHUB_OUTPUT
7171
else
72-
echo "Changes detected in src/test"
72+
echo "Changes detected in $APP_FOLDERS"
7373
git diff --name-status "$BEFORE" ${{ github.sha }} -- $APP_FOLDERS
7474
echo "app_changed=true" >> $GITHUB_OUTPUT
7575
fi
@@ -87,4 +87,4 @@ jobs:
8787
echo "Major.Minor: $MAJOR_MINOR"
8888
echo "version_major_minor=$MAJOR_MINOR" >> "$GITHUB_OUTPUT"
8989
env:
90-
APP_FOLDERS: ${{ inputs.app_folders }}
90+
APP_FOLDERS: ${{ inputs.app-folders }}

.yamllint.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ rules:
66
document-start: disable
77
line-length:
88
level: warning
9-
max: 170
9+
max: 200
1010
truthy: disable
1111
brackets:
1212
max-spaces-inside: 1

0 commit comments

Comments
 (0)