Skip to content

Commit

Permalink
Merge branch 'main' into chore/568-policy-management
Browse files Browse the repository at this point in the history
  • Loading branch information
ds-crehm committed Feb 19, 2024
2 parents ee39812 + 49b3b7a commit 080fef2
Show file tree
Hide file tree
Showing 87 changed files with 2,130 additions and 1,292 deletions.
5 changes: 5 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,8 @@ updates:
day: "wednesday"
time: "03:00"

- package-ecosystem: "docker"
directory: "/"
schedule:
interval: "daily"
# open-pull-requests-limit: 5
49 changes: 33 additions & 16 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,20 +64,14 @@ jobs:
strategy:
fail-fast: false
matrix:
language: [ 'java' ]
language: [ 'java', 'javascript' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://git.io/codeql-language-support

steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
Expand All @@ -91,17 +85,24 @@ jobs:
config-file: ./.github/codeql/codeql-config.yml
queries: +security-and-quality,security-extended

- name: Cache maven packages
uses: actions/cache@v3
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
#- name: Autobuild
# uses: github/codeql-action/autobuild@v3
# - name: Autobuild
# uses: github/codeql-action/autobuild@v3

- name: Install frontend dependencies
if: ${{ matrix.language == 'javascript' }}
run: |
cd frontend
npm install
- name: Build frontend
if: ${{ matrix.language == 'javascript' }}
run: |
cd frontend
npm run build:prod
env:
baseHrefPlaceholder: placeholder

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -110,7 +111,23 @@ jobs:
# and modify them (or add more) to build your code if your project
# uses a compiled language

- name: Set up JDK 17
if: ${{ matrix.language == 'java' }}
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'

- name: Cache maven packages
if: ${{ matrix.language == 'java' }}
uses: actions/cache@v3
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2

- name: Build Package
if: ${{ matrix.language == 'java' }}
run: |
mvn clean package -pl tx-models,tx-backend --batch-mode -DskipTests
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ jobs:
run: mvn org.eclipse.dash:license-tool-plugin:license-check -Ddash.summary=DEPENDENCIES_BACKEND

- name: Run install
uses: borales/actions-yarn@v4
uses: borales/actions-yarn@v5
with:
cmd: install
dir: 'frontend'

- name: Generate FE Dependencies file
uses: borales/actions-yarn@v4
uses: borales/actions-yarn@v5
with:
cmd: run dependencies:generate
dir: 'frontend'
Expand All @@ -76,7 +76,7 @@ jobs:
if: ${{ env.were_files_changed }} == 'true'

- name: Create pull request
uses: peter-evans/create-pull-request@v5
uses: peter-evans/create-pull-request@v6
with:
add-paths: |
DEPENDENCIES_BACKEND
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-image-main_backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
env:
DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
if: env.DOCKER_HUB_USER != ''
uses: peter-evans/dockerhub-description@v3
uses: peter-evans/dockerhub-description@v4
with:
username: ${{ secrets.DOCKER_HUB_USER }}
password: ${{ secrets.DOCKER_HUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-image-main_frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ jobs:
tags: ${{ env.DOCKER_HUB_REGISTRY_NAMESPACE }}/${{ env.FRONTEND_IMAGE_DOCKER_HUB }}:${{ github.sha }}

- name: Update Docker Hub description
uses: peter-evans/dockerhub-description@v3
uses: peter-evans/dockerhub-description@v4
env:
DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
if: env.DOCKER_HUB_USER != ''
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docker-image-tag-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
env:
DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
if: env.DOCKER_HUB_USER != ''
uses: peter-evans/dockerhub-description@v3
uses: peter-evans/dockerhub-description@v4
with:
username: ${{ secrets.DOCKER_HUB_USER }}
password: ${{ secrets.DOCKER_HUB_TOKEN }}
Expand All @@ -115,7 +115,7 @@ jobs:
cache: 'maven'

- name: Cache maven packages
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
Expand Down Expand Up @@ -164,7 +164,7 @@ jobs:
env:
DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
if: env.DOCKER_HUB_USER != ''
uses: peter-evans/dockerhub-description@v3
uses: peter-evans/dockerhub-description@v4
with:
username: ${{ secrets.DOCKER_HUB_USER }}
password: ${{ secrets.DOCKER_HUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-tests-xray_frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
node-version: 18.x

- name: Run yarn install
uses: Borales/actions-yarn@v4.2.0
uses: Borales/actions-yarn@v5
with:
cmd: install # will run `yarn install` command

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/eclipse-dash.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
distribution: 'temurin'

- name: Cache maven packages
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
Expand All @@ -82,3 +82,4 @@ jobs:
uses: actions/upload-artifact@v4
with:
path: DEPENDENCIES_BACKEND
overwrite: true
2 changes: 1 addition & 1 deletion .github/workflows/publish-documentation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
node-version: 16

- name: Cache maven packages
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull-request_backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ jobs:
check_name: "Unit Test Results"

- name: Cache SonarCloud packages
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.sonar/cache
key: ${{ runner.os }}-sonar
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
json -I -f frontend/package.json -e "this.version='${{ github.ref_name }}'"
- name: Prepare Helm release
uses: peter-evans/create-pull-request@v5
uses: peter-evans/create-pull-request@v6
with:
commit-message: "chore(release): Prepare release for Helm version ${{ env.HELM_VERSION }}"
branch: chore/prepare-helm-release-${{ env.HELM_VERSION }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonar-scan-backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
cache: 'maven'

- name: Cache SonarCloud packages
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.sonar/cache
key: ${{ runner.os }}-sonar
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/spotbugs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
distribution: 'temurin'

- name: Cache maven packages
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/trivy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
run: docker build -t localhost:5000/traceability-foss:fe_${{ github.sha }} -f ./frontend/Dockerfile .

- name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@0.16.1
uses: aquasecurity/trivy-action@0.17.0
with:
trivyignores: "./.github/workflows/.trivyignore"
image-ref: 'localhost:5000/traceability-foss:fe_${{ github.sha }}'
Expand Down Expand Up @@ -132,7 +132,7 @@ jobs:
ref: ${{needs.prepare-env.outputs.check_sha}}

- name: Run Trivy vulnerability scanner in repo mode
uses: aquasecurity/trivy-action@0.16.1
uses: aquasecurity/trivy-action@0.17.0
with:
trivyignores: "./.github/workflows/.trivyignore"
scan-type: "config"
Expand Down Expand Up @@ -178,7 +178,7 @@ jobs:
tags: localhost:5000/traceability-foss:trivy

- name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@0.16.1
uses: aquasecurity/trivy-action@0.17.0
with:
image-ref: localhost:5000/traceability-foss:trivy
trivyignores: "./.github/workflows/.trivyignore"
Expand Down
60 changes: 0 additions & 60 deletions .github/workflows/veracode_backend.yml

This file was deleted.

58 changes: 0 additions & 58 deletions .github/workflows/veracode_frontend.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/xray-cucumber.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
distribution: 'temurin'

- name: Cache maven packages
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
Expand Down
Loading

0 comments on commit 080fef2

Please sign in to comment.