Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop into master for release #2788

Merged
merged 26 commits into from
Jan 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
01e704f
Bump actions/upload-artifact from 3 to 4
dependabot[bot] Dec 20, 2023
a410a64
Bump gradle/gradle-build-action from 2.9.0 to 2.11.1
dependabot[bot] Dec 20, 2023
ef93559
gradle call improved #2762
sven-dmlr Dec 20, 2023
1d48e5d
Merge pull request #2768 from mercedes-benz/master
sven-dmlr Dec 20, 2023
039ac8e
Merge branch 'develop' into feature-2762-pds-xray-release-and-build-p…
sven-dmlr Dec 20, 2023
06537a8
correct company name
sven-dmlr Dec 21, 2023
b59dbf5
yaml template coding convention updated #2774
sven-dmlr Dec 21, 2023
fb9cb0c
Merge pull request #2775 from mercedes-benz/feature-2774-update-yaml-…
sven-dmlr Dec 21, 2023
167c71d
Adds IaC / KICS pds-solution (#2770)
haerter-tss Dec 22, 2023
9486eed
Merge branch 'develop' into feature-2762-pds-xray-release-and-build-p…
sven-dmlr Dec 22, 2023
adae0f5
Fixed typo in deployment.yaml (#2777)
haerter-tss Dec 22, 2023
244392f
docker build extended #2762
sven-dmlr Dec 22, 2023
647330d
added pds-xray to image build scripts #2762
sven-dmlr Dec 22, 2023
a96798b
Merge pull request #2778 from mercedes-benz/feature-2762-pds-xray-rel…
sven-dmlr Dec 22, 2023
7fc18b4
script for tag computing added #2779
sven-dmlr Dec 22, 2023
250d7ba
added pds-iac build #2779
sven-dmlr Dec 22, 2023
d417204
make date more readable #2779
sven-dmlr Dec 22, 2023
6a922bf
Merge pull request #2780 from mercedes-benz/feature-2779-pds-iac-prep…
sven-dmlr Dec 22, 2023
4b18210
Merge pull request #2764 from mercedes-benz/dependabot/github_actions…
sven-dmlr Jan 3, 2024
f717cd7
switch from tag checksum for actions/upload-artifact
sven-dmlr Jan 3, 2024
d02a881
Merge pull request #2758 from mercedes-benz/dependabot/github_actions…
sven-dmlr Jan 3, 2024
7173ea1
Bump actions/setup-go from 4.1.0 to 5.0.0
dependabot[bot] Jan 3, 2024
88de820
Bump actions/setup-java from 3.13.0 to 4.0.0
dependabot[bot] Jan 3, 2024
57be3c5
Merge pull request #2747 from mercedes-benz/dependabot/github_actions…
sven-dmlr Jan 3, 2024
55204f5
Merge pull request #2728 from mercedes-benz/dependabot/github_actions…
sven-dmlr Jan 3, 2024
ff2f6d1
New system tests for Kics and GitLeaks #2771 (#2783)
Jeeppler Jan 4, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/_build+publish-pds-solution.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ jobs:
export SCANCODE_VERSION
export SPDX_TOOL_VERSION
export TERN_VERSION
export XRAY_WRAPPER_VERSION
export DOCKER_REGISTRY="${ACTIONS_SECHUB_REGISTRY}/pds-${PDS_SOLUTION}"
export VERSION_TAG=`./09-compute-image-tag.sh ${PDS_VERSION}`
export BASE_IMAGE="${ACTIONS_SECHUB_REGISTRY}/pds-base:${PDS_VERSION}"
Expand Down
24 changes: 18 additions & 6 deletions .github/workflows/build+publish-all-pds-solutions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,6 @@ jobs:
pds-solution: checkmarx
pds-version: ${{ inputs.pds-version }}

call_build_pds-loc:
uses: mercedes-benz/sechub/.github/workflows/_build+publish-pds-solution.yml@develop
with:
pds-solution: loc
pds-version: ${{ inputs.pds-version }}

# 2023-06-12: findsecuritybugs deactivated due to upstream fix is not yet released
# call_build_pds-findsecuritybugs:
# uses: mercedes-benz/sechub/.github/workflows/_build+publish-pds-solution.yml@develop
Expand All @@ -45,6 +39,18 @@ jobs:
pds-solution: gosec
pds-version: ${{ inputs.pds-version }}

call_build_pds-iac:
uses: mercedes-benz/sechub/.github/workflows/_build+publish-pds-solution.yml@develop
with:
pds-solution: iac
pds-version: ${{ inputs.pds-version }}

call_build_pds-loc:
uses: mercedes-benz/sechub/.github/workflows/_build+publish-pds-solution.yml@develop
with:
pds-solution: loc
pds-version: ${{ inputs.pds-version }}

call_build_pds-multi:
uses: mercedes-benz/sechub/.github/workflows/_build+publish-pds-solution.yml@develop
with:
Expand Down Expand Up @@ -74,3 +80,9 @@ jobs:
with:
pds-solution: tern
pds-version: ${{ inputs.pds-version }}

call_build_pds-xray:
uses: mercedes-benz/sechub/.github/workflows/_build+publish-pds-solution.yml@develop
with:
pds-solution: xray
pds-version: ${{ inputs.pds-version }}
10 changes: 5 additions & 5 deletions .github/workflows/documentation-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,18 +37,18 @@ jobs:
fetch-depth: 0

- name: Set up JDK 17
uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93
with:
java-version: 17
distribution: temurin

- name: Set up Gradle
uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a
uses: gradle/gradle-build-action@982da8e78c05368c70dac0351bb82647a9e9a5d2
with:
cache-read-only: false

- name: Set up Go
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491
with:
go-version: 1.20.4

Expand All @@ -74,14 +74,14 @@ jobs:
# Upload documentation
# -----------------------------------------
- name: Archive documentation HTML
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
with:
name: sechub-docs-html
path: sechub-doc/build/docs/final-html/
retention-days: 14

- name: Archive documentation PDF
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
with:
name: sechub-docs-pdf
path: sechub-doc/build/docs/asciidoc/*.pdf
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,18 @@ jobs:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11

- name: Set up JDK 17
uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93
with:
java-version: 17
distribution: temurin

- name: Set up Gradle
uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a
uses: gradle/gradle-build-action@982da8e78c05368c70dac0351bb82647a9e9a5d2
with:
cache-read-only: false

- name: Set up Go
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491
with:
go-version: 1.20.4

Expand Down Expand Up @@ -72,60 +72,60 @@ jobs:
# -----------------------------------------
- name: Archive combined test report
if: always()
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
with:
name: combined-sechub-testreport
path: build/reports/combined-report
retention-days: 14

- name: Archive sechub server artifacts
if: always()
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
with:
name: sechub-server
path: sechub-server/build/libs
retention-days: 14

- name: Archive pds server artifacts
if: always()
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
with:
name: sechub-pds
path: sechub-pds/build/libs

- name: Archive pds tools artifacts
if: always()
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
with:
name: sechub-pds-tools
path: sechub-pds-tools/build/libs

- name: Archive developer tools artifacts
if: always()
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
with:
name: sechub-developertools
path: sechub-developertools/build/libs
retention-days: 14

- name: Archive sechub client artifacts
if: always()
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
with:
name: sechub-client
path: sechub-cli/build/go
retention-days: 14

- name: Archive sechub integration test report artifacts
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
with:
name: sechub-integrationtest-test-reports
path: sechub-integrationtest/build/sechub-test-reports
retention-days: 14

- name: Archive openAPI3 JSON files
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
with:
name: sechub-api-spec
path: sechub-doc/build/api-spec/
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/publish-libraries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ jobs:

# Build
- name: Set up JDK 17
uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93
with:
java-version: 17
distribution: temurin

- name: Set up Gradle
uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a
uses: gradle/gradle-build-action@982da8e78c05368c70dac0351bb82647a9e9a5d2
with:
cache-read-only: false

Expand All @@ -55,14 +55,14 @@ jobs:
# -----------------------------------------
- name: Archive combined test report
if: always()
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
with:
name: combined-sechub-testreport
path: build/reports/combined-report
retention-days: 14
- name: Archive GIT status
if: always()
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
with:
name: git-status.txt
path: build/reports/git-status.txt
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/release-client-server-pds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,18 +88,18 @@ jobs:
# Setup + Caching
# ----------------------
- name: Set up JDK 17
uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93
with:
java-version: 17
distribution: temurin

- name: Set up Gradle
uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a
uses: gradle/gradle-build-action@982da8e78c05368c70dac0351bb82647a9e9a5d2
with:
cache-read-only: false

- name: Set up Go
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491
with:
go-version: 1.20.4

Expand Down Expand Up @@ -200,46 +200,46 @@ jobs:
# -----------------------------------------
- name: Archive combined test report
if: always()
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
with:
name: combined-sechub-testreport
path: build/reports/combined-report
retention-days: 14

- name: Archive GIT status
if: always()
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
with:
name: git-status.txt
path: build/reports/git-status.txt
retention-days: 14

- name: Archive sechub server artifacts
if: always()
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
with:
name: sechub-server
path: sechub-server/build/libs
retention-days: 14

- name: Archive pds server artifacts
if: always()
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
with:
name: sechub-pds
path: sechub-pds/build/libs

- name: Archive developer tools artifacts
if: always()
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
with:
name: sechub-developertools
path: sechub-developertools/build/libs
retention-days: 14

- name: Archive sechub client artifacts
if: always()
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
with:
name: sechub-client
path: sechub-cli/build/go
Expand All @@ -258,21 +258,21 @@ jobs:
# Upload documentation
# -----------------------------------------
- name: Archive documentation HTML
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
with:
name: sechub-docs-html
path: sechub-doc/build/docs/final-html/
retention-days: 14

- name: Archive documentation PDF
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
with:
name: sechub-docs-pdf
path: sechub-doc/build/docs/asciidoc/*.pdf
retention-days: 14

- name: Archive openAPI3 JSON files
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
with:
name: sechub-api-spec
path: sechub-doc/build/api-spec/
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release-pds-tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ jobs:
# Setup + Caching
# ----------------------
- name: Set up JDK 17
uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93
with:
java-version: 17
distribution: temurin

- name: Set up Gradle
uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a
uses: gradle/gradle-build-action@982da8e78c05368c70dac0351bb82647a9e9a5d2
with:
cache-read-only: false

Expand Down Expand Up @@ -111,15 +111,15 @@ jobs:

- name: Archive GIT status
if: always()
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
with:
name: git-status.txt
path: build/reports/git-status.txt
retention-days: 14

- name: Archive PDS-Tools cli artifact
if: always()
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
with:
name: sechub-pds-tools
path: sechub-pds-tools/build/libs
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release-wrapper-checkmarx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ jobs:
# Setup + Caching
# ----------------------
- name: Set up JDK 17
uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93
with:
java-version: 17
distribution: temurin

- name: Set up Gradle
uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a
uses: gradle/gradle-build-action@982da8e78c05368c70dac0351bb82647a9e9a5d2
with:
cache-read-only: false

Expand Down Expand Up @@ -99,15 +99,15 @@ jobs:

- name: Archive GIT status
if: always()
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
with:
name: git-status.txt
path: build/reports/git-status.txt
retention-days: 14

- name: Archive Checkmarx Wrapper libs directory
if: always()
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
with:
name: sechub-wrapper-checkmarx
path: sechub-wrapper-checkmarx/build/libs
Expand Down
Loading
Loading