Skip to content

Commit d31a70d

Browse files
committed
Merge branch 'feature/publish_pypi_packages' of github.com:fairagro/m4.2_advanced_middleware_api into feature/publish_pypi_packages
2 parents 8e7ecac + 91e52f4 commit d31a70d

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

.github/workflows/reusable-check.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
echo "LICENCE_IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_ENV
5151
5252
- name: Run Trivy licence scanner
53-
uses: aquasecurity/trivy-action@57a97c7e7821a5776cebc9bb87c984fa69cba8f1
53+
uses: aquasecurity/trivy-action@ed142fd0673e97e23eac54620cfb913e5ce36c25
5454
with:
5555
image-ref: ${{ env.LICENCE_IMAGE_TAG }}
5656
format: 'table'
@@ -87,15 +87,15 @@ jobs:
8787
echo "SCAN_IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_ENV
8888
8989
- name: Run Trivy Vulnerability Scan (Image)
90-
uses: aquasecurity/trivy-action@57a97c7e7821a5776cebc9bb87c984fa69cba8f1
90+
uses: aquasecurity/trivy-action@ed142fd0673e97e23eac54620cfb913e5ce36c25
9191
with:
9292
image-ref: ${{ env.SCAN_IMAGE_TAG }}
9393
format: 'sarif'
9494
output: 'trivy-image-results.sarif'
9595
severity: 'CRITICAL,HIGH'
9696

9797
- name: Run Trivy Vulnerability Scan (SBOM)
98-
uses: aquasecurity/trivy-action@57a97c7e7821a5776cebc9bb87c984fa69cba8f1
98+
uses: aquasecurity/trivy-action@ed142fd0673e97e23eac54620cfb913e5ce36c25
9999
with:
100100
image-ref: 'sbom-${{ matrix.component }}.spdx.json'
101101
scan-type: 'sbom'

spec/ci-cd/spec.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ pipelines run on GitHub Actions.
6060
build, check, and release jobs in sequence.
6161
- [ ] On a manually triggered pre-release (any branch), run the same pipeline
6262
but push images without creating a GitHub Release entry.
63-
- [ ] Push Docker images to DockerHub and GitHub Container Registry (GHCR) in independant job.
63+
- [ ] Push Docker images to DockerHub and GitHub Container Registry (GHCR) in independent jobs.
6464
- [ ] Run container structure tests and Trivy scans before pushing; do not push
6565
a broken image.
6666
- [ ] Generate an SBOM for every built image.
@@ -114,13 +114,13 @@ pipelines run on GitHub Actions.
114114
- [ ] If a github release is created, include `pip install` commands for each package with exact version information.
115115
- [ ] If a github release is created, provide fallback instructions for local installation from source
116116

117-
<! -- General consideration >
117+
<!-- General considerations -->
118118

119-
- [ ] Each Upload to an external service (dockerhub, ghcr, pypi) must be modelled as a standalone job, independant from other upload jobs.
119+
- [ ] Each upload to an external service (DockerHub, GHCR, PyPI) must be modelled as a standalone job, independent from other upload jobs.
120120
- [ ] If an upload job fails, the release is still considered successful
121-
- [ ] If there a github releases is created, the body must document the usage of successfully uploaded artifacts, as specified above.
122-
- [ ] If an upload job fails and a git release is created, issue a corresponding warning message in the github release.
123-
- [ ] If the credentials for an external service are missing, treat this like an upload failure. Adapt the github release body warning accordingly.
121+
- [ ] If a GitHub release is created, the body must document the usage of successfully uploaded artifacts, as specified above.
122+
- [ ] If an upload job fails and a GitHub release is created, issue a corresponding warning message in the GitHub release.
123+
- [ ] If the credentials for an external service are missing, treat this like an upload failure. Adapt the GitHub release body warning accordingly.
124124

125125
### Edge Cases
126126

0 commit comments

Comments
 (0)