From dffe1a6b4f251c461ab1c5015635e9df82804b12 Mon Sep 17 00:00:00 2001 From: Viktor Delev Date: Mon, 9 Dec 2024 11:33:47 +0100 Subject: [PATCH 1/3] remove github.token check, use bot repo token always --- .github/workflows/release-post-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-post-merge.yml b/.github/workflows/release-post-merge.yml index d2ccc25c..8e4e9641 100644 --- a/.github/workflows/release-post-merge.yml +++ b/.github/workflows/release-post-merge.yml @@ -56,7 +56,7 @@ jobs: - name: Checkout Repository uses: actions/checkout@v4 with: - token: ${{ secrets.CHECKOUT_TOKEN || github.event.repository.private == true && secrets.DATAVISYN_BOT_REPO_TOKEN || github.token }} + token: ${{ secrets.DATAVISYN_BOT_REPO_TOKEN }} fetch-depth: 0 - name: Create and Push Tag From cba56c934227c363d9b69b08de766e21ef8c99fc Mon Sep 17 00:00:00 2001 From: Viktor Delev Date: Mon, 9 Dec 2024 11:46:15 +0100 Subject: [PATCH 2/3] configure github actor --- .github/workflows/release-post-merge.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release-post-merge.yml b/.github/workflows/release-post-merge.yml index 8e4e9641..0c01dfb3 100644 --- a/.github/workflows/release-post-merge.yml +++ b/.github/workflows/release-post-merge.yml @@ -112,6 +112,8 @@ jobs: - name: Update Package Version for Next Development Cycle run: | + git config user.name "$GITHUB_ACTOR" + git config user.email "<>" CURRENT_VERSION=$(jq -r '.version' package.json) NEW_VERSION=$(echo "$CURRENT_VERSION" | awk -F. -v OFS=. '{$NF += 1 ; print $0"-SNAPSHOT"}') jq --arg new_version "$NEW_VERSION" '.version = $new_version' package.json > tmp.json && mv tmp.json package.json From 94718fd1700970b6271eba94259b297799f17fd1 Mon Sep 17 00:00:00 2001 From: Viktor Delev Date: Mon, 9 Dec 2024 11:57:04 +0100 Subject: [PATCH 3/3] change variable name --- .github/workflows/release-post-merge.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-post-merge.yml b/.github/workflows/release-post-merge.yml index 0c01dfb3..e77585d7 100644 --- a/.github/workflows/release-post-merge.yml +++ b/.github/workflows/release-post-merge.yml @@ -103,7 +103,7 @@ jobs: - name: Merge Main into Develop run: | - git config user.name "$GITHUB_ACTOR" + git config user.name "$GITHUB_USER" git config user.email "<>" git checkout ${{ inputs.develop_branch }} git fetch origin ${{ inputs.base_branch }} @@ -112,7 +112,7 @@ jobs: - name: Update Package Version for Next Development Cycle run: | - git config user.name "$GITHUB_ACTOR" + git config user.name "$GITHUB_USER" git config user.email "<>" CURRENT_VERSION=$(jq -r '.version' package.json) NEW_VERSION=$(echo "$CURRENT_VERSION" | awk -F. -v OFS=. '{$NF += 1 ; print $0"-SNAPSHOT"}')