From b238725f1ea2f09a5110e846746cc64bab685905 Mon Sep 17 00:00:00 2001 From: hudeng Date: Fri, 5 Jul 2024 15:17:05 +0800 Subject: [PATCH 1/2] for test --- .github/workflows/01-parsec-integration.yml | 2 +- .github/workflows/auto-integration.yml | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/01-parsec-integration.yml b/.github/workflows/01-parsec-integration.yml index 510e3b9a4..a6b54f7a4 100644 --- a/.github/workflows/01-parsec-integration.yml +++ b/.github/workflows/01-parsec-integration.yml @@ -198,7 +198,7 @@ jobs: return component try: - components = ["main", "dde", "community"] + components = ["main", "dde", "community", "commercial"] allBuildTasks = [{"component": j,"data":{"payload": []}} for j in components] data = read_integration() diff --git a/.github/workflows/auto-integration.yml b/.github/workflows/auto-integration.yml index d711af9a5..002a6d3c7 100644 --- a/.github/workflows/auto-integration.yml +++ b/.github/workflows/auto-integration.yml @@ -16,13 +16,13 @@ env: jobs: parsec_integration: - uses: deepin-community/Repository-Integration/.github/workflows/01-parsec-integration.yml@master + uses: peeweep-test/Repository-Integration/.github/workflows/01-parsec-integration.yml@master ouput_message: name: output integration needs: parsec_integration if: ${{ github.event.pull_request.head.sha }} - uses: deepin-community/Repository-Integration/.github/workflows/02-integration-output.yml@master + uses: peeweep-test/Repository-Integration/.github/workflows/02-integration-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 @@ -184,7 +184,7 @@ jobs: (needs.build_community.result == 'success' || needs.build_community.result == 'skipped') && (needs.build_commercial.result == 'success' || needs.build_commercial.result == 'skipped') && needs.wait_build_pending_status.result == 'success' - 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 @@ -207,7 +207,7 @@ jobs: - ouput_message - build_project_prepare - 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.create_issue_link_project.result == 'success') @@ -225,7 +225,7 @@ jobs: if: | always() && !cancelled() && (needs.pass_integration.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: integrations: ${{ needs.parsec_integration.outputs.all_build_task }} @@ -240,7 +240,7 @@ jobs: strategy: fail-fast: false matrix: ${{ fromJson(needs.parsec_integration.outputs.build_matrix_main) }} - 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 }} @@ -257,7 +257,7 @@ jobs: strategy: fail-fast: false matrix: ${{ fromJson(needs.parsec_integration.outputs.build_matrix_dde) }} - 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 }} @@ -275,7 +275,7 @@ jobs: strategy: fail-fast: false matrix: ${{ fromJson(needs.parsec_integration.outputs.build_matrix_community) }} - 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 }} @@ -293,7 +293,7 @@ jobs: strategy: fail-fast: false matrix: ${{ fromJson(needs.parsec_integration.outputs.build_matrix_ccommercial) }} - 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 9b8c10e7c268a974b9e5e671fdbbee48e364541b Mon Sep 17 00:00:00 2001 From: hudeng Date: Fri, 5 Jul 2024 15:20:52 +0800 Subject: [PATCH 2/2] test commercial --- integration.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/integration.yml b/integration.yml index a5ca371f1..49cbbc641 100644 --- a/integration.yml +++ b/integration.yml @@ -6,10 +6,10 @@ milestone: V23-Release # Required repos: # Required - - repo: linuxdeepin/examplerepo + - repo: linuxdeepin/treeland # Not required - tag: 5.11.22 + tag: 0.2.3 + gitaddr: git@github.com:linuxdeepin/treeland.git # 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: "********************************"