Skip to content

Commit 9a054a8

Browse files
authored
Merge branch 'dev' into docs/fix-backticks-and-image-path
2 parents 7d9a019 + 8869737 commit 9a054a8

54 files changed

Lines changed: 1676 additions & 1221 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/labeler.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,8 @@ lint:
6565
- changed-files:
6666
- any-glob-to-any-file:
6767
- ruff.toml
68+
69+
gha:
70+
- changed-files:
71+
- any-glob-to-any-file:
72+
- .github/workflows

.github/release-drafter.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ categories:
4343
label: 'localization'
4444
- title: '🔧 Improved code quality with linters'
4545
label: 'lint'
46+
- title: '⚙️ Improvemets of GitHub Actions'
47+
label: 'gha'
4648
- title: '🧰 Maintenance'
4749
collapse-after: 3
4850
labels:

.github/workflows/integration-tests.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,12 @@ name: Integration tests
22

33
on:
44
workflow_call:
5-
inputs:
6-
auditlog_type:
7-
type: string
8-
default: "django-auditlog"
95

106
jobs:
117
integration_tests:
128
# run tests with docker compose
139
name: User Interface Tests
1410
runs-on: ubuntu-latest
15-
env:
16-
AUDITLOG_TYPE: ${{ inputs.auditlog_type }}
1711
strategy:
1812
matrix:
1913
test-case: [

.github/workflows/rest-framework-tests.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,11 @@ on:
66
platform:
77
type: string
88
default: "linux/amd64"
9-
auditlog_type:
10-
type: string
11-
default: "django-auditlog"
129

1310
jobs:
1411
unit_tests:
1512
name: Rest Framework Unit Tests
1613
runs-on: ${{ inputs.platform == 'linux/arm64' && 'ubuntu-24.04-arm' || 'ubuntu-latest' }}
17-
env:
18-
AUDITLOG_TYPE: ${{ inputs.auditlog_type }}
1914

2015
strategy:
2116
matrix:

.github/workflows/test-helm-chart.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,17 @@ jobs:
2626
with:
2727
python-version: 3.14 # Renovate helper is not needed here
2828

29-
- name: Configure Helm repos
30-
run: |-
31-
helm dependency list ./helm/defectdojo
32-
helm dependency update ./helm/defectdojo
29+
# Running update is not needed for listing - it just triggers errors as soon as one of the subcharts is not in the latest version (`helm dep. update` change content of the chart)
30+
# As soon as we would like to run more extensive tests, this can be reenabled, but this will need to be placed after "ct list-changed" command
31+
# - name: Configure Helm repos
32+
# run: |-
33+
# helm dependency list ./helm/defectdojo
34+
# helm dependency update ./helm/defectdojo
3335

3436
- name: Set up chart-testing
3537
uses: helm/chart-testing-action@6ec842c01de15ebb84c8627d2744a0c2f2755c9f # v2.8.0
3638
with:
39+
version: 3.14.0 # renovate: datasource=github-releases depName=helm/chart-testing
3740
yamale_version: 6.1.0 # renovate: datasource=pypi depName=yamale versioning=semver
3841
yamllint_version: 1.37.1 # renovate: datasource=pypi depName=yamllint versioning=semver
3942

@@ -52,6 +55,8 @@ jobs:
5255
changed=$(ct list-changed --config ct.yaml --target-branch ${{ env.ct-branch}})
5356
if [[ -n "$changed" ]]; then
5457
echo "changed=true" >> $GITHUB_OUTPUT
58+
echo "Content changed:"
59+
echo "$changed" | sed 's/^/ /'
5560
fi
5661
5762
# run version check only if not dev as in dev we have a `x.y.z-dev` version
@@ -114,12 +119,12 @@ jobs:
114119
- name: Update values in HELM chart
115120
if: startsWith(github.head_ref, 'renovate/') || startsWith(github.head_ref, 'dependabot/')
116121
run: |
117-
title=${{ github.event.pull_request.title }}
122+
title='${{ github.event.pull_request.title }}'
118123
chars='{}:[],&*#?|-<>=!%@'
119124
for c in $(echo "$chars" | grep -o .); do
120125
title="${title//"$c"/_}"
121126
done
122-
yq -i '.annotations."artifacthub.io/changes" += "- kind: changed\n description: $title\n"' helm/defectdojo/Chart.yaml
127+
yq -i '.annotations."artifacthub.io/changes" += "- kind: changed\n description: '$title'\n"' helm/defectdojo/Chart.yaml
123128
git add helm/defectdojo/Chart.yaml
124129
git commit -m "ci: update Chart annotations from PR #${{ github.event.pull_request.number }}" || echo "No changes to commit"
125130

.github/workflows/unit-tests.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,26 +25,18 @@ jobs:
2525
strategy:
2626
matrix:
2727
platform: ['linux/amd64', 'linux/arm64']
28-
auditlog_type: ['django-auditlog', 'django-pghistory']
2928
fail-fast: false
3029
needs: build-docker-containers
3130
uses: ./.github/workflows/rest-framework-tests.yml
3231
secrets: inherit
3332
with:
3433
platform: ${{ matrix.platform}}
35-
auditlog_type: ${{ matrix.auditlog_type }}
3634

3735
# only run integration tests for linux/amd64 (default)
3836
test-user-interface:
3937
needs: build-docker-containers
4038
uses: ./.github/workflows/integration-tests.yml
4139
secrets: inherit
42-
strategy:
43-
matrix:
44-
auditlog_type: ['django-auditlog', 'django-pghistory']
45-
fail-fast: false
46-
with:
47-
auditlog_type: ${{ matrix.auditlog_type }}
4840

4941
# only run k8s tests for linux/amd64 (default)
5042
test-k8s:
244 KB
Loading
149 KB
Loading
21.3 KB
Loading
91.4 KB
Loading

0 commit comments

Comments
 (0)