Skip to content

Commit 05d2bd3

Browse files
authored
Support json schema v7.5.0 (#15)
* Update schema.json file to v7.5.0 (#15) * Updated github actions/upload-artifact to v4 (#15) * Add plugin for requirement export (#15) * remove plugin from pyproject.toml (#15) * Add plugin poetry export plugin (#15) * Update allowlist.json for sbom check (#15) * Update upload artifact behaviour (#15) * Updated github actions/upload-artifact to v4 (#15) * Updated github actions/upload-artifact arguments (#15) * changed coverage name (#15) * output directory content (#15) * select latest coverage artifact (#15) * add coverage version output (#15) * fixed variable availability (#15)
1 parent 1a2c2f9 commit 05d2bd3

File tree

4 files changed

+29
-13
lines changed

4 files changed

+29
-13
lines changed

.github/workflows/dependency-check.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ jobs:
2222
with:
2323
python-version: '3.12'
2424
- name: Install poetry
25-
run: pip3 install poetry
25+
run: |
26+
pip3 install poetry
27+
poetry self add poetry-plugin-export
2628
- name: Active Python version
2729
run: |
2830
echo "Active Python version is..."

.github/workflows/test.yml

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,27 +31,36 @@ jobs:
3131
- name: Install dependencies
3232
run: poetry install --without workflow --no-root
3333
- name: Execute Tests and create test coverage report
34-
run: poetry run pytest tests --cov=testguide_report_generator --cov-report=xml:coverage.xml
34+
run: poetry run pytest tests --cov=testguide_report_generator --cov-report=xml:coverage-${{ matrix.py_version }}.xml
3535
- name: Execute Test
3636
run: poetry run pytest tests
3737
- name: Upload test coverage report
38-
uses: actions/upload-artifact@v3
38+
uses: actions/upload-artifact@v4
3939
with:
40-
name: test-coverage-report
41-
path: coverage.xml
40+
name: test-coverage-report-${{ matrix.py_version }}
41+
path: coverage-${{ matrix.py_version }}.xml
4242

4343
publish-coverage:
4444
runs-on: ubuntu-latest
4545
if: ${{ github.event_name == 'pull_request' }}
4646
needs: test
47+
env:
48+
ARTIFACT_FOLDER: test-coverage-report
4749
steps:
4850
- name: Download test coverage report
49-
uses: actions/download-artifact@v3
51+
uses: actions/download-artifact@v4
5052
with:
51-
name: test-coverage-report
53+
path: ${{ env.ARTIFACT_FOLDER }}
54+
pattern: ${{ env.ARTIFACT_FOLDER }}-*
55+
merge-multiple: true
56+
- name: Find latest coverage report
57+
run: |
58+
latest_file=$(ls ${{ env.ARTIFACT_FOLDER }}/ | sort -V | tail -n 1)
59+
echo "LATEST_COVERAGE_FILE=$latest_file" >> $GITHUB_ENV
60+
echo "Latest coverage file version: $latest_file"
5261
- name: Get Cover
5362
uses: orgoro/coverage@v3
5463
with:
55-
coverageFile: coverage.xml
64+
coverageFile: ${{ env.ARTIFACT_FOLDER }}/${{ env.LATEST_COVERAGE_FILE }}
5665
token: ${{ secrets.GITHUB_TOKEN }}
5766
thresholdAll: 0.99

config/license/allowlist.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"allowedLicenses": [
33
{
44
"moduleLicense": "MIT",
5-
"moduleVersion": "24.2.0",
5+
"moduleVersion": "25.3.0",
66
"moduleName": "attrs",
7-
"licenseUrl": "https://github.com/python-attrs/attrs/blob/24.2.0/LICENSE",
7+
"licenseUrl": "https://github.com/python-attrs/attrs/blob/25.3.0/LICENSE",
88
"moduleCopyright": "Copyright (c) 2015 Hynek Schlawack and the attrs contributors",
99
"actualLicense": "MIT",
1010
"violationAllowance": ""

testguide_report_generator/schema/schema.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@
3838
"string",
3939
"null"
4040
],
41-
"maxLength": 6144
41+
"maxLength": 6144,
42+
"$comment": "Simple HTML tags can be used for formatting the description; invalid HTML tags and tags that are not allowed (e.g. <script>) are automatically removed."
4243
},
4344
"ShortNameString": {
4445
"type": "string",
@@ -483,7 +484,11 @@
483484
"IMAGE"
484485
]
485486
}
486-
}
487+
},
488+
"required": [
489+
"path",
490+
"artifactType"
491+
]
487492
}
488493
}
489-
}
494+
}

0 commit comments

Comments
 (0)