Skip to content

Commit 5b37b09

Browse files
authored
Merge pull request #6525 from gooddata/pb-fix-patch-wf
fix: adjust patch workflow
2 parents d94bf76 + 444fe3a commit 5b37b09

File tree

4 files changed

+6
-153
lines changed

4 files changed

+6
-153
lines changed

.github/workflows/release-code-drop.yml

Lines changed: 0 additions & 80 deletions
This file was deleted.

.github/workflows/rw-git-push-rel-master-minor.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,11 @@ jobs:
5353
5454
CHANGELOG_HASH=$(git log -n 2 --pretty=format:"%H" origin/$SOURCE_BRANCH | tail -n 1)
5555
FILES_TO_REMOVE=$(git diff-tree --no-commit-id --name-only -r $CHANGELOG_HASH -- common/changes/@gooddata/sdk-ui-all/)
56-
echo "$FILES_TO_REMOVE" | while read -r file; do
57-
git rm "$file"
58-
done
56+
if [ -n "$FILES_TO_REMOVE" ]; then
57+
echo "$FILES_TO_REMOVE" | while read -r file; do
58+
git rm "$file"
59+
done
60+
fi
5961
6062
git commit -m "feat: add changelog changes" -m 'risk: nonprod'
6163

.github/workflows/rw-git-push-rel-master-patch.yml

Lines changed: 0 additions & 59 deletions
This file was deleted.

.github/workflows/rw-perform-release-patch.yml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,9 @@ jobs:
5555
version: ${{ needs.prepare-variables.outputs.version }}
5656
is-latest: ${{ needs.publish-release.outputs.is-latest}}
5757

58-
backport-rel-to-master:
59-
needs: [add-release-tag, prepare-variables]
60-
uses: ./.github/workflows/rw-git-push-rel-master-patch.yml
61-
permissions:
62-
contents: write
63-
pull-requests: write
64-
secrets: inherit
65-
with:
66-
source-branch: ${{ inputs.source-branch }}
67-
6858
slack-notification:
6959
runs-on: [ubuntu-latest]
70-
needs: [backport-rel-to-master]
60+
needs: [add-release-tag, prepare-variables]
7161
steps:
7262
- name: Set up message
7363
id: set-up-message

0 commit comments

Comments
 (0)