Skip to content

Commit 86b6687

Browse files
GHA-200 Fix update-analyzer updating wrong plugins (#106)
1 parent 46301a1 commit 86b6687

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/automated-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,7 @@ jobs:
644644
ticket-key: ${{ needs.create-integration-tickets.outputs.sqs-ticket-key }}
645645
plugin-name: ${{ inputs.plugin-name }}
646646
secret-name: ${{ inputs.release-automation-secret-name || format('sonar-{0}-release-automation', inputs.plugin-name) }}
647-
plugin-artifacts: ${{inputs.plugin-artifacts-sqs || inputs.plugin-name }}
647+
plugin-artifacts: ${{inputs.plugin-artifacts-sqs }}
648648
draft: ${{ inputs.is-draft-release }}
649649
reviewers: ${{ github.actor }}
650650

@@ -657,7 +657,7 @@ jobs:
657657
ticket-key: ${{ needs.create-integration-tickets.outputs.sqc-ticket-key }}
658658
plugin-name: ${{ inputs.plugin-name }}
659659
secret-name: ${{ inputs.release-automation-secret-name || format('sonar-{0}-release-automation', inputs.plugin-name) }}
660-
plugin-artifacts: ${{inputs.plugin-artifacts-sqc || inputs.plugin-name }}
660+
plugin-artifacts: ${{inputs.plugin-artifacts-sqc }}
661661
draft: ${{ inputs.is-draft-release }}
662662
reviewers: ${{ github.actor }}
663663

update-analyzer/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,14 @@ runs:
9696
IFS=',' read -ra PLUGINS <<< "$PLUGIN_ARTIFACTS"
9797
else
9898
echo "Using plugin-name: $PLUGIN_NAME"
99-
PLUGINS=("$PLUGIN_NAME")
99+
PLUGINS=("${PLUGIN_NAME}.*")
100100
fi
101101
102102
# Update each plugin
103103
for plugin in "${PLUGINS[@]}"; do
104104
plugin=$(echo "$plugin" | xargs)
105105
echo "Updating analyzer version in ${{ env.BUILD_GRADLE_FILE }} for plugin $plugin"
106-
sed -i "s/\(:sonar-$plugin.*-plugin:\)[0-9.]*/\1$RELEASE_VERSION/g" ${{ env.BUILD_GRADLE_FILE }}
106+
sed -i "s/\(:sonar-$plugin-plugin:\)[0-9.]*/\1$RELEASE_VERSION/g" ${{ env.BUILD_GRADLE_FILE }}
107107
done
108108
109109
echo "Showing diff:"

0 commit comments

Comments
 (0)