From e45425de1647f3af20b952350e2302ecee927dce Mon Sep 17 00:00:00 2001 From: Yashasvi17 <155513200+YashasviDevtron@users.noreply.github.com> Date: Fri, 20 Sep 2024 15:52:22 +0530 Subject: [PATCH 1/3] Update multi-gitter-pr-sync.yml --- .github/workflows/multi-gitter-pr-sync.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/multi-gitter-pr-sync.yml b/.github/workflows/multi-gitter-pr-sync.yml index ffa1b53d..eeb09e3b 100644 --- a/.github/workflows/multi-gitter-pr-sync.yml +++ b/.github/workflows/multi-gitter-pr-sync.yml @@ -39,11 +39,11 @@ jobs: - name: Update script with PR details run: | - sed -i 's/VERSION=.*/VERSION=${{ env.COMMIT_SHA }}/' .github/config/multi-gitter-config + sed -i 's/VERSION=.*/VERSION=${{ env.COMMIT_SHA }}/' .github/scripts/update-version.sh sed -i 's/PR_AUTHOR=.*/PR_AUTHOR=${{ env.PR_AUTHOR }}/' .github/config/multi-gitter-config sed -i 's/HEAD_BRANCH=.*/HEAD_BRANCH=${{ env.HEAD_BRANCH }}/' .github/config/multi-gitter-config - sed -i 's/HEAD_BRANCH=.*/HEAD_BRANCH=${{ env.HEAD_BRANCH }}/' .github/scripts/update-version.sh - sed -i 's/BASE_BRANCH=.*/BASE_BRANCH=${{ env.BASE_BRANCH }}/' .github/scripts/update-version.sh + sed -i 's/HEAD_BRANCH=.*/HEAD_BRANCH=${{ env.HEAD_BRANCH }}/' .github/config/multi-gitter-config + sed -i 's/BASE_BRANCH=.*/BASE_BRANCH=${{ env.BASE_BRANCH }}/' .github/config/multi-gitter-config - name: Run multi-gitter env: From 6673867767442069d7f6b0a6a194fd595730cf3d Mon Sep 17 00:00:00 2001 From: Yashasvi17 <155513200+YashasviDevtron@users.noreply.github.com> Date: Fri, 20 Sep 2024 15:53:40 +0530 Subject: [PATCH 2/3] Update update-version.sh --- .github/scripts/update-version.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/scripts/update-version.sh b/.github/scripts/update-version.sh index 02ba3610..dbbddbf3 100644 --- a/.github/scripts/update-version.sh +++ b/.github/scripts/update-version.sh @@ -4,9 +4,9 @@ ### Change these values ### MODULE=github.com/devtron-labs/common-lib -VERSION=${VERSION} +VERSION=$VERSION -echo "Commit SHA: ${VERSION}" +echo "Commit SHA: $VERSION" # Stop the script if any command fails set -e From e64d363b380d9fc243e9d4cafcfa1be0b33ab0df Mon Sep 17 00:00:00 2001 From: Yashasvi17 <155513200+YashasviDevtron@users.noreply.github.com> Date: Fri, 20 Sep 2024 16:06:03 +0530 Subject: [PATCH 3/3] Update multi-gitter-pr-sync.yml --- .github/workflows/multi-gitter-pr-sync.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/multi-gitter-pr-sync.yml b/.github/workflows/multi-gitter-pr-sync.yml index eeb09e3b..03d6d0e4 100644 --- a/.github/workflows/multi-gitter-pr-sync.yml +++ b/.github/workflows/multi-gitter-pr-sync.yml @@ -40,10 +40,6 @@ jobs: - name: Update script with PR details run: | sed -i 's/VERSION=.*/VERSION=${{ env.COMMIT_SHA }}/' .github/scripts/update-version.sh - sed -i 's/PR_AUTHOR=.*/PR_AUTHOR=${{ env.PR_AUTHOR }}/' .github/config/multi-gitter-config - sed -i 's/HEAD_BRANCH=.*/HEAD_BRANCH=${{ env.HEAD_BRANCH }}/' .github/config/multi-gitter-config - sed -i 's/HEAD_BRANCH=.*/HEAD_BRANCH=${{ env.HEAD_BRANCH }}/' .github/config/multi-gitter-config - sed -i 's/BASE_BRANCH=.*/BASE_BRANCH=${{ env.BASE_BRANCH }}/' .github/config/multi-gitter-config - name: Run multi-gitter env: