From faabf97bfb7f4021cc40b32d6c583ce2e039d3be Mon Sep 17 00:00:00 2001 From: hudeng Date: Wed, 19 Apr 2023 09:26:06 +0800 Subject: [PATCH 1/8] chore(CI): use peeweep-test organization workflow because of deepin-community aciton was disabled by github support team --- .github/workflows/auto-intergration.yml | 34 ++++++++++++------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/auto-intergration.yml b/.github/workflows/auto-intergration.yml index ef82f62e4..2b7d3bfe3 100644 --- a/.github/workflows/auto-intergration.yml +++ b/.github/workflows/auto-intergration.yml @@ -16,13 +16,13 @@ env: jobs: parsec_intergration: - uses: deepin-community/Repository-Integration/.github/workflows/01-parsec-intergration.yml@master + uses: peeweep-test/Repository-Integration/.github/workflows/01-parsec-intergration.yml@master ouput_message: name: output intergration needs: parsec_intergration if: ${{ github.event.pull_request.head.sha }} - uses: deepin-community/Repository-Integration/.github/workflows/02-intergration-output.yml@master + uses: peeweep-test/Repository-Integration/.github/workflows/02-intergration-output.yml@master build_project_prepare: name: build project prepare @@ -37,7 +37,7 @@ jobs: set -x result=$(curl -u golf66:$OSCPASS "https://build.deepin.com/source/deepin:CI:TestingIntegration:$TOPIC/_meta"|grep "unknown_project") if [ "$result" != "" ];then - curl -o meta.xml https://raw.githubusercontent.com/deepin-community/Repository-Integration/master/.github/workflows/obs-proj-meta.tpl + curl -o meta.xml https://raw.githubusercontent.com/peeweep-test/Repository-Integration/master/.github/workflows/obs-proj-meta.tpl sed -i "s#TOPIC#${TOPIC}#g" meta.xml curl -X PUT -u golf66:$OSCPASS -H "Content-type: text/xml" -d @meta.xml "https://build.deepin.com/source/deepin:CI:TestingIntegration:$TOPIC/_meta" fi @@ -105,7 +105,7 @@ jobs: (needs.build-order-7.result == 'success' || needs.build-order-7.result == 'skipped') && (needs.build-order-8.result == 'success' || needs.build-order-8.result == 'skipped') && (needs.build-order-9.result == 'success' || needs.build-order-9.result == 'skipped') - uses: deepin-community/Repository-Integration/.github/workflows/issue-project-manager.yml@master + uses: peeweep-test/Repository-Integration/.github/workflows/issue-project-manager.yml@master secrets: inherit with: repo: linuxdeepin/developer-center @@ -141,7 +141,7 @@ jobs: - build-order-8 - build-order-9 - create_issue_link_project - uses: deepin-community/Repository-Integration/.github/workflows/04-auto-test.yml@master + uses: peeweep-test/Repository-Integration/.github/workflows/04-auto-test.yml@master if: | always() && !cancelled() && (needs.parsec_intergration.result == 'success') && (needs.ouput_message.result != 'failure' ) && @@ -177,7 +177,7 @@ jobs: - build-order-8 - build-order-9 - auto-test - uses: deepin-community/Repository-Integration/.github/workflows/05-merge-into-testing.yml@master + uses: peeweep-test/Repository-Integration/.github/workflows/05-merge-into-testing.yml@master secrets: inherit if: | always() && !cancelled() && @@ -206,7 +206,7 @@ jobs: - deploy-repo - parsec_intergration if: always() && !cancelled() && (needs.deploy-repo.result == 'success') - uses: deepin-community/Repository-Integration/.github/workflows/06-deployed.yml@master + uses: peeweep-test/Repository-Integration/.github/workflows/06-deployed.yml@master secrets: inherit with: intergrations: ${{ needs.parsec_intergration.outputs.all_build_task }} @@ -221,7 +221,7 @@ jobs: strategy: fail-fast: false matrix: ${{ fromJson(needs.parsec_intergration.outputs.build_matrix_0) }} - uses: deepin-community/Repository-Integration/.github/workflows/02-build-obs.yml@master + uses: peeweep-test/Repository-Integration/.github/workflows/02-build-obs.yml@master secrets: inherit with: repo: ${{ matrix.payload.repo }} @@ -237,7 +237,7 @@ jobs: strategy: fail-fast: false matrix: ${{ fromJson(needs.parsec_intergration.outputs.build_matrix_1) }} - uses: deepin-community/Repository-Integration/.github/workflows/02-build-obs.yml@master + uses: peeweep-test/Repository-Integration/.github/workflows/02-build-obs.yml@master secrets: inherit with: repo: ${{ matrix.payload.repo }} @@ -253,7 +253,7 @@ jobs: strategy: fail-fast: false matrix: ${{ fromJson(needs.parsec_intergration.outputs.build_matrix_2) }} - uses: deepin-community/Repository-Integration/.github/workflows/02-build-obs.yml@master + uses: peeweep-test/Repository-Integration/.github/workflows/02-build-obs.yml@master secrets: inherit with: repo: ${{ matrix.payload.repo }} @@ -269,7 +269,7 @@ jobs: strategy: fail-fast: false matrix: ${{ fromJson(needs.parsec_intergration.outputs.build_matrix_3) }} - uses: deepin-community/Repository-Integration/.github/workflows/02-build-obs.yml@master + uses: peeweep-test/Repository-Integration/.github/workflows/02-build-obs.yml@master secrets: inherit with: repo: ${{ matrix.payload.repo }} @@ -285,7 +285,7 @@ jobs: strategy: fail-fast: false matrix: ${{ fromJson(needs.parsec_intergration.outputs.build_matrix_4) }} - uses: deepin-community/Repository-Integration/.github/workflows/02-build-obs.yml@master + uses: peeweep-test/Repository-Integration/.github/workflows/02-build-obs.yml@master secrets: inherit with: repo: ${{ matrix.payload.repo }} @@ -302,7 +302,7 @@ jobs: strategy: fail-fast: false matrix: ${{ fromJson(needs.parsec_intergration.outputs.build_matrix_5) }} - uses: deepin-community/Repository-Integration/.github/workflows/02-build-obs.yml@master + uses: peeweep-test/Repository-Integration/.github/workflows/02-build-obs.yml@master secrets: inherit with: repo: ${{ matrix.payload.repo }} @@ -318,7 +318,7 @@ jobs: strategy: fail-fast: false matrix: ${{ fromJson(needs.parsec_intergration.outputs.build_matrix_6) }} - uses: deepin-community/Repository-Integration/.github/workflows/02-build-obs.yml@master + uses: peeweep-test/Repository-Integration/.github/workflows/02-build-obs.yml@master secrets: inherit with: repo: ${{ matrix.payload.repo }} @@ -334,7 +334,7 @@ jobs: strategy: fail-fast: false matrix: ${{ fromJson(needs.parsec_intergration.outputs.build_matrix_7) }} - uses: deepin-community/Repository-Integration/.github/workflows/02-build-obs.yml@master + uses: peeweep-test/Repository-Integration/.github/workflows/02-build-obs.yml@master secrets: inherit with: repo: ${{ matrix.payload.repo }} @@ -350,7 +350,7 @@ jobs: strategy: fail-fast: false matrix: ${{ fromJson(needs.parsec_intergration.outputs.build_matrix_8) }} - uses: deepin-community/Repository-Integration/.github/workflows/02-build-obs.yml@master + uses: peeweep-test/Repository-Integration/.github/workflows/02-build-obs.yml@master secrets: inherit with: repo: ${{ matrix.payload.repo }} @@ -366,7 +366,7 @@ jobs: strategy: fail-fast: false matrix: ${{ fromJson(needs.parsec_intergration.outputs.build_matrix_9) }} - uses: deepin-community/Repository-Integration/.github/workflows/02-build-obs.yml@master + uses: peeweep-test/Repository-Integration/.github/workflows/02-build-obs.yml@master secrets: inherit with: repo: ${{ matrix.payload.repo }} From 7864c97381c60f37e8bf565107c573f1f2c49dd9 Mon Sep 17 00:00:00 2001 From: hudeng Date: Wed, 19 Apr 2023 09:42:02 +0800 Subject: [PATCH 2/8] fix(CI): issue comment incorrect --- .github/workflows/issue-project-manager.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/issue-project-manager.yml b/.github/workflows/issue-project-manager.yml index 05f1df503..5582fa5be 100644 --- a/.github/workflows/issue-project-manager.yml +++ b/.github/workflows/issue-project-manager.yml @@ -387,7 +387,7 @@ jobs: let COMMENT_BODY = "" COMMENT_BODY += "Deepin Testing Integration Project Manager Info\n" - COMMENT_BODY += "Link to https://github.com/deepin-community/Repository-Integration/pull/" + context.issue.number + "\n" + COMMENT_BODY += "Link to https://github.com/" + context.issue.owner +"/Repository-Integration/pull/" + context.issue.number + "\n" if ( issueid != "undefined" ) { const response = await github.rest.issues.listComments({ From 764dbaee04984c41c938054c3325a945a4575ba6 Mon Sep 17 00:00:00 2001 From: hudeng Date: Fri, 21 Apr 2023 14:25:58 +0800 Subject: [PATCH 3/8] fix(CI): integration msg template error --- intergration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intergration.yml b/intergration.yml index 0e614da93..ccfd46679 100644 --- a/intergration.yml +++ b/intergration.yml @@ -1,6 +1,6 @@ # Required message: | - Integrated for 23 V23-Bata + Integrated for V23-Beta # Not required, now default is V23-Beta milestone: V23-Beta # Required From 2c288daac2e74e33ee34477fca6cb8560237bb5e Mon Sep 17 00:00:00 2001 From: LIChengGang <43427321+Zeno-sole@users.noreply.github.com> Date: Wed, 26 Apr 2023 09:49:47 +0800 Subject: [PATCH 4/8] Update 07-sync-intergration-info.yml Signed-off-by: LIChengGang <43427321+Zeno-sole@users.noreply.github.com> --- .github/workflows/07-sync-intergration-info.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/07-sync-intergration-info.yml b/.github/workflows/07-sync-intergration-info.yml index 0e0cdef0e..b654d4137 100644 --- a/.github/workflows/07-sync-intergration-info.yml +++ b/.github/workflows/07-sync-intergration-info.yml @@ -19,7 +19,7 @@ jobs: id: get-token uses: actions/github-script@v6 env: - APP_ID: 229710 + APP_ID: 164400 APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }} with: script: | From 922c3067167e4945d97c5d2a9fe6bec9a4fb7da6 Mon Sep 17 00:00:00 2001 From: hudeng Date: Fri, 28 Apr 2023 11:45:53 +0800 Subject: [PATCH 5/8] fix(CI): rename integration.yml --- intergration.yml => integration.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename intergration.yml => integration.yml (100%) diff --git a/intergration.yml b/integration.yml similarity index 100% rename from intergration.yml rename to integration.yml From 4c0ca44655b0f2bd41dd6ecbea9e3d231232439f Mon Sep 17 00:00:00 2001 From: hudeng Date: Fri, 28 Apr 2023 11:51:35 +0800 Subject: [PATCH 6/8] fix(CI): use secrets.APP_ID ensure correct app install id --- .github/workflows/06-deployed.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/06-deployed.yml b/.github/workflows/06-deployed.yml index 0064ac98b..392849df0 100644 --- a/.github/workflows/06-deployed.yml +++ b/.github/workflows/06-deployed.yml @@ -22,7 +22,7 @@ jobs: id: get-token uses: actions/github-script@v6 env: - APP_ID: 229710 + APP_ID: ${{ secrets.APP_ID }} APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }} with: script: | From d2a14dd8eec8cc5416eef5adbbbae1b0e6e047a4 Mon Sep 17 00:00:00 2001 From: hudeng Date: Fri, 28 Apr 2023 13:28:08 +0800 Subject: [PATCH 7/8] fix(CI): change integration workflow watch file --- ...rgration.yml => 01-parsec-integration.yml} | 32 +++++++------- .github/workflows/02-build-obs.yml | 2 +- ...n-output.yml => 02-integration-output.yml} | 8 ++-- .github/workflows/06-deployed.yml | 4 +- ...-info.yml => 07-sync-integration-info.yml} | 0 .github/workflows/README.md | 8 ++-- ...-intergration.yml => auto-integration.yml} | 42 +++++++++---------- .github/workflows/issue-project-manager.yml | 6 +-- integration.yml | 2 +- 9 files changed, 52 insertions(+), 52 deletions(-) rename .github/workflows/{01-parsec-intergration.yml => 01-parsec-integration.yml} (94%) rename .github/workflows/{02-intergration-output.yml => 02-integration-output.yml} (86%) rename .github/workflows/{07-sync-intergration-info.yml => 07-sync-integration-info.yml} (100%) rename .github/workflows/{auto-intergration.yml => auto-integration.yml} (92%) diff --git a/.github/workflows/01-parsec-intergration.yml b/.github/workflows/01-parsec-integration.yml similarity index 94% rename from .github/workflows/01-parsec-intergration.yml rename to .github/workflows/01-parsec-integration.yml index ff0ecc832..01541b292 100644 --- a/.github/workflows/01-parsec-intergration.yml +++ b/.github/workflows/01-parsec-integration.yml @@ -1,4 +1,4 @@ -name: parsec intergration +name: parsec integration on: workflow_call: @@ -39,28 +39,28 @@ on: deploy: description: deploy way AUTO or MANUALLY value: ${{ jobs.parsec_intergration.outputs.deploy }} - intergration_message: - description: intergration message at intergration.yml - value: ${{ jobs.parsec_intergration.outputs.intergration_message }} + integration_message: + description: integration message at integration.yml + value: ${{ jobs.parsec_integration.outputs.intergration_message }} component: - description: intergration repos component + description: integration repos component value: ${{ jobs.parsec_intergration.outputs.component }} intergrationinfo: - description: intergration repos list + description: integration repos list value: ${{ jobs.parsec_intergration.outputs.intergrationinfo }} changelog: - description: intergration pacakge changelog + description: integration pacakge changelog value: ${{ jobs.parsec_intergration.outputs.changelog }} influence: - description: intergration package for test influence information + description: integration package for test influence information value: ${{ jobs.parsec_intergration.outputs.influence }} milestone: - description: intergration milestone + description: integration milestone value: ${{ jobs.parsec_intergration.outputs.milestone }} jobs: parsec_intergration: - name: parsec intergration + name: parsec integration runs-on: ubuntu-latest outputs: build_matrix_0: ${{ steps.parsec_intergration.outputs.build_matrix_0 }} @@ -118,7 +118,7 @@ jobs: } def read_intergration(): - with open("intergration.yml", "r+") as intergration_file: + with open("integration.yml", "r+") as intergration_file: return yaml.load(intergration_file, Loader=yaml.BaseLoader) def check_tag_exsist(repo, tag): @@ -181,7 +181,7 @@ jobs: message = data.get("message", "") set_output("intergration_message", message) - with open("intergration-${{ github.event.number }}-detail.md", "w+") as intergration_detail: + with open("integration-${{ github.event.number }}-detail.md", "w+") as intergration_detail: intergration_detail.write(message) intergrationInfos = ["包名 | 版本", "-- | --"] @@ -263,7 +263,7 @@ jobs: } if ( illegal_repos !== undefined ) { - COMMENT_BODY += "Listed repos are not allowed by automatic intergration: \n|repo|\n|-|\n" + COMMENT_BODY += "Listed repos are not allowed by automatic integration: \n|repo|\n|-|\n" illegal_repos.forEach(repo => { COMMENT_BODY += "|" + repo + "|\n" }) @@ -379,8 +379,8 @@ jobs: //console.log(component) core.setOutput('component', component) - - name: upload intergration detail + - name: upload integration detail uses: actions/upload-artifact@v2 with: - name: intergration-${{ github.event.number }}-detail.md - path: intergration-${{ github.event.number }}-detail.md + name: integration-${{ github.event.number }}-detail.md + path: integration-${{ github.event.number }}-detail.md diff --git a/.github/workflows/02-build-obs.yml b/.github/workflows/02-build-obs.yml index 1b3d64978..e91d0e7e5 100644 --- a/.github/workflows/02-build-obs.yml +++ b/.github/workflows/02-build-obs.yml @@ -69,7 +69,7 @@ jobs: fi echo "component=$component" >> $GITHUB_OUTPUT - - name: obs intergration topic project prepare + - name: obs integration topic project prepare run: | set +e set -x diff --git a/.github/workflows/02-intergration-output.yml b/.github/workflows/02-integration-output.yml similarity index 86% rename from .github/workflows/02-intergration-output.yml rename to .github/workflows/02-integration-output.yml index 8761d17c0..387dac443 100644 --- a/.github/workflows/02-intergration-output.yml +++ b/.github/workflows/02-integration-output.yml @@ -9,10 +9,10 @@ jobs: runs-on: ubuntu-latest steps: - - name: download intergration detail + - name: download integration detail uses: actions/download-artifact@v2 with: - name: intergration-${{ github.event.number }}-detail.md + name: integration-${{ github.event.number }}-detail.md - name: create comment uses: actions/github-script@v6 @@ -20,12 +20,12 @@ jobs: github-token: ${{ github.token }} script: | const fs = require('fs'); - let rawdata = fs.readFileSync('intergration-${{ github.event.number }}-detail.md'); + let rawdata = fs.readFileSync('integration-${{ github.event.number }}-detail.md'); let message = rawdata.toString(); if (message.includes("CVE")) { message += "\n @deepin-community/ci CVE detected\n" } - const BOT_NAME = "INTERGRATION Bot" + const BOT_NAME = "INTEGRATION Bot" const COMMENT_HEAD = "**" + BOT_NAME + "**\n\n" const COMMENT_BODY = "Integration Details: " + message const response = await github.rest.issues.listComments({ diff --git a/.github/workflows/06-deployed.yml b/.github/workflows/06-deployed.yml index 392849df0..cc0d6e525 100644 --- a/.github/workflows/06-deployed.yml +++ b/.github/workflows/06-deployed.yml @@ -3,7 +3,7 @@ name: deployed feedback on: workflow_call: inputs: - intergrations: + integrations: required: true type: string @@ -51,7 +51,7 @@ jobs: github-token: ${{ steps.get-token.outputs.app_token }} script: | const yaml = require('js-yaml'); - const newIntergrated = ${{ inputs.intergrations }} + const newIntergrated = ${{ inputs.integrations }} const {data} = await github.rest.repos.getContent({ owner: context.repo.owner, repo: context.repo.repo, diff --git a/.github/workflows/07-sync-intergration-info.yml b/.github/workflows/07-sync-integration-info.yml similarity index 100% rename from .github/workflows/07-sync-intergration-info.yml rename to .github/workflows/07-sync-integration-info.yml diff --git a/.github/workflows/README.md b/.github/workflows/README.md index 3e5a4ed74..f77854605 100644 --- a/.github/workflows/README.md +++ b/.github/workflows/README.md @@ -1,17 +1,17 @@ # 集成工作说明 总体框架 -auto-intergration.yml +auto-integration.yml 总体顺序 parsec_intergration -> build -> auto test -> merge topic -> update record -> close pr 构建时更具自定义的优先级,相同优先级并发构建,不同优先级先后构建.当前一共提供了10个优先级. -01-parsec-intergration.yml +01-parsec-integration.yml 为解析集成工作流 主要为对intergration.yml文件的解析,检查并提取集成仓库,tag以及构建顺序.提取集成说明并生成md artifact. -02-intergration-output.yml +02-integration-output.yml 与build并行运行,主要根据上面的解析结果输出相关信息到pr中, 02-build-jenkins.yml @@ -27,7 +27,7 @@ parsec_intergration -> build -> auto test -> merge topic -> update record -> clo 06-deployed.yml 更新记录并标记此集成已被集成,并关闭pr -07-sync-intergration-info.yml +07-sync-integration-info.yml 处理pr评论中包含的集成信息，格式列子如下： repo: linuxdeepin/deepin-system-monitor diff --git a/.github/workflows/auto-intergration.yml b/.github/workflows/auto-integration.yml similarity index 92% rename from .github/workflows/auto-intergration.yml rename to .github/workflows/auto-integration.yml index 2b7d3bfe3..5521ad6cd 100644 --- a/.github/workflows/auto-intergration.yml +++ b/.github/workflows/auto-integration.yml @@ -1,9 +1,9 @@ -name: intergration-request +name: integration-request on: #[push] pull_request_target: paths: - - "intergration.yml" + - "integration.yml" types: [ opened, synchronize ] concurrency: @@ -11,18 +11,18 @@ concurrency: cancel-in-progress: true env: - TOPIC: test-intergration-pr-${{ github.event.number }} + TOPIC: test-integration-pr-${{ github.event.number }} OSCPASS: ${{ secrets.OSCPASS }} jobs: parsec_intergration: - uses: peeweep-test/Repository-Integration/.github/workflows/01-parsec-intergration.yml@master + uses: peeweep-test/Repository-Integration/.github/workflows/01-parsec-integration.yml@master ouput_message: - name: output intergration + name: output integration needs: parsec_intergration if: ${{ github.event.pull_request.head.sha }} - uses: peeweep-test/Repository-Integration/.github/workflows/02-intergration-output.yml@master + uses: peeweep-test/Repository-Integration/.github/workflows/02-integration-output.yml@master build_project_prepare: name: build project prepare @@ -31,7 +31,7 @@ jobs: issueid: ${{ steps.find-comments.outputs.issueid }} projectItemID: ${{ steps.find-comments.outputs.projectItemID }} steps: - - name: obs intergration topic project prepare + - name: obs integration topic project prepare run: | set +e set -x @@ -119,7 +119,7 @@ jobs: intergrationinfo: ${{ needs.parsec_intergration.outputs.intergrationinfo }} changelog: ${{ needs.parsec_intergration.outputs.changelog }} influence: ${{ needs.parsec_intergration.outputs.influence }} - testrepoaddr: " deb [trusted=yes] https://ci.deepin.com/repo/obs/deepin:/CI:/TestingIntegration:/test-intergration-pr-${{ github.event.number }}/testing/ ./" + testrepoaddr: " deb [trusted=yes] https://ci.deepin.com/repo/obs/deepin:/CI:/TestingIntegration:/test-integration-pr-${{ github.event.number }}/testing/ ./" # https://github.com/actions/runner/issues/491#issuecomment-850884422 reason why use this if # :( for this @@ -156,7 +156,7 @@ jobs: (needs.build-order-8.result == 'success' || needs.build-order-8.result == 'skipped') && (needs.build-order-9.result == 'success' || needs.build-order-9.result == 'skipped') with: - topic: test-intergration-pr-${{ github.event.number }} + topic: test-integration-pr-${{ github.event.number }} packages: ${{ needs.parsec_intergration.outputs.all_build_task }} deploy: ${{ needs.parsec_intergration.outputs.deploy }} @@ -194,7 +194,7 @@ jobs: (needs.build-order-9.result == 'success' || needs.build-order-9.result == 'skipped') && (needs.auto-test.result == 'success') with: - topic: test-intergration-pr-${{ github.event.number }} + topic: test-integration-pr-${{ github.event.number }} deploy: "TestingRepoReviewer" component: ${{ needs.parsec_intergration.outputs.component }} message: ${{ needs.parsec_intergration.outputs.intergration_message }} @@ -209,7 +209,7 @@ jobs: uses: peeweep-test/Repository-Integration/.github/workflows/06-deployed.yml@master secrets: inherit with: - intergrations: ${{ needs.parsec_intergration.outputs.all_build_task }} + integrations: ${{ needs.parsec_intergration.outputs.all_build_task }} # ten level build task build-order-0: @@ -227,7 +227,7 @@ jobs: repo: ${{ matrix.payload.repo }} tag: ${{ matrix.payload.tag }} tagsha: ${{ matrix.payload.tagsha }} - topic: test-intergration-pr-${{ github.event.number }} + topic: test-integration-pr-${{ github.event.number }} build-order-1: if: always() && !cancelled() && (needs.parsec_intergration.outputs.build_matrix_1 != '') && (needs.parsec_intergration.result == 'success') @@ -243,7 +243,7 @@ jobs: repo: ${{ matrix.payload.repo }} tag: ${{ matrix.payload.tag }} tagsha: ${{ matrix.payload.tagsha }} - topic: test-intergration-pr-${{ github.event.number }} + topic: test-integration-pr-${{ github.event.number }} build-order-2: if: always() && !cancelled() && ( needs.parsec_intergration.outputs.build_matrix_2 != '') && (needs.parsec_intergration.result == 'success') @@ -259,7 +259,7 @@ jobs: repo: ${{ matrix.payload.repo }} tag: ${{ matrix.payload.tag }} tagsha: ${{ matrix.payload.tagsha }} - topic: test-intergration-pr-${{ github.event.number }} + topic: test-integration-pr-${{ github.event.number }} build-order-3: if: always() && !cancelled() && ( needs.parsec_intergration.outputs.build_matrix_3 != '') && (needs.parsec_intergration.result == 'success') @@ -275,7 +275,7 @@ jobs: repo: ${{ matrix.payload.repo }} tag: ${{ matrix.payload.tag }} tagsha: ${{ matrix.payload.tagsha }} - topic: test-intergration-pr-${{ github.event.number }} + topic: test-integration-pr-${{ github.event.number }} build-order-4: if: always() && !cancelled() && ( needs.parsec_intergration.outputs.build_matrix_4 != '') && (needs.parsec_intergration.result == 'success') @@ -291,7 +291,7 @@ jobs: repo: ${{ matrix.payload.repo }} tag: ${{ matrix.payload.tag }} tagsha: ${{ matrix.payload.tagsha }} - topic: test-intergration-pr-${{ github.event.number }} + topic: test-integration-pr-${{ github.event.number }} build-order-5: name: build-order-5 @@ -308,7 +308,7 @@ jobs: repo: ${{ matrix.payload.repo }} tag: ${{ matrix.payload.tag }} tagsha: ${{ matrix.payload.tagsha }} - topic: test-intergration-pr-${{ github.event.number }} + topic: test-integration-pr-${{ github.event.number }} build-order-6: if: always() && !cancelled() && ( needs.parsec_intergration.outputs.build_matrix_6 != '') && (needs.parsec_intergration.result == 'success') @@ -324,7 +324,7 @@ jobs: repo: ${{ matrix.payload.repo }} tag: ${{ matrix.payload.tag }} tagsha: ${{ matrix.payload.tagsha }} - topic: test-intergration-pr-${{ github.event.number }} + topic: test-integration-pr-${{ github.event.number }} build-order-7: if: always() && !cancelled() && ( needs.parsec_intergration.outputs.build_matrix_7 != '') && (needs.parsec_intergration.result == 'success') @@ -340,7 +340,7 @@ jobs: repo: ${{ matrix.payload.repo }} tag: ${{ matrix.payload.tag }} tagsha: ${{ matrix.payload.tagsha }} - topic: test-intergration-pr-${{ github.event.number }} + topic: test-integration-pr-${{ github.event.number }} build-order-8: if: always() && !cancelled() && ( needs.parsec_intergration.outputs.build_matrix_8 != '') && (needs.parsec_intergration.result == 'success') @@ -356,7 +356,7 @@ jobs: repo: ${{ matrix.payload.repo }} tag: ${{ matrix.payload.tag }} tagsha: ${{ matrix.payload.tagsha }} - topic: test-intergration-pr-${{ github.event.number }} + topic: test-integration-pr-${{ github.event.number }} build-order-9: if: always() && !cancelled() && ( needs.parsec_intergration.outputs.build_matrix_9 != '') && (needs.parsec_intergration.result == 'success') @@ -372,4 +372,4 @@ jobs: repo: ${{ matrix.payload.repo }} tag: ${{ matrix.payload.tag }} tagsha: ${{ matrix.payload.tagsha }} - topic: test-intergration-pr-${{ github.event.number }} + topic: test-integration-pr-${{ github.event.number }} diff --git a/.github/workflows/issue-project-manager.yml b/.github/workflows/issue-project-manager.yml index 5582fa5be..b122781c9 100644 --- a/.github/workflows/issue-project-manager.yml +++ b/.github/workflows/issue-project-manager.yml @@ -308,7 +308,7 @@ jobs: echo 'ITEM_ID='$item_id >> $GITHUB_ENV fi - - name: Set fields(intergration status) + - name: Set fields(integration status) env: GITHUB_TOKEN: ${{ steps.deepin-bot.outputs.app_token }} run: | @@ -334,7 +334,7 @@ jobs: } }' -f project=$PROJECT_ID -f item=${{ env.ITEM_ID }} -f status_field=$STATUS_FIELD_ID -f status_value=${{ env.OPTION_ID }} --silent - - name: Link issue to intergration pr + - name: Link issue to integration pr uses: actions/github-script@v6 with: github-token: ${{ github.token }} @@ -373,7 +373,7 @@ jobs: } } - - name: Link intergration pr to issue + - name: Link integration pr to issue uses: actions/github-script@v6 with: github-token: ${{ steps.deepin-bot.outputs.app_token }} diff --git a/integration.yml b/integration.yml index ccfd46679..60e6dd238 100644 --- a/integration.yml +++ b/integration.yml @@ -12,6 +12,6 @@ repos: # Not required order: 0 # Not required, but need one of tag and tagsha info - # When use tag info, intergration workflow will check repository tag and build tag version + # When use tag info, integration workflow will check repository tag and build tag version # When use tagsha info, interation workflow will build tagsha version, It doesn't matter whether the tag exists. tagsha: "********************************" From 7455b55349e26d2b7c330a10e0f9bb55a0ab60cb Mon Sep 17 00:00:00 2001 From: hudeng-go Date: Tue, 27 Jun 2023 02:50:25 +0000 Subject: [PATCH 8/8] chore: Update integration.yml Signed-off-by: github-actions --- integration.yml | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/integration.yml b/integration.yml index 60e6dd238..2c0447eef 100644 --- a/integration.yml +++ b/integration.yml @@ -1,17 +1,7 @@ -# Required -message: | - Integrated for V23-Beta -# Not required, now default is V23-Beta -milestone: V23-Beta -# Required -repos: - # Required - - repo: linuxdeepin/examplerepo - # Not required - tag: 5.11.22 - # Not required +message: Integrated for V23-Beta2 +milestone: V23-Beta2 +repos: + - repo: peeweep-test/.github-1 order: 0 - # Not required, but need one of tag and tagsha info - # When use tag info, integration workflow will check repository tag and build tag version - # When use tagsha info, interation workflow will build tagsha version, It doesn't matter whether the tag exists. - tagsha: "********************************" + tagsha: e7981398e730dc5ff2ed5281de2aea7d15216ee5 +timestamp: 1687834224677