Skip to content

Commit a1cecd7

Browse files
hudeng-gohudeng-go
committed
fix(CI): covert array to string error when use github-scripts
covert array to string use join() insteadof str() log:
1 parent 39b9eda commit a1cecd7

File tree

4 files changed

+54
-44
lines changed

4 files changed

+54
-44
lines changed

‎.github/workflows/01-parsec-integration.yml‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ jobs:
9494
shell: python
9595
env:
9696
GITHUB_TOKEN: ${{ github.token }}
97-
PR_TITLE: ${{ github.event.issue.title }}
98-
PR_AUTHOR: ${{ github.event.issue.user.login }}
97+
PR_TITLE: ${{ github.event.pull_request.title }}
98+
PR_AUTHOR: ${{ github.event.pull_request.user.login }}
9999
run: |
100100
import requests
101101
import yaml
@@ -185,10 +185,10 @@ jobs:
185185
data = read_integration()
186186
187187
message = data.get("message", "Integrated for V23-Beta2")
188-
if message == "Integrated for V23-Beta2":
189-
message = os.environ.get("PR_TITLE")
188+
#if message == "Integrated for V23-Beta2":
189+
# message = os.environ.get("PR_TITLE")
190190
191-
message = message + " by " + os.environ.get("PR_AUTHOR")
191+
#message = message + " by " + os.environ.get("PR_AUTHOR")
192192
set_output("integration_message", message)
193193
with open("integration-${{ github.event.number }}-detail.md", "w+") as integration_detail:
194194
integration_detail.write(message)
@@ -218,13 +218,19 @@ jobs:
218218
if tagsha == "" and len(tagsha) <= 0 and tag == "" and len(tag) <= 0:
219219
illegalTags.append({"repo": fullreponame, "tag": tag, "tagsha": tagsha})
220220
allBuildTasks[order].get("data").get("payload").append(repo)
221-
integrationinfo = str(integrationInfos)
221+
integrationinfo = str("\n".join(integrationInfos))
222222
print("integrationinfo: " + integrationinfo)
223-
changelog = str(changelogs)
224-
influence = str(influences)
223+
changelog = str("\n".join(changelogs))
224+
influence = str("\n".join(influences))
225225
set_output("integrationinfo", integrationinfo)
226+
with open("integration-${{ github.event.number }}-integrationinfo.md", "w+") as f:
227+
f.write(integrationinfo)
226228
set_output("changelog", changelog)
229+
with open("integration-${{ github.event.number }}-changelog.md", "w+") as f:
230+
f.write(changelog)
227231
set_output("influence", influence)
232+
with open("integration-${{ github.event.number }}-influence.md", "w+") as f:
233+
f.write(influence)
228234
set_output("milestone", "V23-Beta2")
229235
if data.get('milestone', "") != "":
230236
set_output("milestone", data.get('milestone'))
@@ -393,7 +399,11 @@ jobs:
393399
core.setOutput('component', component)
394400
395401
- name: upload integration detail
396-
uses: actions/upload-artifact@v2
402+
uses: actions/upload-artifact@v3
397403
with:
398-
name: integration-${{ github.event.number }}-detail.md
399-
path: integration-${{ github.event.number }}-detail.md
404+
name: integration-archive-${{ github.event.number }}
405+
path: |
406+
integration-${{ github.event.number }}-detail.md
407+
integration-${{ github.event.number }}-integrationinfo.md
408+
integration-${{ github.event.number }}-changelog.md
409+
integration-${{ github.event.number }}-influence.md

‎.github/workflows/02-integration-output.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ jobs:
1010
steps:
1111

1212
- name: download integration detail
13-
uses: actions/download-artifact@v2
13+
uses: actions/download-artifact@v3
1414
with:
15-
name: integration-${{ github.event.number }}-detail.md
15+
name: integration-archive-${{ github.event.number }}
1616

1717
- name: create comment
1818
uses: actions/github-script@v6

‎.github/workflows/auto-integration.yml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ env:
1616

1717
jobs:
1818
parsec_integration:
19-
uses: deepin-community/Repository-Integration/.github/workflows/01-parsec-integration.yml@master
19+
uses: peeweep-test/Repository-Integration/.github/workflows/01-parsec-integration.yml@master
2020

2121
ouput_message:
2222
name: output integration
2323
needs: parsec_integration
2424
if: ${{ github.event.pull_request.head.sha }}
25-
uses: deepin-community/Repository-Integration/.github/workflows/02-integration-output.yml@master
25+
uses: peeweep-test/Repository-Integration/.github/workflows/02-integration-output.yml@master
2626

2727
build_project_prepare:
2828
name: build project prepare
@@ -37,7 +37,7 @@ jobs:
3737
set -x
3838
result=$(curl -u golf66:$OSCPASS "https://build.deepin.com/source/deepin:CI:TestingIntegration:$TOPIC/_meta"|grep "unknown_project")
3939
if [ "$result" != "" ];then
40-
curl -o meta.xml https://raw.githubusercontent.com/deepin-community/Repository-Integration/master/.github/workflows/obs-proj-meta.tpl
40+
curl -o meta.xml https://raw.githubusercontent.com/peeweep-test/Repository-Integration/master/.github/workflows/obs-proj-meta.tpl
4141
sed -i "s#TOPIC#${TOPIC}#g" meta.xml
4242
curl -X PUT -u golf66:$OSCPASS -H "Content-type: text/xml" -d @meta.xml "https://build.deepin.com/source/deepin:CI:TestingIntegration:$TOPIC/_meta"
4343
fi
@@ -105,7 +105,7 @@ jobs:
105105
(needs.build-order-7.result == 'success' || needs.build-order-7.result == 'skipped') &&
106106
(needs.build-order-8.result == 'success' || needs.build-order-8.result == 'skipped') &&
107107
(needs.build-order-9.result == 'success' || needs.build-order-9.result == 'skipped')
108-
uses: deepin-community/Repository-Integration/.github/workflows/issue-project-manager.yml@master
108+
uses: peeweep-test/Repository-Integration/.github/workflows/issue-project-manager.yml@master
109109
secrets: inherit
110110
with:
111111
repo: linuxdeepin/developer-center
@@ -141,7 +141,7 @@ jobs:
141141
- build-order-8
142142
- build-order-9
143143
- create_issue_link_project
144-
uses: deepin-community/Repository-Integration/.github/workflows/04-auto-test.yml@master
144+
uses: peeweep-test/Repository-Integration/.github/workflows/04-auto-test.yml@master
145145
if: |
146146
always() && !cancelled() &&
147147
(needs.parsec_integration.result == 'success') && (needs.ouput_message.result != 'failure' ) &&
@@ -178,7 +178,7 @@ jobs:
178178
- build-order-8
179179
- build-order-9
180180
- auto-test
181-
uses: deepin-community/Repository-Integration/.github/workflows/05-merge-into-testing.yml@master
181+
uses: peeweep-test/Repository-Integration/.github/workflows/05-merge-into-testing.yml@master
182182
secrets: inherit
183183
if: |
184184
always() && !cancelled() &&
@@ -207,7 +207,7 @@ jobs:
207207
- deploy-repo
208208
- parsec_integration
209209
if: always() && !cancelled() && (needs.deploy-repo.result == 'success')
210-
uses: deepin-community/Repository-Integration/.github/workflows/06-deployed.yml@master
210+
uses: peeweep-test/Repository-Integration/.github/workflows/06-deployed.yml@master
211211
secrets: inherit
212212
with:
213213
integrations: ${{ needs.parsec_integration.outputs.all_build_task }}
@@ -222,7 +222,7 @@ jobs:
222222
strategy:
223223
fail-fast: false
224224
matrix: ${{ fromJson(needs.parsec_integration.outputs.build_matrix_0) }}
225-
uses: deepin-community/Repository-Integration/.github/workflows/02-build-obs.yml@master
225+
uses: peeweep-test/Repository-Integration/.github/workflows/02-build-obs.yml@master
226226
secrets: inherit
227227
with:
228228
repo: ${{ matrix.payload.repo }}
@@ -238,7 +238,7 @@ jobs:
238238
strategy:
239239
fail-fast: false
240240
matrix: ${{ fromJson(needs.parsec_integration.outputs.build_matrix_1) }}
241-
uses: deepin-community/Repository-Integration/.github/workflows/02-build-obs.yml@master
241+
uses: peeweep-test/Repository-Integration/.github/workflows/02-build-obs.yml@master
242242
secrets: inherit
243243
with:
244244
repo: ${{ matrix.payload.repo }}
@@ -254,7 +254,7 @@ jobs:
254254
strategy:
255255
fail-fast: false
256256
matrix: ${{ fromJson(needs.parsec_integration.outputs.build_matrix_2) }}
257-
uses: deepin-community/Repository-Integration/.github/workflows/02-build-obs.yml@master
257+
uses: peeweep-test/Repository-Integration/.github/workflows/02-build-obs.yml@master
258258
secrets: inherit
259259
with:
260260
repo: ${{ matrix.payload.repo }}
@@ -270,7 +270,7 @@ jobs:
270270
strategy:
271271
fail-fast: false
272272
matrix: ${{ fromJson(needs.parsec_integration.outputs.build_matrix_3) }}
273-
uses: deepin-community/Repository-Integration/.github/workflows/02-build-obs.yml@master
273+
uses: peeweep-test/Repository-Integration/.github/workflows/02-build-obs.yml@master
274274
secrets: inherit
275275
with:
276276
repo: ${{ matrix.payload.repo }}
@@ -286,7 +286,7 @@ jobs:
286286
strategy:
287287
fail-fast: false
288288
matrix: ${{ fromJson(needs.parsec_integration.outputs.build_matrix_4) }}
289-
uses: deepin-community/Repository-Integration/.github/workflows/02-build-obs.yml@master
289+
uses: peeweep-test/Repository-Integration/.github/workflows/02-build-obs.yml@master
290290
secrets: inherit
291291
with:
292292
repo: ${{ matrix.payload.repo }}
@@ -303,7 +303,7 @@ jobs:
303303
strategy:
304304
fail-fast: false
305305
matrix: ${{ fromJson(needs.parsec_integration.outputs.build_matrix_5) }}
306-
uses: deepin-community/Repository-Integration/.github/workflows/02-build-obs.yml@master
306+
uses: peeweep-test/Repository-Integration/.github/workflows/02-build-obs.yml@master
307307
secrets: inherit
308308
with:
309309
repo: ${{ matrix.payload.repo }}
@@ -319,7 +319,7 @@ jobs:
319319
strategy:
320320
fail-fast: false
321321
matrix: ${{ fromJson(needs.parsec_integration.outputs.build_matrix_6) }}
322-
uses: deepin-community/Repository-Integration/.github/workflows/02-build-obs.yml@master
322+
uses: peeweep-test/Repository-Integration/.github/workflows/02-build-obs.yml@master
323323
secrets: inherit
324324
with:
325325
repo: ${{ matrix.payload.repo }}
@@ -335,7 +335,7 @@ jobs:
335335
strategy:
336336
fail-fast: false
337337
matrix: ${{ fromJson(needs.parsec_integration.outputs.build_matrix_7) }}
338-
uses: deepin-community/Repository-Integration/.github/workflows/02-build-obs.yml@master
338+
uses: peeweep-test/Repository-Integration/.github/workflows/02-build-obs.yml@master
339339
secrets: inherit
340340
with:
341341
repo: ${{ matrix.payload.repo }}
@@ -351,7 +351,7 @@ jobs:
351351
strategy:
352352
fail-fast: false
353353
matrix: ${{ fromJson(needs.parsec_integration.outputs.build_matrix_8) }}
354-
uses: deepin-community/Repository-Integration/.github/workflows/02-build-obs.yml@master
354+
uses: peeweep-test/Repository-Integration/.github/workflows/02-build-obs.yml@master
355355
secrets: inherit
356356
with:
357357
repo: ${{ matrix.payload.repo }}
@@ -367,7 +367,7 @@ jobs:
367367
strategy:
368368
fail-fast: false
369369
matrix: ${{ fromJson(needs.parsec_integration.outputs.build_matrix_9) }}
370-
uses: deepin-community/Repository-Integration/.github/workflows/02-build-obs.yml@master
370+
uses: peeweep-test/Repository-Integration/.github/workflows/02-build-obs.yml@master
371371
secrets: inherit
372372
with:
373373
repo: ${{ matrix.payload.repo }}

‎.github/workflows/issue-project-manager.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,14 @@ jobs:
117117
});
118118
core.setOutput('app_token', token)
119119
120+
- name: Download integration files
121+
uses: actions/download-artifact@v3
122+
with:
123+
name: integration-archive-${{ github.event.number }}
124+
120125
- name: Handle issue
121126
id: issue
122-
uses: actions/github-script@v6
127+
uses: actions/github-script@v6.4.1
123128
with:
124129
github-token: ${{ steps.deepin-bot.outputs.app_token }}
125130
script: |
@@ -131,23 +136,18 @@ jobs:
131136
assignees = "${{ inputs.assignees }}".split(", ")
132137
milestonestr = "${{ inputs.milestone }}"
133138
status = "${{ inputs.status }}"
139+
testrepoaddr = "${{ inputs.testrepoaddr }}"
134140
135-
integrationinfo = ""
136-
if (Array.isArray(${{ inputs.integrationinfo }})) {
137-
integrationinfo = ${{ inputs.integrationinfo }}.join("\n")
138-
}
141+
let integrationinfodata = fs.readFileSync('integration-${{ github.event.number }}-integrationinfo.md');
142+
let integrationinfo = integrationinfodata.toString();
139143
console.log("integrationinfo: ", integrationinfo)
140-
testrepoaddr = "${{ inputs.testrepoaddr }}"
141-
changelog = ""
142-
if (Array.isArray(${{ inputs.changelog }})) {
143-
changelog = ${{ inputs.changelog }}.join("\n")
144-
}
144+
145+
let changelogdata = fs.readFileSync('integration-${{ github.event.number }}-changelog.md');
146+
let changelog = changelog.toString();
145147
console.log("changelog: ", changelog)
146148
suggestion = "${{ inputs.suggestion }}"
147-
influence = ""
148-
if (Array.isArray(${{ inputs.influence }})) {
149-
influence = ${{ inputs.influence }}.join("\n")
150-
}
149+
let influencedata = fs.readFileSync('integration-${{ github.event.number }}-influence.md');
150+
let influence = influencedata.toString();
151151
console.log("influence: ", influence)
152152
extrainfo = "${{ inputs.extrainfo }}"
153153

0 commit comments

Comments
 (0)