Skip to content

Commit

Permalink
Merge pull request #3529 from mercedes-benz/develop
Browse files Browse the repository at this point in the history
Merge `develop` into `master` for release
  • Loading branch information
sven-dmlr authored Oct 18, 2024
2 parents 92ea6c1 + 1fdf712 commit f2188d9
Show file tree
Hide file tree
Showing 156 changed files with 13,279 additions and 1,967 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/_build+publish-pds-solution.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
echo "pds-version '${{ inputs.pds-version }}'"
- name: Checkout git repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871

- name: Docker login to ghcr.io
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/documentation-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ jobs:
fi
- name: Git checkout
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
with:
fetch-tags: true
fetch-depth: 0

- name: Set up JDK 17
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73
with:
java-version: 17
distribution: temurin
Expand All @@ -52,7 +52,7 @@ jobs:
with:
go-version: 1.21.6

- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
- uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8
with:
path: |
~/.cache/go-build
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/github-action-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
working-directory: github-actions/scan
steps:
- name: Checkout
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871

- name: Use Node.js
# We do not define a dedicated node version here, we just use the default environment
Expand Down Expand Up @@ -61,20 +61,20 @@ jobs:
- name: Cache SecHub server download
# Cache V4 release: 13aacd865c20de90d75de3b17ebe84f7a17d57d2
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8
with:
path: ./build/sechub-runtime/server/${{ env.sechub_server_version }}/
key: ${{ runner.os }}-sechub-server-${{ env.sechub_server_version }}

- name: Cache PDS download
# Cache V4 release: 13aacd865c20de90d75de3b17ebe84f7a17d57d2
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8
with:
path: ./build/sechub-runtime/pds/${{ env.pds_version }}/
key: ${{ runner.os }}-pds-${{ env.pds_version }}

- name: Set up JDK 17 (to run servers)
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73
with:
java-version: 17
distribution: temurin
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ on:
- '!github-actions/**'
- '!sechub-doc/**'
- '!sechub-website/**'
- '!sechub-web-ui/**'
- '.github/workflows/gradle.yml'
pull_request:
paths:
Expand All @@ -22,6 +23,7 @@ on:
- '!github-actions/**'
- '!sechub-doc/**'
- '!sechub-website/**'
- '!sechub-web-ui/**'
- '.github/workflows/gradle.yml'

# enable manual triggering of workflow
Expand All @@ -33,10 +35,10 @@ jobs:
if: ${{ github.ref_type != 'tag' }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871

- name: Set up JDK 17
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73
with:
java-version: 17
distribution: temurin
Expand All @@ -51,7 +53,7 @@ jobs:
with:
go-version: 1.21.6

- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
- uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8
with:
path: |
~/.cache/go-build
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-libraries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout master
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
with:
ref: master
# Create temporary local tags, so we build documentation for this tag...
Expand All @@ -28,7 +28,7 @@ jobs:

# Build
- name: Set up JDK 17
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73
with:
java-version: 17
distribution: temurin
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release-client-server-pds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ permissions:
pull-requests: write

env:
ACTIONS_BASE_IMAGE_ALPINE: alpine:3.17
ACTIONS_BASE_IMAGE_ALPINE: alpine:3.20
ACTIONS_BASE_IMAGE_DEBIAN: debian:12-slim
ACTIONS_SECHUB_REGISTRY: ghcr.io/mercedes-benz/sechub
ACTIONS_HELM_REGISTRY: "oci://ghcr.io/mercedes-benz/sechub/helm-charts"
Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:
exit 1
- name: Checkout master
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
with:
ref: master
fetch-tags: true
Expand All @@ -91,7 +91,7 @@ jobs:
# Setup + Caching
# ----------------------
- name: Set up JDK 17
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73
with:
java-version: 17
distribution: temurin
Expand All @@ -107,7 +107,7 @@ jobs:
go-version: 1.21.6

- name: Set up Go caching
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8
id: go-cache
with:
path: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-github-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
exit 1
- name: Checkout master
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
with:
ref: master

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-pds-tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
exit 1
- name: Checkout master
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
with:
ref: master

Expand All @@ -47,7 +47,7 @@ jobs:
# Setup + Caching
# ----------------------
- name: Set up JDK 17
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73
with:
java-version: 17
distribution: temurin
Expand Down
Loading

0 comments on commit f2188d9

Please sign in to comment.