Skip to content

Commit 24de117

Browse files
universal-itengineeruniversal-itengineer
authored
fix(ci): fix variable for module tag (#1033)
Signed-off-by: Nikita Korolev <nikita.korolev@flant.com>
1 parent 0394abd commit 24de117

3 files changed

Lines changed: 33 additions & 21 deletions

File tree

‎.github/workflows/dev_module_build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ jobs:
360360
with:
361361
module_source: ${{ vars.DEV_MODULE_SOURCE}}
362362
module_name: ${{ vars.MODULE_NAME }}
363-
module_tag: "$MODULES_MODULE_TAG"
363+
module_tag: ${{needs.set_vars.outputs.modules_module_tag}}
364364

365365
pull_request_info:
366366
name: Get PR info

‎.github/workflows/release_module_build-and-registration.yml‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,12 @@ jobs:
4444
name: Build and Push CE
4545
steps:
4646
- name: SET VAR
47+
id: set_vars
4748
run: |
4849
echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/ce/modules" >> "$GITHUB_ENV"
50+
echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/ce/modules" >> "$GITHUB_OUTPUT"
4951
echo "MODULE_EDITION=CE" >> "$GITHUB_ENV"
52+
echo "MODULE_EDITION=CE" >> "$GITHUB_OUTPUT"
5053
- run: |
5154
echo $MODULES_REGISTRY
5255
echo $MODULES_MODULE_NAME
@@ -74,19 +77,22 @@ jobs:
7477

7578
- uses: deckhouse/modules-actions/build@v2
7679
with:
77-
module_source: "$MODULES_MODULE_SOURCE"
80+
module_source: ${{ steps.set_vars.outputs.MODULES_MODULE_SOURCE }}
7881
module_name: ${{ vars.MODULE_NAME }}
79-
module_tag: "$MODULES_MODULE_TAG"
82+
module_tag: ${{ github.ref_name }}
8083
secondary_repo: "${{ vars.DEV_MODULE_SOURCE }}/${{ vars.MODULE_NAME }}"
8184

8285
prod_ee_setup_build:
8386
runs-on: [self-hosted, large]
8487
name: Build and Push EE
8588
steps:
8689
- name: SET VAR
90+
id: set_vars
8791
run: |
8892
echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/ee/modules" >> "$GITHUB_ENV"
93+
echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/ee/modules" >> "$GITHUB_OUTPUT"
8994
echo "MODULE_EDITION=EE" >> "$GITHUB_ENV"
95+
echo "MODULE_EDITION=EE" >> "$GITHUB_OUTPUT"
9096
- run: |
9197
echo $MODULES_REGISTRY
9298
echo $MODULES_MODULE_NAME
@@ -114,9 +120,9 @@ jobs:
114120

115121
- uses: deckhouse/modules-actions/build@v2
116122
with:
117-
module_source: "$MODULES_MODULE_SOURCE"
123+
module_source: ${{ steps.set_vars.outputs.MODULES_MODULE_SOURCE }}
118124
module_name: ${{ vars.MODULE_NAME }}
119-
module_tag: "$MODULES_MODULE_TAG"
125+
module_tag: ${{ github.ref_name }}
120126
secondary_repo: "${{ vars.DEV_MODULE_SOURCE }}/${{ vars.MODULE_NAME }}"
121127

122128
prod_se_plus_setup_build:
@@ -125,9 +131,12 @@ jobs:
125131
name: Build and Push SE Plus
126132
steps:
127133
- name: SET VAR
134+
id: set_vars
128135
run: |
129136
echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/se-plus/modules" >> "$GITHUB_ENV"
137+
echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/se-plus/modules" >> "$GITHUB_OUTPUT"
130138
echo "MODULE_EDITION=EE" >> "$GITHUB_ENV"
139+
echo "MODULE_EDITION=EE" >> "$GITHUB_OUTPUT"
131140
- run: |
132141
echo $MODULES_REGISTRY
133142
echo $MODULES_MODULE_NAME
@@ -155,9 +164,9 @@ jobs:
155164

156165
- uses: deckhouse/modules-actions/build@v2
157166
with:
158-
module_source: "$MODULES_MODULE_SOURCE"
167+
module_source: ${{ steps.set_vars.outputs.MODULES_MODULE_SOURCE }}
159168
module_name: ${{ vars.MODULE_NAME }}
160-
module_tag: "$MODULES_MODULE_TAG"
169+
module_tag: ${{ github.ref_name }}
161170
secondary_repo: "${{ vars.DEV_MODULE_SOURCE }}/${{ vars.MODULE_NAME }}"
162171

163172
prod_fe_setup_build:
@@ -166,9 +175,12 @@ jobs:
166175
name: Build and Push FE
167176
steps:
168177
- name: SET VAR
178+
id: set_vars
169179
run: |
170180
echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/fe/modules" >> "$GITHUB_ENV"
181+
echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/fe/modules" >> "$GITHUB_OUTPUT"
171182
echo "MODULE_EDITION=EE" >> "$GITHUB_ENV"
183+
echo "MODULE_EDITION=EE" >> "$GITHUB_OUTPUT"
172184
- run: |
173185
echo $MODULES_REGISTRY
174186
echo $MODULES_MODULE_NAME
@@ -196,7 +208,7 @@ jobs:
196208

197209
- uses: deckhouse/modules-actions/build@v2
198210
with:
199-
module_source: "$MODULES_MODULE_SOURCE"
211+
module_source: ${{ steps.set_vars.outputs.MODULES_MODULE_SOURCE }}
200212
module_name: ${{ vars.MODULE_NAME }}
201-
module_tag: "$MODULES_MODULE_TAG"
213+
module_tag: ${{ github.ref_name }}
202214
secondary_repo: "${{ vars.DEV_MODULE_SOURCE }}/${{ vars.MODULE_NAME }}"

‎.github/workflows/release_module_release-channels.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
steps:
8080
- run: echo "CE"
8181
- name: SET VAR
82-
id: set_var
82+
id: set_vars
8383
run: |
8484
echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/ce/modules" >> "$GITHUB_ENV"
8585
echo "MODULE_EDITION=CE" >> "$GITHUB_ENV"
@@ -108,14 +108,14 @@ jobs:
108108
- if: ${{ github.event.inputs.enableBuild == 'true' }}
109109
uses: deckhouse/modules-actions/build@v2
110110
with:
111-
module_source: ${{ steps.set_var.outputs.MODULES_MODULE_SOURCE }}
111+
module_source: ${{ steps.set_vars.outputs.MODULES_MODULE_SOURCE }}
112112
module_name: ${{ vars.MODULE_NAME }}
113113
module_tag: ${{ github.event.inputs.tag }}
114114
secondary_repo: "${{ vars.DEV_MODULE_SOURCE }}/${{ vars.MODULE_NAME }}"
115115

116116
- uses: deckhouse/modules-actions/deploy@v2
117117
with:
118-
module_source: ${{ steps.set_var.outputs.MODULES_MODULE_SOURCE }}
118+
module_source: ${{ steps.set_vars.outputs.MODULES_MODULE_SOURCE }}
119119
module_name: ${{ vars.MODULE_NAME }}
120120
module_tag: ${{ github.event.inputs.tag }}
121121
release_channel: ${{ github.event.inputs.version }}
@@ -127,7 +127,7 @@ jobs:
127127
steps:
128128
- run: echo "EE"
129129
- name: SET VAR
130-
id: set_var
130+
id: set_vars
131131
run: |
132132
echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/ee/modules" >> "$GITHUB_ENV"
133133
echo "MODULE_EDITION=EE" >> "$GITHUB_ENV"
@@ -162,14 +162,14 @@ jobs:
162162
- if: ${{ github.event.inputs.enableBuild == 'true' }}
163163
uses: deckhouse/modules-actions/build@v2
164164
with:
165-
module_source: ${{ steps.set_var.outputs.MODULES_MODULE_SOURCE }}
165+
module_source: ${{ steps.set_vars.outputs.MODULES_MODULE_SOURCE }}
166166
module_name: ${{ vars.MODULE_NAME }}
167167
module_tag: ${{ github.event.inputs.tag }}
168168
secondary_repo: "${{ vars.DEV_MODULE_SOURCE }}/${{ vars.MODULE_NAME }}"
169169

170170
- uses: deckhouse/modules-actions/deploy@v2
171171
with:
172-
module_source: ${{ steps.set_var.outputs.MODULES_MODULE_SOURCE }}
172+
module_source: ${{ steps.set_vars.outputs.MODULES_MODULE_SOURCE }}
173173
module_name: ${{ vars.MODULE_NAME }}
174174
module_tag: ${{ github.event.inputs.tag }}
175175
release_channel: ${{ github.event.inputs.version }}
@@ -181,7 +181,7 @@ jobs:
181181
steps:
182182
- run: echo "SE Plus"
183183
- name: SET VAR
184-
id: set_var
184+
id: set_vars
185185
run: |
186186
echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/se-plus/modules" >> "$GITHUB_ENV"
187187
echo "MODULE_EDITION=EE" >> "$GITHUB_ENV"
@@ -210,14 +210,14 @@ jobs:
210210
- if: ${{ github.event.inputs.enableBuild == 'true' }}
211211
uses: deckhouse/modules-actions/build@v2
212212
with:
213-
module_source: ${{ steps.set_var.outputs.MODULES_MODULE_SOURCE }}
213+
module_source: ${{ steps.set_vars.outputs.MODULES_MODULE_SOURCE }}
214214
module_name: ${{ vars.MODULE_NAME }}
215215
module_tag: ${{ github.event.inputs.tag }}
216216
secondary_repo: "${{ vars.DEV_MODULE_SOURCE }}/${{ vars.MODULE_NAME }}"
217217

218218
- uses: deckhouse/modules-actions/deploy@v2
219219
with:
220-
module_source: ${{ steps.set_var.outputs.MODULES_MODULE_SOURCE }}
220+
module_source: ${{ steps.set_vars.outputs.MODULES_MODULE_SOURCE }}
221221
module_name: ${{ vars.MODULE_NAME }}
222222
module_tag: ${{ github.event.inputs.tag }}
223223
release_channel: ${{ github.event.inputs.version }}
@@ -229,7 +229,7 @@ jobs:
229229
steps:
230230
- run: echo "FE"
231231
- name: SET VAR
232-
id: set_var
232+
id: set_vars
233233
run: |
234234
echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/fe/modules" >> "$GITHUB_ENV"
235235
echo "MODULE_EDITION=EE" >> "$GITHUB_ENV"
@@ -262,14 +262,14 @@ jobs:
262262
- if: ${{ github.event.inputs.enableBuild == 'true' }}
263263
uses: deckhouse/modules-actions/build@v2
264264
with:
265-
module_source: ${{ steps.set_var.outputs.MODULES_MODULE_SOURCE }}
265+
module_source: ${{ steps.set_vars.outputs.MODULES_MODULE_SOURCE }}
266266
module_name: ${{ vars.MODULE_NAME }}
267267
module_tag: ${{ github.event.inputs.tag }}
268268
secondary_repo: "${{ vars.DEV_MODULE_SOURCE }}/${{ vars.MODULE_NAME }}"
269269

270270
- uses: deckhouse/modules-actions/deploy@v2
271271
with:
272-
module_source: ${{ steps.set_var.outputs.MODULES_MODULE_SOURCE }}
272+
module_source: ${{ steps.set_vars.outputs.MODULES_MODULE_SOURCE }}
273273
module_name: ${{ vars.MODULE_NAME }}
274274
module_tag: ${{ github.event.inputs.tag }}
275275
release_channel: ${{ github.event.inputs.version }}

0 commit comments

Comments
 (0)