diff --git a/.github/workflows/publish-libraries.yml b/.github/workflows/publish-libraries.yml deleted file mode 100644 index 620ca4a50..000000000 --- a/.github/workflows/publish-libraries.yml +++ /dev/null @@ -1,104 +0,0 @@ -# SPDX-License-Identifier: MIT -name: Publish libraries - -on: - workflow_dispatch: - inputs: - libraries-version: - description: Libraries Version (e.g. 1.0.0) - required: true - milestone-number: - description: Milestone number for release(s) - default: 20 - required: true -jobs: - release-version: - name: Build, publish and release - runs-on: ubuntu-latest - steps: - - name: Checkout master - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - with: - ref: master - # Create temporary local tags, so we build documentation for this tag... - # The final tag on git server side will be automatically done by the release step at the end - # automatically. - - name: "Temporary tag libraries version: v${{ github.event.inputs.libraries-version }}-libraries" - run: git tag v${{ github.event.inputs.libraries-version }}-libraries - - # Build - - name: Set up JDK 17 - uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b - with: - java-version: 17 - distribution: temurin - - - name: Set up Gradle - uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 - with: - cache-read-only: false - - - name: Build - run: ./gradlew clean build -x :sechub-integrationtest:test -x :sechub-cli:build - - - name: Create combined test report - if: always() - run: ./gradlew createCombinedTestReport - - # To identifiy parts not in git history and leading to "-dirty-$commitId" markers - - name: Inspect GIT status - if: always() - run: git status > build/reports/git-status.txt - - # ----------------------------------------- - # Upload Build Artifacts (only test output) - # ----------------------------------------- - - name: Archive combined test report - if: always() - uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 - with: - name: combined-sechub-testreport - path: build/reports/combined-report - retention-days: 14 - - name: Archive GIT status - if: always() - uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 - with: - name: git-status.txt - path: build/reports/git-status.txt - retention-days: 14 - - # ----------------------------------------- - # Assert releaseable, so no dirty flags on releases - # even when all artifact creation parts are done! - # ----------------------------------------- - - name: Assert releasable - run: ./gradlew assertReleaseable - - # ************************************************** - # Now let's create + publish a new LIBRARIES release - # ************************************************** - - # Publish to github packages - - name: Publish - run: ./gradlew publish - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token - - # Create release - - name: Create libraries release - id: create_libraries_release - uses: actions/create-release@0cb9c9b65d5d1901c1f53e5e66eaf4afd303e70e - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token - with: - tag_name: v${{ github.event.inputs.libraries-version }}-libraries - commitish: master - release_name: Libraries Version ${{ github.event.inputs.libraries-version }} - body: | - New library artifacts can be found at https://github.com/mercedes-benz/sechub/packages - - For details about changes look at [Milestone ${{github.event.inputs.milestone-number}}]( https://github.com/mercedes-benz/sechub/milestone/${{github.event.inputs.milestone-number}}?closed=1) - draft: false - prerelease: false - diff --git a/.github/workflows/release-client-server-pds.yml b/.github/workflows/release-client-server-pds.yml index e6d124232..4fcb550ba 100644 --- a/.github/workflows/release-client-server-pds.yml +++ b/.github/workflows/release-client-server-pds.yml @@ -323,135 +323,53 @@ jobs: # ****************************************** # S E R V E R release # ****************************************** - - name: Create server release ${{ inputs.server-version }} - id: create_server_release - if: inputs.server-version != '' - uses: actions/create-release@0cb9c9b65d5d1901c1f53e5e66eaf4afd303e70e - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token - with: - tag_name: v${{ inputs.server-version }}-server - commitish: master - release_name: Server Version ${{ inputs.server-version }} - body: | - Changes in this Release - - Some minor changes on SecHub server implementation - - For more details please look at [Milestone ${{inputs.server-milestone-number}}]( https://github.com/mercedes-benz/sechub/milestone/${{inputs.server-milestone-number}}?closed=1) - draft: true - prerelease: false - - - name: Create sha256 checksum file for SecHub server jar + - name: Prepare server ${{ inputs.server-version }} release artifacts if: inputs.server-version != '' + shell: bash run: | - cd sechub-server/build/libs - sha256sum sechub-server-${{ inputs.server-version }}.jar > sechub-server-${{ inputs.server-version }}.jar.sha256sum + mkdir server-release-artifacts + # Collect release artifacts + cp sechub-server/build/libs/sechub-server-${{ inputs.server-version }}.jar \ + sechub-developertools/build/libs/sechub-developer-admin-ui-${{ inputs.server-version }}.jar \ + server-release-artifacts/ + cp sechub-doc/build/docs/asciidoc/sechub-architecture.pdf \ + server-release-artifacts/sechub-architecture-${{ inputs.server-version }}.pdf + cp sechub-doc/build/docs/asciidoc/sechub-developer-quickstart-guide.pdf \ + server-release-artifacts/sechub-developer-quickstart-guide-${{ inputs.server-version }}.pdf + cp sechub-doc/build/docs/asciidoc/sechub-operations.pdf \ + server-release-artifacts/sechub-operations-${{ inputs.server-version }}.pdf + cp sechub-doc/build/docs/asciidoc/sechub-restapi.pdf \ + server-release-artifacts/sechub-restapi-${{ inputs.server-version }}.pdf + cp sechub-doc/build/api-spec/openapi3.json \ + server-release-artifacts/sechub-openapi3-${{ inputs.server-version }}.json + # Compute sha256 checksums for .jar files + cd server-release-artifacts + for i in *.jar ; do + sha256sum "$i" > "$i.sha256sum" + done - - name: Create sha256 checksum files for SecHub developer tools jars + - name: Create server ${{ inputs.server-version }} release draft if: inputs.server-version != '' + shell: bash run: | - cd sechub-developertools/build/libs/ - sha256sum sechub-developer-admin-ui-${{ inputs.server-version }}.jar > sechub-developer-admin-ui-${{ inputs.server-version }}.jar.sha256sum - - - name: Upload Server release asset sechub-server-${{ inputs.server-version }}.jar - if: inputs.server-version != '' - uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_server_release.outputs.upload_url }} - asset_path: sechub-server/build/libs/sechub-server-${{ inputs.server-version }}.jar - asset_name: sechub-server-${{ inputs.server-version }}.jar - asset_content_type: application/zip - - - name: Upload Server release asset sechub-server-${{ inputs.server-version }}.jar.sha256sum - if: inputs.server-version != '' - uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_server_release.outputs.upload_url }} - asset_path: sechub-server/build/libs/sechub-server-${{ inputs.server-version }}.jar.sha256sum - asset_name: sechub-server-${{ inputs.server-version }}.jar.sha256sum - asset_content_type: text/plain - - - name: Upload SecHub release asset sechub-developer-admin-ui-${{ inputs.server-version }}.jar - if: inputs.server-version != '' - uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_server_release.outputs.upload_url }} - asset_path: sechub-developertools/build/libs/sechub-developer-admin-ui-${{ inputs.server-version }}.jar - asset_name: sechub-developer-admin-ui-${{ inputs.server-version }}.jar - asset_content_type: application/zip - - - name: Upload Server release asset sechub-developer-admin-ui-${{ inputs.server-version }}.jar.sha256sum - if: inputs.server-version != '' - uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_server_release.outputs.upload_url }} - asset_path: sechub-developertools/build/libs/sechub-developer-admin-ui-${{ inputs.server-version }}.jar.sha256sum - asset_name: sechub-developer-admin-ui-${{ inputs.server-version }}.jar.sha256sum - asset_content_type: text/plain - - # Server documentation: - - name: Upload sechub-architecture.pdf release asset - if: inputs.server-version != '' - uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_server_release.outputs.upload_url }} - asset_path: ./sechub-doc/build/docs/asciidoc/sechub-architecture.pdf - asset_name: sechub-architecture-${{ inputs.server-version }}.pdf - asset_content_type: application/pdf - - - name: Upload sechub-operations.pdf release asset - if: inputs.server-version != '' - uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_server_release.outputs.upload_url }} - asset_path: ./sechub-doc/build/docs/asciidoc/sechub-operations.pdf - asset_name: sechub-operations-${{ inputs.server-version }}.pdf - asset_content_type: application/pdf - - - name: Upload sechub-developer-quickstart-guide.pdf release asset - if: inputs.server-version != '' - uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_server_release.outputs.upload_url }} - asset_path: ./sechub-doc/build/docs/asciidoc/sechub-developer-quickstart-guide.pdf - asset_name: sechub-developer-quickstart-guide-${{ inputs.server-version }}.pdf - asset_content_type: application/pdf - - - name: Upload sechub-restapi.pdf release asset - if: inputs.server-version != '' - uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_server_release.outputs.upload_url }} - asset_path: ./sechub-doc/build/docs/asciidoc/sechub-restapi.pdf - asset_name: sechub-restapi-${{ inputs.server-version }}.pdf - asset_content_type: application/pdf - - - name: Upload sechub-openapi3.json release asset - if: inputs.server-version != '' - uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 + assets=() + echo "# Adding Server binaries and docs" + cd server-release-artifacts/ + for asset in * ; do + filename=`basename "$asset"` + echo "# - $filename" + assets+=("-a" "${asset}#${filename}") + done + # Define release data + tag_name="v${{ inputs.server-version }}-server" + release_title="Server Version ${{ inputs.server-version }}" + release_message="Changes in this Release + - Some minor changes on SecHub server implementation" + release_footer="For more details please look at [Milestone ${{inputs.server-milestone-number}}]( https://github.com/mercedes-benz/sechub/milestone/${{inputs.server-milestone-number}}?closed=1)" + echo "# Create release draft \"$release_title\" on github" + hub release create --draft "${assets[@]}" -m "$release_title" -m "$release_message" -m "$release_footer" "$tag_name" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_server_release.outputs.upload_url }} - asset_path: ./sechub-doc/build/api-spec/openapi3.json - asset_name: sechub-openapi3-${{ inputs.server-version }}.json - asset_content_type: text/plain - name: Create Server ${{ inputs.server-version }} release issue if: inputs.server-version != '' @@ -546,63 +464,44 @@ jobs: # ****************************************** # P D S release # ****************************************** - - name: Create PDS release ${{ inputs.pds-version }} - id: create_pds_release - if: inputs.pds-version != '' - uses: actions/create-release@0cb9c9b65d5d1901c1f53e5e66eaf4afd303e70e - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token - with: - tag_name: v${{ inputs.pds-version }}-pds - commitish: master - release_name: PDS Version ${{ inputs.pds-version }} - body: | - Changes in this Release - - Some minor changes on PDS server implementation - - For more details please look at [Milestone ${{inputs.pds-milestone-number}}]( https://github.com/mercedes-benz/sechub/milestone/${{inputs.pds-milestone-number}}?closed=1) - draft: true - prerelease: false - - - name: Create sha256 checksum file for PDS jar + - name: Prepare PDS ${{ inputs.pds-version }} release artifacts if: inputs.pds-version != '' + shell: bash run: | - cd sechub-pds/build/libs/ - sha256sum sechub-pds-${{ inputs.pds-version }}.jar > sechub-pds-${{ inputs.pds-version }}.jar.sha256sum - - - name: Upload PDS release asset sechub-pds-${{ inputs.pds-version }}.jar - if: inputs.pds-version != '' - uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_pds_release.outputs.upload_url }} - asset_path: sechub-pds/build/libs/sechub-pds-${{ inputs.pds-version }}.jar - asset_name: sechub-pds-${{ inputs.pds-version }}.jar - asset_content_type: application/zip - - - name: Upload PDS release asset sechub-pds-${{ inputs.pds-version }}.jar.sha256sum - if: inputs.pds-version != '' - uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_pds_release.outputs.upload_url }} - asset_path: sechub-pds/build/libs/sechub-pds-${{ inputs.pds-version }}.jar.sha256sum - asset_name: sechub-pds-${{ inputs.pds-version }}.jar.sha256sum - asset_content_type: text/plain + mkdir pds-release-artifacts + # Collect release artifacts + cp sechub-pds/build/libs/sechub-pds-${{ inputs.pds-version }}.jar \ + pds-release-artifacts/ + cp sechub-doc/build/docs/asciidoc/sechub-product-delegation-server.pdf \ + pds-release-artifacts/sechub-product-delegation-server-${{ inputs.pds-version }}.pdf + # Compute sha256 checksums for .jar files + cd pds-release-artifacts + for i in *.jar ; do + sha256sum "$i" > "$i.sha256sum" + done - # sechub-product-delegation-server.pdf - - name: Upload PDS release asset sechub-product-delegation-server-${{ inputs.pds-version }}.pdf + - name: Create PDS ${{ inputs.pds-version }} release draft if: inputs.pds-version != '' - uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 + shell: bash + run: | + assets=() + echo "# Adding PDS binaries and docs" + cd pds-release-artifacts/ + for asset in * ; do + filename=`basename "$asset"` + echo "# - $filename" + assets+=("-a" "${asset}#${filename}") + done + # Define release data + tag_name="v${{ inputs.pds-version }}-pds" + release_title="PDS Version ${{ inputs.pds-version }}" + release_message="Changes in this Release + - Some minor changes on PDS server implementation" + release_footer="For more details please look at [Milestone ${{inputs.pds-milestone-number}}]( https://github.com/mercedes-benz/sechub/milestone/${{inputs.pds-milestone-number}}?closed=1)" + echo "# Create release draft \"$release_title\" on github" + hub release create --draft "${assets[@]}" -m "$release_title" -m "$release_message" -m "$release_footer" "$tag_name" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_pds_release.outputs.upload_url }} - asset_path: ./sechub-doc/build/docs/asciidoc/sechub-product-delegation-server.pdf - asset_name: /sechub-product-delegation-server-${{ inputs.pds-version }}.pdf - asset_content_type: application/pdf - name: Create PDS ${{ inputs.pds-version }} release issue if: inputs.pds-version != '' diff --git a/.github/workflows/release-github-action.yml b/.github/workflows/release-github-action.yml index 779506d6d..ec283598a 100644 --- a/.github/workflows/release-github-action.yml +++ b/.github/workflows/release-github-action.yml @@ -48,6 +48,9 @@ jobs: # ---------------------- # Setup + Caching # ---------------------- + - name: Install required packages + run: sudo apt-get -y install hub + - name: Use Node.js uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af with: @@ -153,22 +156,19 @@ jobs: # ----------------------------------------- # Create draft release # ----------------------------------------- - - name: Create Github Action release - id: create_ghaction_release - uses: actions/create-release@0cb9c9b65d5d1901c1f53e5e66eaf4afd303e70e + - name: Create Github Action ${{ inputs.ghaction-version }} release draft + shell: bash + run: | + # Define release data + tag_name="v${{ inputs.ghaction-version }}-gha" + release_title="Github Action Version ${{ inputs.ghaction-version }}" + release_message="Changes in this Release + - Some minor changes on Github Action implementation" + release_footer="For more details please look at [Milestone ${{inputs.ghaction-milestone-number}}]( https://github.com/mercedes-benz/sechub/milestone/${{inputs.ghaction-milestone-number}}?closed=1)" + echo "# Create release draft \"$release_title\" on github" + hub release create --draft -m "$release_title" -m "$release_message" -m "$release_footer" "$tag_name" env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token - with: - tag_name: v${{ inputs.ghaction-version }}-gha - commitish: master - release_name: Github Action Version ${{ inputs.ghaction-version }} - body: | - Changes in this Release - - Some minor changes on Github Action implementation - - For more details please look at [Milestone ${{inputs.ghaction-milestone-number}}]( https://github.com/mercedes-benz/sechub/milestone/${{inputs.ghaction-milestone-number}}?closed=1) - draft: true - prerelease: false + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # ----------------------------------------- # Create a pull request for merging back `master` into `develop` diff --git a/.github/workflows/release-pds-tools.yml b/.github/workflows/release-pds-tools.yml index 6e3f89c9d..de73a3b75 100644 --- a/.github/workflows/release-pds-tools.yml +++ b/.github/workflows/release-pds-tools.yml @@ -39,13 +39,15 @@ jobs: # Create temporary local tags, so we build documentation for this tag... # The final tag on git server side will be done by the release when the draft is saved as "real" release # automatically. - - name: "Temporary tag server version: v${{ inputs.pds-tools-version }}-pds-tools - if defined" - if: inputs.pds-tools-version != '' + - name: "Temporary tag server version: v${{ inputs.pds-tools-version }}-pds-tools" run: git tag v${{ inputs.pds-tools-version }}-pds-tools # ---------------------- # Setup + Caching # ---------------------- + - name: Install required packages + run: sudo apt-get -y install hub + - name: Set up JDK 17 uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b with: @@ -91,7 +93,7 @@ jobs: echo "Pull Request URL - ${{ steps.pr_spdx_headers.outputs.pull-request-url }}" # ---------------------- - # SecHub PDS-Tools + # Build SecHub PDS-Tools # ---------------------- - name: Build Server, DAUI and generate OpenAPI file run: ./gradlew ensureLocalhostCertificate build generateOpenapi buildDeveloperAdminUI -x :sechub-integrationtest:test -x :sechub-cli:build @@ -135,51 +137,43 @@ jobs: git status ./gradlew assertReleaseable - - name: Create PDS-Tools release - id: create_pds_tools_release - if: inputs.pds-tools-version != '' - uses: actions/create-release@0cb9c9b65d5d1901c1f53e5e66eaf4afd303e70e - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token - with: - tag_name: v${{ inputs.pds-tools-version }}-pds-tools - commitish: master - release_name: PDS-Tools Version ${{ inputs.pds-tools-version }} - body: | - Changes in this Release - - Some minor changes on PDS-Tools implementation - - For more details please look at [Milestone ${{inputs.pds-tools-milestone-number}}]( https://github.com/mercedes-benz/sechub/milestone/${{inputs.pds-tools-milestone-number}}?closed=1) - draft: true - prerelease: false - - - name: Create sha256 checksum file for PDS-Tools cli jar - if: inputs.pds-tools-version != '' + # ****************************************** + # P D S - T o o l s release + # ****************************************** + - name: Prepare PDS-Tools ${{ inputs.pds-tools-version }} release artifacts + shell: bash run: | - cd sechub-pds-tools/build/libs - sha256sum sechub-pds-tools-cli-${{ inputs.pds-tools-version }}.jar > sechub-pds-tools-cli-${{ inputs.pds-tools-version }}.jar.sha256sum - - - name: Upload PDS-Tools release asset sechub-pds-tools-cli-${{ inputs.pds-tools-version }}.jar - if: inputs.pds-tools-version != '' - uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_pds_tools_release.outputs.upload_url }} - asset_path: sechub-pds-tools/build/libs/sechub-pds-tools-cli-${{ inputs.pds-tools-version }}.jar - asset_name: sechub-pds-tools-cli-${{ inputs.pds-tools-version }}.jar - asset_content_type: application/zip - - - name: Upload PDS-Tools release asset sechub-pds-tools-cli-${{ inputs.pds-tools-version }}.jar.sha256sum - if: inputs.pds-tools-version != '' - uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 + mkdir pds-tools-release-artifacts + # Collect release artifacts + cp sechub-pds-tools/build/libs/sechub-pds-tools-cli-${{ inputs.pds-tools-version }}.jar \ + pds-tools-release-artifacts/ + # Compute sha256 checksums for .jar files + cd pds-tools-release-artifacts + for i in *.jar ; do + sha256sum "$i" > "$i.sha256sum" + done + + - name: Create PDS-Tools ${{ inputs.pds-tools-version }} release draft + shell: bash + run: | + assets=() + echo "# Adding PDS binaries and docs" + cd pds-tools-release-artifacts/ + for asset in * ; do + filename=`basename "$asset"` + echo "# - $filename" + assets+=("-a" "${asset}#${filename}") + done + # Define release data + tag_name="v${{ inputs.pds-tools-version }}-pds-tools" + release_title="PDS-Tools Version ${{ inputs.pds-tools-version }}" + release_message="Changes in this Release + - Some minor changes on PDS-Tools implementation" + release_footer="For more details please look at [Milestone ${{inputs.pds-tools-milestone-number}}]( https://github.com/mercedes-benz/sechub/milestone/${{inputs.pds-tools-milestone-number}}?closed=1)" + echo "# Create release draft \"$release_title\" on github" + hub release create --draft "${assets[@]}" -m "$release_title" -m "$release_message" -m "$release_footer" "$tag_name" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_pds_tools_release.outputs.upload_url }} - asset_path: sechub-pds-tools/build/libs/sechub-pds-tools-cli-${{ inputs.pds-tools-version }}.jar.sha256sum - asset_name: sechub-pds-tools-cli-${{ inputs.pds-tools-version }}.jar.sha256sum - asset_content_type: text/plain # ----------------------------------------- # Create release issue diff --git a/.github/workflows/release-web-server.yml b/.github/workflows/release-web-server.yml index cf8a939cd..08ab66c2c 100644 --- a/.github/workflows/release-web-server.yml +++ b/.github/workflows/release-web-server.yml @@ -1,6 +1,11 @@ # SPDX-License-Identifier: MIT name: Release Web Server +############################### +# D E P R E C A T E D ! ! +# +# web-server functionality will be integrated into SecHub server +############################### on: workflow_dispatch: inputs: diff --git a/.github/workflows/release-web-ui.yml b/.github/workflows/release-web-ui.yml index d9e433f45..47a7a6bc5 100644 --- a/.github/workflows/release-web-ui.yml +++ b/.github/workflows/release-web-ui.yml @@ -37,18 +37,14 @@ jobs: echo "actor-email: '${{ inputs.actor-email }}'" echo "Web-UI '${{ inputs.web-ui-version }}' - Milestone '${{ inputs.web-ui-milestone-number }}'" - # Check inputs: - - name: "Verify Input for Web-UI release" - if: (inputs.web-ui-version == '') || (inputs.web-ui-milestone-number == '') - run: | - echo "For Web-UI release, web-ui-version and web-ui-milestone-number must be provided!" - exit 1 - - name: Checkout master uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 with: ref: master + - name: Install required packages + run: sudo apt-get -y install hub + # Create temporary local tag, so we build for this tag... # The final tag on git server side will be done automatically by the release when the draft is saved as "real" release - name: "Temporary tag server version: v${{ inputs.web-ui-version }}-web-ui" @@ -140,45 +136,33 @@ jobs: path: sechub-web-ui/dist/ retention-days: 7 - - name: Create Web-UI release - id: create_web-ui_release - uses: actions/create-release@0cb9c9b65d5d1901c1f53e5e66eaf4afd303e70e - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own - with: - tag_name: v${{ inputs.web-ui-version }}-web-ui - commitish: master - release_name: web-ui frontend Version ${{ inputs.web-ui-version }} - body: | - Changes in this release: - - New shiny Web-UI features - - For more details please look at [Milestone ${{inputs.web-ui-milestone-number}}]( https://github.com/mercedes-benz/sechub/milestone/${{inputs.web-ui-milestone-number}}?closed=1) - draft: true - prerelease: false - - - name: Create sha256 checksum file for Web-UI zip file + # ****************************************** + # W e b - U I release + # ****************************************** + - name: Prepare PDS-Tools ${{ inputs.pds-tools-version }} release artifacts + shell: bash run: sha256sum $WEB_UI_RELEASE_ZIPFILE > $WEB_UI_RELEASE_ZIPFILE.sha256sum - - name: Upload Web-UI release asset ${{ env.WEB_UI_RELEASE_ZIPFILE }} - uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_web-ui_release.outputs.upload_url }} - asset_path: ${{ env.WEB_UI_RELEASE_ZIPFILE }} - asset_name: ${{ env.WEB_UI_RELEASE_ZIPFILE }} - asset_content_type: application/zip - - - name: Upload Web-UI release asset ${{ env.WEB_UI_RELEASE_ZIPFILE }}.sha256sum - uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 + - name: Create PDS-Tools ${{ inputs.pds-tools-version }} release draft + shell: bash + run: | + assets=() + echo "# Adding web-ui content" + for asset in $WEB_UI_RELEASE_ZIPFILE $WEB_UI_RELEASE_ZIPFILE.sha256sum ; do + filename=`basename "$asset"` + echo "# - $filename" + assets+=("-a" "${asset}#${filename}") + done + # Define release data + tag_name="v${{ inputs.web-ui-version }}-web-ui" + release_title="web-ui frontend Version ${{ inputs.web-ui-version }}" + release_message="Changes in this Release + - New shiny Web-UI features" + release_footer="For more details please look at [Milestone ${{inputs.web-ui-milestone-number}}]( https://github.com/mercedes-benz/sechub/milestone/${{inputs.web-ui-milestone-number}}?closed=1)" + echo "# Create release draft \"$release_title\" on github" + hub release create --draft "${assets[@]}" -m "$release_title" -m "$release_message" -m "$release_footer" "$tag_name" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_web-ui_release.outputs.upload_url }} - asset_path: ${{ env.WEB_UI_RELEASE_ZIPFILE }}.sha256sum - asset_name: ${{ env.WEB_UI_RELEASE_ZIPFILE }}.sha256sum - asset_content_type: text/plain # ----------------------------------------- # Create release issue diff --git a/.github/workflows/release-wrapper-checkmarx.yml b/.github/workflows/release-wrapper-checkmarx.yml index cc34a01bc..617f9d16b 100644 --- a/.github/workflows/release-wrapper-checkmarx.yml +++ b/.github/workflows/release-wrapper-checkmarx.yml @@ -36,6 +36,9 @@ jobs: # ---------------------- # Setup + Caching # ---------------------- + - name: Install required packages + run: sudo apt-get -y install hub + - name: Set up JDK 17 uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b with: @@ -124,50 +127,36 @@ jobs: - name: Assert releasable run: ./gradlew assertReleaseable - - name: Create Checkmarx Wrapper release - id: create_checkmarx-wrapper_release - uses: actions/create-release@0cb9c9b65d5d1901c1f53e5e66eaf4afd303e70e - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token - with: - tag_name: v${{ inputs.checkmarx-wrapper-version }}-checkmarx-wrapper - commitish: master - release_name: Checkmarx Wrapper Version ${{ inputs.checkmarx-wrapper-version }} - body: | - Changes in this Release - - Some minor changes on Checkmarx Wrapper implementation - - For more details please look at [Milestone ${{inputs.checkmarx-wrapper-milestone-number}}]( https://github.com/mercedes-benz/sechub/milestone/${{inputs.checkmarx-wrapper-milestone-number}}?closed=1) - draft: true - prerelease: false - - # ----------------------------------------- - # Upload release artifacts - # ----------------------------------------- - - name: Create files and sha256 checksum for Checkmarx Wrapper jar + # ****************************************** + # Checkmarx Wrapper release + # ****************************************** + - name: Prepare Checkmarx Wrapper ${{ inputs.checkmarx-wrapper-version }} release artifacts + shell: bash run: | cd sechub-wrapper-checkmarx/build/libs/ sha256sum sechub-wrapper-checkmarx-${{ inputs.checkmarx-wrapper-version }}.jar > sechub-wrapper-checkmarx-${{ inputs.checkmarx-wrapper-version }}.jar.sha256sum - - name: Upload asset sechub-wrapper-checkmarx-${{ inputs.checkmarx-wrapper-version }}.jar - uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_checkmarx-wrapper_release.outputs.upload_url }} - asset_path: sechub-wrapper-checkmarx/build/libs/sechub-wrapper-checkmarx-${{ inputs.checkmarx-wrapper-version }}.jar - asset_name: sechub-wrapper-checkmarx-${{ inputs.checkmarx-wrapper-version }}.jar - asset_content_type: application/zip - - - name: Upload asset sechub-wrapper-checkmarx-${{ inputs.checkmarx-wrapper-version }}.jar.sha256sum - uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 + - name: Create Checkmarx Wrapper ${{ inputs.checkmarx-wrapper-version }} release draft + shell: bash + run: | + assets=() + echo "# Adding release artifacts" + cd sechub-wrapper-checkmarx/build/libs/ + for asset in sechub-wrapper-checkmarx-${{ inputs.checkmarx-wrapper-version }}.jar* ; do + filename=`basename "$asset"` + echo "# - $filename" + assets+=("-a" "${asset}#${filename}") + done + # Define release data + tag_name="v${{ inputs.checkmarx-wrapper-version }}-checkmarx-wrapper" + release_title="Checkmarx Wrapper Version ${{ inputs.checkmarx-wrapper-version }}" + release_message="Changes in this Release + - Some minor changes on Checkmarx Wrapper implementation" + release_footer="For more details please look at [Milestone ${{inputs.checkmarx-wrapper-milestone-number}}]( https://github.com/mercedes-benz/sechub/milestone/${{inputs.checkmarx-wrapper-milestone-number}}?closed=1)" + echo "# Create release draft \"$release_title\" on github" + hub release create --draft "${assets[@]}" -m "$release_title" -m "$release_message" -m "$release_footer" "$tag_name" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_checkmarx-wrapper_release.outputs.upload_url }} - asset_path: sechub-wrapper-checkmarx/build/libs/sechub-wrapper-checkmarx-${{ inputs.checkmarx-wrapper-version }}.jar.sha256sum - asset_name: sechub-wrapper-checkmarx-${{ inputs.checkmarx-wrapper-version }}.jar.sha256sum - asset_content_type: text/plain # ----------------------------------------- # Create release issue diff --git a/.github/workflows/release-wrapper-owaspzap.yml b/.github/workflows/release-wrapper-owaspzap.yml index a686be2f6..10550cae1 100644 --- a/.github/workflows/release-wrapper-owaspzap.yml +++ b/.github/workflows/release-wrapper-owaspzap.yml @@ -37,6 +37,9 @@ jobs: # ---------------------- # Setup + Caching # ---------------------- + - name: Install required packages + run: sudo apt-get -y install hub + - name: Set up JDK 17 uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b with: @@ -125,50 +128,36 @@ jobs: - name: Assert releasable run: ./gradlew assertReleaseable - - name: Create OWASP-ZAP Wrapper release - id: create_owaspzap-wrapper_release - uses: actions/create-release@0cb9c9b65d5d1901c1f53e5e66eaf4afd303e70e - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token - with: - tag_name: v${{ inputs.owaspzap-wrapper-version }}-owaspzap-wrapper - commitish: master - release_name: OWASP-ZAP Wrapper Version ${{ inputs.owaspzap-wrapper-version }} - body: | - Changes in this Release - - Some minor changes on OWASP-ZAP Wrapper implementation - - For more details please look at [Milestone ${{inputs.owaspzap-wrapper-milestone-number}}]( https://github.com/mercedes-benz/sechub/milestone/${{inputs.owaspzap-wrapper-milestone-number}}?closed=1) - draft: true - prerelease: false - - # ----------------------------------------- - # Upload release artifacts - # ----------------------------------------- - - name: Create files and sha256 checksum for OWASP-ZAP Wrapper jar + # ****************************************** + # OWASP-ZAP Wrapper release + # ****************************************** + - name: Prepare OWASP-ZAP Wrapper ${{ inputs.owaspzap-wrapper-version }} release artifacts + shell: bash run: | cd sechub-wrapper-owasp-zap/build/libs/ sha256sum sechub-pds-wrapperowaspzap-${{ inputs.owaspzap-wrapper-version }}.jar > sechub-pds-wrapperowaspzap-${{ inputs.owaspzap-wrapper-version }}.jar.sha256sum - - name: Upload asset sechub-pds-wrapperowaspzap-${{ inputs.owaspzap-wrapper-version }}.jar - uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_owaspzap-wrapper_release.outputs.upload_url }} - asset_path: sechub-wrapper-owasp-zap/build/libs/sechub-pds-wrapperowaspzap-${{ inputs.owaspzap-wrapper-version }}.jar - asset_name: sechub-pds-wrapperowaspzap-${{ inputs.owaspzap-wrapper-version }}.jar - asset_content_type: application/zip - - - name: Upload asset sechub-pds-wrapperowaspzap-${{ inputs.owaspzap-wrapper-version }}.jar.sha256sum - uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 + - name: Create OWASP-ZAP Wrapper ${{ inputs.owaspzap-wrapper-version }} release draft + shell: bash + run: | + assets=() + echo "# Adding release artifacts" + cd sechub-wrapper-owasp-zap/build/libs/ + for asset in sechub-pds-wrapperowaspzap-${{ inputs.owaspzap-wrapper-version }}.jar* ; do + filename=`basename "$asset"` + echo "# - $filename" + assets+=("-a" "${asset}#${filename}") + done + # Define release data + tag_name="v${{ inputs.owaspzap-wrapper-version }}-owaspzap-wrapper" + release_title="OWASP-ZAP Wrapper Version ${{ inputs.owaspzap-wrapper-version }}" + release_message="Changes in this Release + - Some minor changes on OWASP-ZAP Wrapper implementation" + release_footer="For more details please look at [Milestone ${{inputs.owaspzap-wrapper-milestone-number}}]( https://github.com/mercedes-benz/sechub/milestone/${{inputs.owaspzap-wrapper-milestone-number}}?closed=1)" + echo "# Create release draft \"$release_title\" on github" + hub release create --draft "${assets[@]}" -m "$release_title" -m "$release_message" -m "$release_footer" "$tag_name" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_owaspzap-wrapper_release.outputs.upload_url }} - asset_path: sechub-wrapper-owasp-zap/build/libs/sechub-pds-wrapperowaspzap-${{ inputs.owaspzap-wrapper-version }}.jar.sha256sum - asset_name: sechub-pds-wrapperowaspzap-${{ inputs.owaspzap-wrapper-version }}.jar.sha256sum - asset_content_type: text/plain # ----------------------------------------- # Create release issue diff --git a/.github/workflows/release-wrapper-prepare.yml b/.github/workflows/release-wrapper-prepare.yml index efba3f78d..62bcd27d1 100644 --- a/.github/workflows/release-wrapper-prepare.yml +++ b/.github/workflows/release-wrapper-prepare.yml @@ -36,6 +36,9 @@ jobs: # ---------------------- # Setup + Caching # ---------------------- + - name: Install required packages + run: sudo apt-get -y install hub + - name: Set up JDK 17 uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b with: @@ -124,50 +127,36 @@ jobs: - name: Assert releasable run: ./gradlew assertReleaseable - - name: Create Prepare Wrapper release - id: create_prepare-wrapper_release - uses: actions/create-release@0cb9c9b65d5d1901c1f53e5e66eaf4afd303e70e - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token - with: - tag_name: v${{ inputs.prepare-wrapper-version }}-prepare-wrapper - commitish: master - release_name: Prepare Wrapper Version ${{ inputs.prepare-wrapper-version }} - body: | - Changes in this Release - - Some minor changes on Prepare Wrapper implementation - - For more details please look at [Milestone ${{inputs.prepare-wrapper-milestone-number}}]( https://github.com/mercedes-benz/sechub/milestone/${{inputs.prepare-wrapper-milestone-number}}?closed=1) - draft: true - prerelease: false - - # ----------------------------------------- - # Upload release artifacts - # ----------------------------------------- - - name: Create files and sha256 checksum for Prepare Wrapper jar + # ****************************************** + # Prepare Wrapper release + # ****************************************** + - name: Prepare Prepare Wrapper ${{ inputs.prepare-wrapper-version }} release artifacts + shell: bash run: | cd sechub-wrapper-prepare/build/libs/ sha256sum sechub-wrapper-prepare-${{ inputs.prepare-wrapper-version }}.jar > sechub-wrapper-prepare-${{ inputs.prepare-wrapper-version }}.jar.sha256sum - - name: Upload asset sechub-wrapper-prepare-${{ inputs.prepare-wrapper-version }}.jar - uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_prepare-wrapper_release.outputs.upload_url }} - asset_path: sechub-wrapper-prepare/build/libs/sechub-wrapper-prepare-${{ inputs.prepare-wrapper-version }}.jar - asset_name: sechub-wrapper-prepare-${{ inputs.prepare-wrapper-version }}.jar - asset_content_type: application/zip - - - name: Upload asset sechub-wrapper-prepare-${{ inputs.prepare-wrapper-version }}.jar.sha256sum - uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 + - name: Create Prepare Wrapper ${{ inputs.prepare-wrapper-version }} release draft + shell: bash + run: | + assets=() + echo "# Adding release artifacts" + cd sechub-wrapper-prepare/build/libs/ + for asset in sechub-wrapper-prepare-${{ inputs.prepare-wrapper-version }}.jar* ; do + filename=`basename "$asset"` + echo "# - $filename" + assets+=("-a" "${asset}#${filename}") + done + # Define release data + tag_name="v${{ inputs.prepare-wrapper-version }}-prepare-wrapper" + release_title="Prepare Wrapper Version ${{ inputs.prepare-wrapper-version }}" + release_message="Changes in this Release + - Some minor changes on Prepare Wrapper implementation" + release_footer="For more details please look at [Milestone ${{inputs.prepare-wrapper-milestone-number}}]( https://github.com/mercedes-benz/sechub/milestone/${{inputs.prepare-wrapper-milestone-number}}?closed=1)" + echo "# Create release draft \"$release_title\" on github" + hub release create --draft "${assets[@]}" -m "$release_title" -m "$release_message" -m "$release_footer" "$tag_name" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_prepare-wrapper_release.outputs.upload_url }} - asset_path: sechub-wrapper-prepare/build/libs/sechub-wrapper-prepare-${{ inputs.prepare-wrapper-version }}.jar.sha256sum - asset_name: sechub-wrapper-prepare-${{ inputs.prepare-wrapper-version }}.jar.sha256sum - asset_content_type: text/plain # ----------------------------------------- # Create release issue diff --git a/.github/workflows/release-wrapper-validation.yml b/.github/workflows/release-wrapper-validation.yml index 6db7e94a5..b4be97cc4 100644 --- a/.github/workflows/release-wrapper-validation.yml +++ b/.github/workflows/release-wrapper-validation.yml @@ -36,6 +36,9 @@ jobs: # ---------------------- # Setup + Caching # ---------------------- + - name: Install required packages + run: sudo apt-get -y install hub + - name: Set up JDK 17 uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b with: @@ -124,50 +127,36 @@ jobs: - name: Assert releasable run: ./gradlew assertReleaseable - - name: Create Secret-Validation Wrapper release - id: create_secretvalidation-wrapper_release - uses: actions/create-release@0cb9c9b65d5d1901c1f53e5e66eaf4afd303e70e - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token - with: - tag_name: v${{ inputs.secretvalidation-wrapper-version }}-secretvalidation-wrapper - commitish: master - release_name: Secret-Validation Wrapper Version ${{ inputs.secretvalidation-wrapper-version }} - body: | - Changes in this Release - - Some minor changes on Secret-Validation Wrapper implementation - - For more details please look at [Milestone ${{inputs.secretvalidation-wrapper-milestone-number}}]( https://github.com/mercedes-benz/sechub/milestone/${{inputs.secretvalidation-wrapper-milestone-number}}?closed=1) - draft: true - prerelease: false - - # ----------------------------------------- - # Upload release artifacts - # ----------------------------------------- - - name: Create files and sha256 checksum for Secret-Validation Wrapper jar + # ****************************************** + # Secret-Validation Wrapper release + # ****************************************** + - name: Prepare Secret-Validation Wrapper ${{ inputs.secretvalidation-wrapper-version }} release artifacts + shell: bash run: | cd sechub-wrapper-secretvalidation/build/libs/ sha256sum sechub-wrapper-secretvalidation-${{ inputs.secretvalidation-wrapper-version }}.jar > sechub-wrapper-secretvalidation-${{ inputs.secretvalidation-wrapper-version }}.jar.sha256sum - - name: Upload asset sechub-wrapper-secretvalidation-${{ inputs.secretvalidation-wrapper-version }}.jar - uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_secretvalidation-wrapper_release.outputs.upload_url }} - asset_path: sechub-wrapper-secretvalidation/build/libs/sechub-wrapper-secretvalidation-${{ inputs.secretvalidation-wrapper-version }}.jar - asset_name: sechub-wrapper-secretvalidation-${{ inputs.secretvalidation-wrapper-version }}.jar - asset_content_type: application/zip - - - name: Upload asset sechub-wrapper-secretvalidation-${{ inputs.secretvalidation-wrapper-version }}.jar.sha256sum - uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 + - name: Create Secret-Validation Wrapper ${{ inputs.secretvalidation-wrapper-version }} release draft + shell: bash + run: | + assets=() + echo "# Adding release artifacts" + cd sechub-wrapper-secretvalidation/build/libs/ + for asset in sechub-wrapper-secretvalidation-${{ inputs.secretvalidation-wrapper-version }}.jar* ; do + filename=`basename "$asset"` + echo "# - $filename" + assets+=("-a" "${asset}#${filename}") + done + # Define release data + tag_name="v${{ inputs.secretvalidation-wrapper-version }}-secretvalidation-wrapper" + release_title="Secret-Validation Wrapper Version ${{ inputs.secretvalidation-wrapper-version }}" + release_message="Changes in this Release + - Some minor changes on Secret-Validation Wrapper implementation" + release_footer="For more details please look at [Milestone ${{inputs.secretvalidation-wrapper-milestone-number}}]( https://github.com/mercedes-benz/sechub/milestone/${{inputs.secretvalidation-wrapper-milestone-number}}?closed=1)" + echo "# Create release draft \"$release_title\" on github" + hub release create --draft "${assets[@]}" -m "$release_title" -m "$release_message" -m "$release_footer" "$tag_name" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_secretvalidation-wrapper_release.outputs.upload_url }} - asset_path: sechub-wrapper-secretvalidation/build/libs/sechub-wrapper-secretvalidation-${{ inputs.secretvalidation-wrapper-version }}.jar.sha256sum - asset_name: sechub-wrapper-secretvalidation-${{ inputs.secretvalidation-wrapper-version }}.jar.sha256sum - asset_content_type: text/plain # ----------------------------------------- # Create release issue diff --git a/.github/workflows/release-wrapper-xray.yml b/.github/workflows/release-wrapper-xray.yml index c1eb53443..3672d4ef9 100644 --- a/.github/workflows/release-wrapper-xray.yml +++ b/.github/workflows/release-wrapper-xray.yml @@ -36,6 +36,9 @@ jobs: # ---------------------- # Setup + Caching # ---------------------- + - name: Install required packages + run: sudo apt-get -y install hub + - name: Set up JDK 17 uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b with: @@ -124,50 +127,36 @@ jobs: - name: Assert releasable run: ./gradlew assertReleaseable - - name: Create Xray Wrapper release - id: create_xray-wrapper_release - uses: actions/create-release@0cb9c9b65d5d1901c1f53e5e66eaf4afd303e70e - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token - with: - tag_name: v${{ inputs.xray-wrapper-version }}-xray-wrapper - commitish: master - release_name: Xray Wrapper Version ${{ inputs.xray-wrapper-version }} - body: | - Changes in this Release - - Some minor changes on Xray Wrapper implementation - - For more details please look at [Milestone ${{inputs.xray-wrapper-milestone-number}}]( https://github.com/mercedes-benz/sechub/milestone/${{inputs.xray-wrapper-milestone-number}}?closed=1) - draft: true - prerelease: false - - # ----------------------------------------- - # Upload release artifacts - # ----------------------------------------- - - name: Create files and sha256 checksum for Xray Wrapper jar + # ****************************************** + # Xray Wrapper release + # ****************************************** + - name: Prepare Xray Wrapper ${{ inputs.xray-wrapper-version }} release artifacts + shell: bash run: | cd sechub-wrapper-xray/build/libs/ sha256sum sechub-pds-wrapper-xray-${{ inputs.xray-wrapper-version }}.jar > sechub-pds-wrapper-xray-${{ inputs.xray-wrapper-version }}.jar.sha256sum - - name: Upload asset sechub-pds-wrapper-xray-${{ inputs.xray-wrapper-version }}.jar - uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_xray-wrapper_release.outputs.upload_url }} - asset_path: sechub-wrapper-xray/build/libs/sechub-pds-wrapper-xray-${{ inputs.xray-wrapper-version }}.jar - asset_name: sechub-pds-wrapper-xray-${{ inputs.xray-wrapper-version }}.jar - asset_content_type: application/zip - - - name: Upload asset sechub-pds-wrapper-xray-${{ inputs.xray-wrapper-version }}.jar.sha256sum - uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 + - name: Create Xray Wrapper ${{ inputs.xray-wrapper-version }} release draft + shell: bash + run: | + assets=() + echo "# Adding release artifacts" + cd sechub-wrapper-xray/build/libs/ + for asset in sechub-pds-wrapper-xray-${{ inputs.xray-wrapper-version }}.jar* ; do + filename=`basename "$asset"` + echo "# - $filename" + assets+=("-a" "${asset}#${filename}") + done + # Define release data + tag_name="v${{ inputs.xray-wrapper-version }}-xray-wrapper" + release_title="Xray Wrapper Version ${{ inputs.xray-wrapper-version }}" + release_message="Changes in this Release + - Some minor changes on Xray Wrapper implementation" + release_footer="For more details please look at [Milestone ${{inputs.xray-wrapper-milestone-number}}]( https://github.com/mercedes-benz/sechub/milestone/${{inputs.xray-wrapper-milestone-number}}?closed=1)" + echo "# Create release draft \"$release_title\" on github" + hub release create --draft "${assets[@]}" -m "$release_title" -m "$release_message" -m "$release_footer" "$tag_name" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_xray-wrapper_release.outputs.upload_url }} - asset_path: sechub-wrapper-xray/build/libs/sechub-pds-wrapper-xray-${{ inputs.xray-wrapper-version }}.jar.sha256sum - asset_name: sechub-pds-wrapper-xray-${{ inputs.xray-wrapper-version }}.jar.sha256sum - asset_content_type: text/plain # ----------------------------------------- # Create release issue diff --git a/sechub-cli/script/build-debian-packages.sh b/sechub-cli/script/build-debian-packages.sh index 3bd7d52f8..a6862ffe3 100755 --- a/sechub-cli/script/build-debian-packages.sh +++ b/sechub-cli/script/build-debian-packages.sh @@ -5,7 +5,7 @@ set -e # Debian packaging data DEB_PACKAGE_NAME="sechub-client" DEB_SECTION="misc" -DEB_MAINTAINER="SecHub FOSS team " +DEB_MAINTAINER="SecHub FOSS team " DEB_HOMEPAGE="https://github.com/mercedes-benz/sechub" DEB_DESCRIPTION="The SecHub command line client. See $DEB_HOMEPAGE" DEB_BIN_PATH="usr/bin" # Where to place the SecHub client executable on install