diff --git a/.github/workflows/release-web-ui.yml b/.github/workflows/release-web-ui.yml index 2e08af04e..236b6235d 100644 --- a/.github/workflows/release-web-ui.yml +++ b/.github/workflows/release-web-ui.yml @@ -202,7 +202,6 @@ jobs: VERSION_TAG="${WEB_UI_VERSION}" echo "# Building image $DOCKER_REGISTRY:$VERSION_TAG" echo " from $ACTIONS_BASE_IMAGE_DEBIAN" - mkdir -p sechub-web-ui-solution/docker/copy cp -r sechub-web-ui/.output sechub-web-ui-solution/docker/copy cd sechub-web-ui-solution export BASE_IMAGE="$ACTIONS_BASE_IMAGE_DEBIAN" @@ -211,42 +210,43 @@ jobs: echo "# Pushing image $DOCKER_REGISTRY:$VERSION_TAG (latest)" ./20-push-image.sh "$DOCKER_REGISTRY" "$VERSION_TAG" yes - # - name: Build sechub-web-ui Helm chart + push to ghcr - # shell: bash - # run: | - # cd sechub-web-ui-solution/helm - # echo "# Building Helm chart for SecHub Web-UI" - # helm package sechub-web-ui - # helm push sechub-web-ui-*.tgz $ACTIONS_HELM_REGISTRY - - # # ----------------------------------------- - # # Create a pull request for merging back `master` into `develop` - # # ----------------------------------------- - # - name: pull-request master to develop - # id: pr_master_to_develop - # continue-on-error: true - # uses: repo-sync/pull-request@7e79a9f5dc3ad0ce53138f01df2fad14a04831c5 - # with: - # github_token: ${{ secrets.GITHUB_TOKEN }} - # source_branch: "master" - # destination_branch: "develop" - # pr_allow_empty: true # should allow an empty PR, but seems not to work - # pr_title: '2 - After web-ui release: Merge master back into develop [auto-generated]' - # pr_body: | - # After SecHub Web-UI release - # - Web-UI '${{ inputs.web-ui-version }}' - - # Merge master branch back into develop - - # -> Please merge **after** the release has been published. - - # - name: Print PR infos if PR was created - # if: steps.pr_master_to_develop.outcome == 'success' - # run: | - # echo "Pull Request Number - ${{ steps.pr_master_to_develop.outputs.pr_number }}" - # echo "Pull Request URL - ${{ steps.pr_master_to_develop.outputs.pr_url }}" - - # - name: Print info if no PR was created - # if: steps.pr_master_to_develop.outcome != 'success' - # run: | - # echo "Nothing to merge - no pull request necessary." + - name: Build SecHub web-ui Helm chart + push to ghcr + shell: bash + run: | + cd sechub-web-ui-solution/helm + rm -f *.tgz + echo "# Building Helm chart for SecHub Web-UI" + helm package web-ui + helm push web-ui-*.tgz $ACTIONS_HELM_REGISTRY + + # ----------------------------------------- + # Create a pull request for merging back `master` into `develop` + # ----------------------------------------- + - name: pull-request master to develop + id: pr_master_to_develop + continue-on-error: true + uses: repo-sync/pull-request@7e79a9f5dc3ad0ce53138f01df2fad14a04831c5 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + source_branch: "master" + destination_branch: "develop" + pr_allow_empty: true # should allow an empty PR, but seems not to work + pr_title: '2 - After web-ui release: Merge master back into develop [auto-generated]' + pr_body: | + After SecHub Web-UI release + - Web-UI '${{ inputs.web-ui-version }}' + + Merge master branch back into develop + + -> Please merge **after** the release has been published. + + - name: Print PR infos if PR was created + if: steps.pr_master_to_develop.outcome == 'success' + run: | + echo "Pull Request Number - ${{ steps.pr_master_to_develop.outputs.pr_number }}" + echo "Pull Request URL - ${{ steps.pr_master_to_develop.outputs.pr_url }}" + + - name: Print info if no PR was created + if: steps.pr_master_to_develop.outcome != 'success' + run: | + echo "Nothing to merge - no pull request necessary."