Skip to content

Commit

Permalink
Merge pull request #67 from COPRS/develop
Browse files Browse the repository at this point in the history
Update S1 L1/2 to version 3.9.0
  • Loading branch information
w-jka authored Jan 24, 2025
2 parents 6eef2f3 + b2cfeb6 commit 8cd633c
Show file tree
Hide file tree
Showing 14 changed files with 112 additions and 75 deletions.
2 changes: 1 addition & 1 deletion .github/actions/build-container/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ runs:
severity-cutoff: critical

- name: Upload Anchore scan json report
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: vulnerabilities-${{ inputs.IMAGE_NAME_SUFFIX }}
path: ${{ steps.scan.outputs.vulnerabilities }}
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/build-docker/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ runs:
severity-cutoff: critical

- name: Upload Anchore scan json report
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: vulnerabilities-${{ inputs.COMPONENT }}
path: ${{ steps.scan.outputs.vulnerabilities }}
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/build-ipf-container/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ runs:

# No more json report file
- name: Upload Anchore scan json report
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: vulnerabilities-${{ inputs.IMAGE_NAME }}
path: ${{ steps.scan.outputs.json }}
Expand Down
6 changes: 3 additions & 3 deletions .github/actions/generate-report/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ runs:
using: "composite"
steps:
- name: Download json report from build jobs
uses: actions/download-artifact@v2.1.1
uses: actions/download-artifact@v4
with:
name: vulnerabilities-${{ inputs.COMPONENT }}

Expand All @@ -42,9 +42,9 @@ runs:
args: vulnerabilities.html vulnerabilities.pdf

- name: Upload Anchore scan reports
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: vulnerabilities-${{ inputs.COMPONENT }}
name: vulnerabilities-${{ inputs.COMPONENT }}-converted
path: |
vulnerabilities.csv
vulnerabilities.pdf
6 changes: 3 additions & 3 deletions .github/workflows/build-acqsimulator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ jobs:
sarif_file: ${{ steps.scan.outputs.sarif }}

- name: Upload Anchore scan json report
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: vulnerabilities-acqsimulator
path: ${{ steps.scan.outputs.vulnerabilities }}
Expand All @@ -133,7 +133,7 @@ jobs:

steps:
- name: Download json report from build jobs
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: vulnerabilities-acqsimulator

Expand All @@ -150,7 +150,7 @@ jobs:
args: vulnerabilities.html vulnerabilities.pdf

- name: Upload Anchore scan reports
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: vulnerabilities-acqsimulator
path: |
Expand Down
36 changes: 20 additions & 16 deletions .github/workflows/build-ipf-s1-l1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,24 +46,26 @@ env:
COMMIT_ID: ${{ github.sha }}

jobs:
gg-scan:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v2
with:
fetch-depth: 0
- name: GitGuardian scan
uses: GitGuardian/ggshield-action@master
env:
GITHUB_PUSH_BEFORE_SHA: ${{ github.event.before }}
GITHUB_PUSH_BASE_SHA: ${{ github.event.base }}
GITHUB_PULL_BASE_SHA: ${{ github.event.pull_request.base.sha }}
GITHUB_DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
GITGUARDIAN_API_KEY: ${{ secrets.GITGUARDIAN_API_KEY }}
# GitGuardian Token is not valid anymore
# gg-scan:
# runs-on: ubuntu-latest
# steps:
# - name: Checkout repository
# uses: actions/checkout@v2
# with:
# fetch-depth: 0
# - name: GitGuardian scan
# uses: GitGuardian/ggshield-action@master
# env:
# GITHUB_PUSH_BEFORE_SHA: ${{ github.event.before }}
# GITHUB_PUSH_BASE_SHA: ${{ github.event.base }}
# GITHUB_PULL_BASE_SHA: ${{ github.event.pull_request.base.sha }}
# GITHUB_DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
# GITGUARDIAN_API_KEY: ${{ secrets.GITGUARDIAN_API_KEY }}

build-ipf-s1-l1:
needs: [gg-scan]
# GitGuardian Token is not valid anymore
#needs: [gg-scan]
runs-on: ubuntu-latest
# Just build when being a tag or explicitely asked for using #IPF
if: startsWith(github.ref, 'refs/tags') || contains(github.event.head_commit.message, '#IPF')
Expand All @@ -87,3 +89,5 @@ jobs:
- uses: ./.github/actions/generate-report
with:
COMPONENT: ${{ env.IMAGE_NAME }}


36 changes: 20 additions & 16 deletions .github/workflows/build-ipf-s1-l2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,24 +46,26 @@ env:
COMMIT_ID: ${{ github.sha }}

jobs:
gg-scan:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v2
with:
fetch-depth: 0
- name: GitGuardian scan
uses: GitGuardian/ggshield-action@master
env:
GITHUB_PUSH_BEFORE_SHA: ${{ github.event.before }}
GITHUB_PUSH_BASE_SHA: ${{ github.event.base }}
GITHUB_PULL_BASE_SHA: ${{ github.event.pull_request.base.sha }}
GITHUB_DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
GITGUARDIAN_API_KEY: ${{ secrets.GITGUARDIAN_API_KEY }}
# GitGuardian Token is not valid anymore
# gg-scan:
# runs-on: ubuntu-latest
# steps:
# - name: Checkout repository
# uses: actions/checkout@v2
# with:
# fetch-depth: 0
# - name: GitGuardian scan
# uses: GitGuardian/ggshield-action@master
# env:
# GITHUB_PUSH_BEFORE_SHA: ${{ github.event.before }}
# GITHUB_PUSH_BASE_SHA: ${{ github.event.base }}
# GITHUB_PULL_BASE_SHA: ${{ github.event.pull_request.base.sha }}
# GITHUB_DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
# GITGUARDIAN_API_KEY: ${{ secrets.GITGUARDIAN_API_KEY }}

build-ipf-s1-l2:
needs: [gg-scan]
# GitGuardian Token is not valid anymore
# needs: [gg-scan]
runs-on: ubuntu-latest
# Just build when being a tag or explicitely asked for using #IPF
if: startsWith(github.ref, 'refs/tags') || contains(github.event.head_commit.message, '#IPF')
Expand All @@ -87,3 +89,5 @@ jobs:
- uses: ./.github/actions/generate-report
with:
COMPONENT: ${{ env.IMAGE_NAME }}


55 changes: 32 additions & 23 deletions .github/workflows/build-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,24 +34,26 @@ env:
ARTIFACTORY_EXAMPLES_PROJECT: rs-core-examples

jobs:
gg-scan:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v2
with:
fetch-depth: 0
- name: GitGuardian scan
uses: GitGuardian/ggshield-action@master
env:
GITHUB_PUSH_BEFORE_SHA: ${{ github.event.before }}
GITHUB_PUSH_BASE_SHA: ${{ github.event.base }}
GITHUB_PULL_BASE_SHA: ${{ github.event.pull_request.base.sha }}
GITHUB_DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
GITGUARDIAN_API_KEY: ${{ secrets.GITGUARDIAN_API_KEY }}
# Git Guardian Token is invalid
# gg-scan:
# runs-on: ubuntu-latest
# steps:
# - name: Checkout repository
# uses: actions/checkout@v2
# with:
# fetch-depth: 0
# - name: GitGuardian scan
# uses: GitGuardian/ggshield-action@master
# env:
# GITHUB_PUSH_BEFORE_SHA: ${{ github.event.before }}
# GITHUB_PUSH_BASE_SHA: ${{ github.event.base }}
# GITHUB_PULL_BASE_SHA: ${{ github.event.pull_request.base.sha }}
# GITHUB_DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
# GITGUARDIAN_API_KEY: ${{ secrets.GITGUARDIAN_API_KEY }}

build-base:
needs: [gg-scan]
# Git Guardian Token is invalid
#needs: [gg-scan]
runs-on: ubuntu-latest
steps:
- name: Checkout repository
Expand All @@ -67,7 +69,8 @@ jobs:
COMPONENT: base

deploy-parent-poms:
needs: [gg-scan]
# Git Guardian Token is invalid
#needs: [gg-scan]
runs-on: ubuntu-latest
strategy:
matrix:
Expand All @@ -83,7 +86,8 @@ jobs:
WERUM_ARTIFACTORY_PASSWORD: ${{ secrets.WERUM_ARTIFACTORY_PASSWORD }}

build-libs:
needs: [gg-scan]
# Git Guardian Token is invalid
#needs: [gg-scan]
runs-on: ubuntu-latest
strategy:
max-parallel: 1
Expand Down Expand Up @@ -120,7 +124,8 @@ jobs:
COMPONENT: ${{ matrix.component }}

build-core-components:
needs: [gg-scan]
# Git Guardian Token is invalid
#needs: [gg-scan]
runs-on: ubuntu-latest
strategy:
fail-fast: false
Expand All @@ -134,7 +139,8 @@ jobs:
WERUM_ARTIFACTORY_PASSWORD: ${{ secrets.WERUM_ARTIFACTORY_PASSWORD }}

build-core-examples:
needs: [gg-scan]
# Git Guardian Token is invalid
#needs: [gg-scan]
runs-on: ubuntu-latest
strategy:
fail-fast: false
Expand All @@ -148,7 +154,8 @@ jobs:
WERUM_ARTIFACTORY_PASSWORD: ${{ secrets.WERUM_ARTIFACTORY_PASSWORD }}

helm-charts:
needs: [gg-scan]
# Git Guardian Token is invalid
#needs: [gg-scan]
runs-on: ubuntu-latest
strategy:
fail-fast: false
Expand All @@ -165,7 +172,8 @@ jobs:
WERUM_ARTIFACTORY_PASSWORD: ${{ secrets.WERUM_ARTIFACTORY_PASSWORD }}

helm-mocks:
needs: [gg-scan]
# Git Guardian Token is invalid
#needs: [gg-scan]
runs-on: ubuntu-latest
strategy:
fail-fast: false
Expand All @@ -182,7 +190,8 @@ jobs:
WERUM_ARTIFACTORY_PASSWORD: ${{ secrets.WERUM_ARTIFACTORY_PASSWORD }}

build-containers:
needs: [gg-scan, build-base]
# Git Guardian Token is invalid
needs: [build-base]
runs-on: ubuntu-latest
strategy:
fail-fast: false
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-s1-container.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ jobs:
sarif_file: ${{ steps.scan.outputs.sarif }}

- name: Upload Anchore scan json report
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: vulnerabilities-s1-ipfsimulator
path: ${{ steps.scan.outputs.vulnerabilities }}
Expand All @@ -120,7 +120,7 @@ jobs:

steps:
- name: Download json report from build jobs
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: vulnerabilities-s1-ipfsimulator

Expand All @@ -137,7 +137,7 @@ jobs:
args: vulnerabilities.html vulnerabilities.pdf

- name: Upload Anchore scan reports
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: vulnerabilities-s1-ipfsimulator
path: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-s1-ipf-simulator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ jobs:
sarif_file: ${{ steps.scan.outputs.sarif }}

- name: Upload Anchore scan json report
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: vulnerabilities-s1-ipfsimulator
path: ${{ steps.scan.outputs.vulnerabilities }}
Expand All @@ -131,7 +131,7 @@ jobs:

steps:
- name: Download json report from build jobs
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: vulnerabilities-s1-ipfsimulator

Expand All @@ -148,7 +148,7 @@ jobs:
args: vulnerabilities.html vulnerabilities.pdf

- name: Upload Anchore scan reports
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: vulnerabilities-s1-ipfsimulator
path: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-s3-ipf-simulator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ jobs:
sarif_file: ${{ steps.scan.outputs.sarif }}

- name: Upload Anchore scan json report
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: vulnerabilities-s3-ipfsimulator
path: ${{ steps.scan.outputs.vulnerabilities }}
Expand All @@ -131,7 +131,7 @@ jobs:

steps:
- name: Download json report from build jobs
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: vulnerabilities-s3-ipfsimulator

Expand All @@ -148,7 +148,7 @@ jobs:
args: vulnerabilities.html vulnerabilities.pdf

- name: Upload Anchore scan reports
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: vulnerabilities-s1-ipfsimulator
path: |
Expand Down
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,20 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.17.0] - 2025-01-24

### Added

- N/A

### Changed

- RS-XX: Update from S1 L1/2 from 3.8.0 to 3.9.0

### Removed

- N/A

## [1.15.0] - 2023-11-28

### Added
Expand Down
Loading

0 comments on commit 8cd633c

Please sign in to comment.