Merge pull request #2110 from mercedes-benz/develop

merge develop into master for release
mercedes-benz · Mar 24, 2023 · b613c09 · b613c09
2 parents 378f06e + 014ab49
commit b613c09
Show file tree

Hide file tree

Showing 8 changed files with 290 additions and 64 deletions.
diff --git a/.github/workflows/create-pds-tools-release.yml b/.github/workflows/create-pds-tools-release.yml
@@ -163,6 +163,20 @@ jobs:
           asset_name: sechub-pds-tools-cli-${{ github.event.inputs.pds-tools-version }}.jar.sha256sum
           asset_content_type: text/plain
 
+      # -----------------------------------------
+      # Create release issue
+      # -----------------------------------------
+      - name: Create PDS-Tool ${{ github.event.inputs.pds-tools-version }} release issue
+        uses: dacbd/create-issue-action@main
+        with:
+          token: ${{ github.token }}
+          title: Release PDS-Tool ${{ github.event.inputs.pds-tools-version }}
+          body: |
+            See [Milestone ${{github.event.inputs.pds-tools-milestone-number}}]( https://github.com/mercedes-benz/sechub/milestone/${{github.event.inputs.pds-tools-milestone-number}}?closed=1) for details.
+
+            Please close this issue after the release.
+          milestone: ${{ github.event.inputs.server-milestone-number }}
+
       # -----------------------------------------
       # Create a pull request for merging back `master` into `develop`
       # -----------------------------------------

diff --git a/.github/workflows/create-releases.yml b/.github/workflows/create-releases.yml
@@ -290,6 +290,7 @@ jobs:
       # -----------------------------------------
       - name: Assert releasable
         run: ./gradlew assertReleaseable
+
       # ******************************************
       # Now let's create a new SERVER release
       # when server version is set
@@ -311,16 +312,19 @@ jobs:
             For more details please look at [Milestone ${{github.event.inputs.server-milestone-number}}]( https://github.com/mercedes-benz/sechub/milestone/${{github.event.inputs.server-milestone-number}}?closed=1)
           draft: true
           prerelease: false
+
       - name: Create sha256 checksum file for SecHub server jar
         if: github.event.inputs.server-version != ''
         run: |
           cd sechub-server/build/libs
           sha256sum sechub-server-${{ github.event.inputs.server-version }}.jar > sechub-server-${{ github.event.inputs.server-version }}.jar.sha256sum
+
       - name: Create sha256 checksum file for SecHub developertools jar
         if: github.event.inputs.server-version != ''
         run: |
           cd sechub-developertools/build/libs/
           sha256sum sechub-developertools-${{ github.event.inputs.server-version }}.jar > sechub-developertools-${{ github.event.inputs.server-version }}.jar.sha256sum
+
       - name: Upload Server release asset sechub-server-${{ github.event.inputs.server-version }}.jar
         if: github.event.inputs.server-version != ''
         uses: actions/upload-release-asset@v1
@@ -331,6 +335,7 @@ jobs:
           asset_path: sechub-server/build/libs/sechub-server-${{ github.event.inputs.server-version }}.jar
           asset_name: sechub-server-${{ github.event.inputs.server-version }}.jar
           asset_content_type: application/zip
+
       - name: Upload Server release asset sechub-server-${{ github.event.inputs.server-version }}.jar.sha256sum
         if: github.event.inputs.server-version != ''
         uses: actions/upload-release-asset@v1
@@ -341,6 +346,7 @@ jobs:
           asset_path: sechub-server/build/libs/sechub-server-${{ github.event.inputs.server-version }}.jar.sha256sum
           asset_name: sechub-server-${{ github.event.inputs.server-version }}.jar.sha256sum
           asset_content_type: text/plain
+
       - name: Upload SecHub release asset sechub-developertools-${{ github.event.inputs.server-version }}.jar
         if: github.event.inputs.server-version != ''
         uses: actions/upload-release-asset@v1
@@ -351,6 +357,7 @@ jobs:
           asset_path: sechub-developertools/build/libs/sechub-developertools-${{ github.event.inputs.server-version }}.jar
           asset_name: sechub-developertools-${{ github.event.inputs.server-version }}.jar
           asset_content_type: application/zip
+
       - name: Upload Server release asset sechub-developertools-${{ github.event.inputs.server-version }}.jar.sha256sum
         if: github.event.inputs.server-version != ''
         uses: actions/upload-release-asset@v1
@@ -361,10 +368,10 @@ jobs:
           asset_path: sechub-developertools/build/libs/sechub-developertools-${{ github.event.inputs.server-version }}.jar.sha256sum
           asset_name: sechub-developertools-${{ github.event.inputs.server-version }}.jar.sha256sum
           asset_content_type: text/plain
+
       # -----------------------------------------
       # Server documentation:
       # -----------------------------------------
-      # sechub-architecture.pdf
       - name: Upload sechub-architecture.pdf release asset
         if: github.event.inputs.server-version != ''
         uses: actions/upload-release-asset@v1
@@ -375,7 +382,7 @@ jobs:
           asset_path: ./sechub-doc/build/docs/asciidoc/sechub-architecture.pdf
           asset_name: sechub-architecture-${{ github.event.inputs.server-version }}.pdf
           asset_content_type: application/pdf
-      # sechub-operations.pdf
+
       - name: Upload sechub-operations.pdf release asset
         if: github.event.inputs.server-version != ''
         uses: actions/upload-release-asset@v1
@@ -386,7 +393,7 @@ jobs:
           asset_path: ./sechub-doc/build/docs/asciidoc/sechub-operations.pdf
           asset_name: sechub-operations-${{ github.event.inputs.server-version }}.pdf
           asset_content_type: application/pdf
-      # sechub-developer-quickstart-guide.pdf
+
       - name: Upload sechub-developer-quickstart-guide.pdf release asset
         if: github.event.inputs.server-version != ''
         uses: actions/upload-release-asset@v1
@@ -398,7 +405,6 @@ jobs:
           asset_name: sechub-developer-quickstart-guide-${{ github.event.inputs.server-version }}.pdf
           asset_content_type: application/pdf
 
-      # sechub-restapi.pdf
       - name: Upload sechub-restapi.pdf release asset
         if: github.event.inputs.server-version != ''
         uses: actions/upload-release-asset@v1
@@ -454,12 +460,14 @@ jobs:
             For more details please look at [Milestone ${{github.event.inputs.client-milestone-number}}]( https://github.com/mercedes-benz/sechub/milestone/${{github.event.inputs.client-milestone-number}}?closed=1)
           draft: true
           prerelease: false
+
       - name: Create client release asset sechub-cli-${{ github.event.inputs.client-version }}.zip
         if: github.event.inputs.client-version != ''
         run: |
           cd sechub-cli/build/go
           zip -r sechub-cli.zip platform
           sha256sum sechub-cli.zip > sechub-cli.zip.sha256
+
       - name: Upload Client release asset sechub-cli-${{ github.event.inputs.client-version }}.zip
         if: github.event.inputs.client-version != ''
         uses: actions/upload-release-asset@v1
@@ -470,6 +478,7 @@ jobs:
           asset_path: ./sechub-cli/build/go/sechub-cli.zip
           asset_name: sechub-cli-${{ github.event.inputs.client-version }}.zip
           asset_content_type: application/zip
+
       - name: Upload Client release asset sechub-cli-${{ github.event.inputs.client-version }}.zip.sha256
         if: github.event.inputs.client-version != ''
         uses: actions/upload-release-asset@v1
@@ -480,7 +489,7 @@ jobs:
           asset_path: ./sechub-cli/build/go/sechub-cli.zip.sha256
           asset_name: sechub-cli-${{ github.event.inputs.client-version }}.zip.sha256
           asset_content_type: text/plain
-      # sechub-client.pdf
+
       - name: Upload sechub-client.pdf release asset
         id: upload-sechub-doc-client-release-asset
         if: github.event.inputs.client-version != ''
@@ -493,18 +502,6 @@ jobs:
           asset_name: sechub-client-${{ github.event.inputs.client-version }}.pdf
           asset_content_type: application/pdf
 
-      - name: Create Client ${{ github.event.inputs.client-version }} release issue
-        if: github.event.inputs.client-version != ''
-        uses: dacbd/create-issue-action@main
-        with:
-          token: ${{ github.token }}
-          title: Release Client ${{ github.event.inputs.client-version }}
-          body: |
-            See [Milestone ${{github.event.inputs.client-milestone-number}}]( https://github.com/mercedes-benz/sechub/milestone/${{github.event.inputs.client-milestone-number}}?closed=1) for details.
-
-            Please close this issue after the release.
-          milestone: ${{ github.event.inputs.client-milestone-number }}
-
       # ******************************************
       # Now let's create a new PDS release
       # when pds version is set
@@ -526,11 +523,13 @@ jobs:
             For more details please look at [Milestone ${{github.event.inputs.pds-milestone-number}}]( https://github.com/mercedes-benz/sechub/milestone/${{github.event.inputs.pds-milestone-number}}?closed=1)
           draft: true
           prerelease: false
+
       - name: Create sha256 checksum file for PDS jar
         if: github.event.inputs.pds-version != ''
         run: |
           cd sechub-pds/build/libs/
           sha256sum sechub-pds-${{ github.event.inputs.pds-version }}.jar > sechub-pds-${{ github.event.inputs.pds-version }}.jar.sha256sum
+
       - name: Upload PDS release asset sechub-pds-${{ github.event.inputs.pds-version }}.jar
         if: github.event.inputs.pds-version != ''
         uses: actions/upload-release-asset@v1
@@ -541,6 +540,7 @@ jobs:
           asset_path: sechub-pds/build/libs/sechub-pds-${{ github.event.inputs.pds-version }}.jar
           asset_name: sechub-pds-${{ github.event.inputs.pds-version }}.jar
           asset_content_type: application/zip
+
       - name: Upload PDS release asset sechub-pds-${{ github.event.inputs.pds-version }}.jar.sha256sum
         if: github.event.inputs.pds-version != ''
         uses: actions/upload-release-asset@v1
@@ -552,33 +552,6 @@ jobs:
           asset_name: sechub-pds-${{ github.event.inputs.pds-version }}.jar.sha256sum
           asset_content_type: text/plain
 
-      # sechub-wrapper-checkmarx
-      - name: Create files and sha256 checksum for PDS Checkmarx wrapper
-        if: github.event.inputs.pds-version != ''
-        run: |
-          cd sechub-wrapper-checkmarx/build/libs/
-          sha256sum sechub-wrapper-checkmarx-${{ github.event.inputs.pds-version }}.jar > sechub-wrapper-checkmarx-${{ github.event.inputs.pds-version }}.jar.sha256sum
-      - name: Upload PDS release asset sechub-wrapper-checkmarx-${{ github.event.inputs.pds-version }}.jar
-        if: github.event.inputs.pds-version != ''
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_pds_release.outputs.upload_url }}
-          asset_path: sechub-wrapper-checkmarx/build/libs/sechub-wrapper-checkmarx-${{ github.event.inputs.pds-version }}.jar
-          asset_name: sechub-wrapper-checkmarx-${{ github.event.inputs.pds-version }}.jar
-          asset_content_type: application/zip
-      - name: Upload PDS release asset sechub-wrapper-checkmarx-${{ github.event.inputs.pds-version }}.jar.sha256sum
-        if: github.event.inputs.pds-version != ''
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_pds_release.outputs.upload_url }}
-          asset_path: sechub-wrapper-checkmarx/build/libs/sechub-wrapper-checkmarx-${{ github.event.inputs.pds-version }}.jar.sha256sum
-          asset_name: sechub-wrapper-checkmarx-${{ github.event.inputs.pds-version }}.jar.sha256sum
-          asset_content_type: text/plain
-
       # sechub-product-delegation-server.pdf
       - name: Upload PDS release asset sechub-product-delegation-server-${{ github.event.inputs.pds-version }}.pdf
         if: github.event.inputs.pds-version != ''
@@ -603,6 +576,21 @@ jobs:
             Please close this issue after the release.
           milestone: ${{ github.event.inputs.pds-milestone-number }}
 
+      # -----------------------------------------
+      # Create release issue
+      # -----------------------------------------
+      - name: Create Client ${{ github.event.inputs.client-version }} release issue
+        if: github.event.inputs.client-version != ''
+        uses: dacbd/create-issue-action@main
+        with:
+          token: ${{ github.token }}
+          title: Release Client ${{ github.event.inputs.client-version }}
+          body: |
+            See [Milestone ${{github.event.inputs.client-milestone-number}}]( https://github.com/mercedes-benz/sechub/milestone/${{github.event.inputs.client-milestone-number}}?closed=1) for details.
+
+            Please close this issue after the release.
+          milestone: ${{ github.event.inputs.client-milestone-number }}
+
       # -----------------------------------------
       # Create a pull request for merging back `master` into `develop`
       # -----------------------------------------