Skip to content

Commit 40261e2

Browse files
authored
chore(ci): fix svace params (#1929)
Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
1 parent 9db808b commit 40261e2

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

.github/workflows/dev_build_svace.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ jobs:
4444
module_edition: ${{ steps.modules_module_tag.outputs.MODULE_EDITION }}
4545
runner_type: ${{ steps.modules_module_tag.outputs.RUNNER_TYPE }}
4646
checkout_tag: ${{ steps.modules_module_tag.outputs.CHECKOUT_TAG }}
47+
checkout_sha: ${{ steps.modules_module_tag.outputs.CHECKOUT_SHA }}
4748
steps:
4849
- uses: actions/checkout@v4
4950
with:
@@ -58,7 +59,9 @@ jobs:
5859
else
5960
CHECKOUT_TAG=${{ github.event.pull_request.head.sha || github.sha }}
6061
fi
62+
CHECKOUT_SHA=$(git rev-parse $CHECKOUT_TAG)
6163
echo "CHECKOUT_TAG=$CHECKOUT_TAG" >> "$GITHUB_OUTPUT"
64+
echo "CHECKOUT_SHA=$CHECKOUT_SHA" >> "$GITHUB_OUTPUT"
6265
if [[ "${{ github.ref_name }}" == 'main' ]]; then
6366
MODULES_MODULE_TAG="${{ github.ref_name }}-svace"
6467
elif [[ "${{ github.ref_name }}" =~ ^release-[0-9]+\.[0-9]+ ]]; then
@@ -92,6 +95,7 @@ jobs:
9295
MODULES_MODULE_TAG: ${{needs.set_vars.outputs.modules_module_tag}}
9396
MODULE_EDITION: ${{needs.set_vars.outputs.module_edition}}
9497
CHECKOUT_TAG: ${{needs.set_vars.outputs.checkout_tag}}
98+
CHECKOUT_SHA: ${{needs.set_vars.outputs.checkout_sha}}
9599
WERF_VIRTUAL_MERGE: 0
96100
steps:
97101
- name: Setup Docker config
@@ -108,6 +112,7 @@ jobs:
108112
echo MODULES_MODULE_TAG=$MODULES_MODULE_TAG
109113
echo DOCKER_CONFIG=$DOCKER_CONFIG
110114
echo CHECKOUT_TAG=$CHECKOUT_TAG
115+
echo CHECKOUT_SHA=$CHECKOUT_SHA
111116
- uses: actions/checkout@v4
112117
with:
113118
fetch-depth: 0
@@ -132,6 +137,7 @@ jobs:
132137
svace_enabled: "true"
133138
svace_analyze_host: "${{ secrets.SVACE_ANALYZE_HOST }}"
134139
svace_analyze_ssh_user: "${{ secrets.SVACE_ANALYZE_SSH_USER }}"
140+
svace_analyze_ssh_key: "${{ secrets.SVACE_ANALYZE_SSH_PRIVATE_KEY }}"
135141

136142
- name: Cleanup Docker config
137143
run: |
@@ -148,8 +154,8 @@ jobs:
148154
id: analyze
149155
with:
150156
project_group: ${{ github.event.repository.name }}
151-
ci_commit_ref_name: ${{ github.event.pull_request.head.ref || github.ref_name }}
152-
ci_commit_hash: ${{ github.event.pull_request.head.sha || github.sha }}
157+
ci_commit_ref_name: ${{ needs.set_vars.outputs.checkout_tag }}
158+
ci_commit_hash: ${{ needs.set_vars.outputs.checkout_sha }}
153159
svace_analyze_host: "${{ secrets.SVACE_ANALYZE_HOST }}"
154160
svace_analyze_ssh_user: "${{ secrets.SVACE_ANALYZE_SSH_USER }}"
155161
svacer_url: "${{ secrets.SVACER_URL }}"
@@ -160,6 +166,8 @@ jobs:
160166
notify:
161167
name: Notify Loop
162168
runs-on: ubuntu-latest
169+
env:
170+
CHECKOUT_TAG: ${{needs.set_vars.outputs.checkout_tag}}
163171
needs:
164172
- set_vars
165173
- dev_setup_build
@@ -177,7 +185,7 @@ jobs:
177185
MESSAGE="
178186
### :gear: **DVP $DATE Weekly Svace Analyze Report**
179187
180-
**Branch:** \`$GITHUB_REF_NAME\`
188+
**Branch:** \`$CHECKOUT_TAG\`
181189
**Status: ${STATUS}**
182190
183191
[:link: GitHub Actions Output]($GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID)

0 commit comments

Comments
 (0)