From 653b5a84252af496b9fb727edd3723c4598c2e8e Mon Sep 17 00:00:00 2001 From: Alex Demidoff Date: Sun, 17 Mar 2024 19:51:24 +0000 Subject: [PATCH] PMM-12899 update the workflows --- .github/workflows/main.yml | 8 ++++---- build/scripts/build-server-rpm | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 93a6ecabece..dd39f861502 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -143,8 +143,8 @@ jobs: env: SLACK_WEBHOOK: ${{ secrets.SLACK_TOKEN_PMM_CI }} SLACK_CHANNEL: "pmm-ci" - SLACK_USERNAME: "PR pipelines bot" - SLACK_ICON_EMOJI: ":chestnut:" + SLACK_USERNAME: "Build bot" + SLACK_ICON_EMOJI: ":octocat:" SLACK_COLOR: "#00FF00" SLACK_TITLE: "Finished ${{ github.event.repository.name }} workflow" SLACK_MESSAGE: "${{ github.event.inputs.repo || github.repository }}:${{ github.event.inputs.branch || github.head_ref }}" @@ -161,8 +161,8 @@ jobs: env: SLACK_WEBHOOK: ${{ secrets.SLACK_TOKEN_PMM_CI }} SLACK_CHANNEL: "pmm-ci" - SLACK_USERNAME: "PR pipelines bot" - SLACK_ICON_EMOJI: ":chestnut:" + SLACK_USERNAME: "Build bot" + SLACK_ICON_EMOJI: ":octocat:" SLACK_COLOR: "#FF0000" SLACK_TITLE: "Finished ${{ github.event.repository.name }} workflow" SLACK_MESSAGE: "Workflow failed: ${{ github.event.inputs.repo || github.repository }}:${{ github.event.inputs.branch || github.head_ref }}" diff --git a/build/scripts/build-server-rpm b/build/scripts/build-server-rpm index d0bb6b73613..a4bfe060d44 100755 --- a/build/scripts/build-server-rpm +++ b/build/scripts/build-server-rpm @@ -69,12 +69,12 @@ prepare_specs() { local short_commit=${full_commit:0:7} sed -i -e "s/global commit.*/global commit ${full_commit}/" ${rpmbuild_dir}/SOURCES/${spec_name}.spec - if [[ ${spec_name} != "grafana" ]]; then + if [ "${spec_name}" != "grafana" ]; then sed -i -e "s/Version:.*/Version: ${pmm_version}/" ${rpmbuild_dir}/SOURCES/${spec_name}.spec fi if [ -z "${full_pmm_version}" ]; then - echo 'A full_pmm_version is not specified.' + echo 'The full_pmm_version is not specified.' exit 1 fi sed -i -e "s/%define full_pmm_version.*/%define full_pmm_version ${full_pmm_version}/" ${rpmbuild_dir}/SOURCES/${spec_name}.spec