save

peeweep-test · Mar 7, 2024 · a4afbe0 · a4afbe0
1 parent bdcd306
commit a4afbe0
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 15 deletions.
diff --git a/.github/workflows/02-build-obs.yml b/.github/workflows/02-build-obs.yml
@@ -130,16 +130,23 @@ jobs:
           curl -o meta.xml https://raw.githubusercontent.com/deepin-community/Repository-Integration/master/.github/workflows/obs-pkg-meta.tpl
           sed -i "s#PKGNAME#${pkgname}#g" meta.xml
           targeturl="https://build.deepin.com/project/show/deepin:CI:TestingIntegration:${TOPIC}"
+          uploadurl="https://build.deepin.com/source/deepin:CI:TestingIntegration:${TOPIC}"
           if [ "$COMPONENT" = "main" ]; then
             sed -i "s#Testing:COMPONENT#CI:TestingIntegration:${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}/$pkgname/_meta"
-            osc co deepin:CI:TestingIntegration:${TOPIC}/${pkgname} && cd $_
+            # osc co deepin:CI:TestingIntegration:${TOPIC}/${pkgname} && cd $_
+            osc co deepin:CI:TestingIntegration:${TOPIC}/${pkgname} _branch_request || true
+            osc co deepin:CI:TestingIntegration:${TOPIC}/${pkgname} _service || true
             targeturl="https://build.deepin.com/package/live_build_log/deepin:CI:TestingIntegration:${TOPIC}/$pkgname/testing/"
+            uploadurl="https://build.deepin.com/source/deepin:CI:TestingIntegration:${TOPIC}/$pkgname"
           else
             sed -i "s#Testing:COMPONENT#CI:TestingIntegration:${TOPIC}:${COMPONENT}#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}:${COMPONENT}/$pkgname/_meta"
-            osc co deepin:CI:TestingIntegration:${TOPIC}:${COMPONENT}/${pkgname} && cd $_
+            # osc co deepin:CI:TestingIntegration:${TOPIC}:${COMPONENT}/${pkgname} && cd $_
+            osc co deepin:CI:TestingIntegration:${TOPIC}:${COMPONENT}/${pkgname} _branch_request || true
+            osc co deepin:CI:TestingIntegration:${TOPIC}:${COMPONENT}/${pkgname} _service || true
             targeturl="https://build.deepin.com/package/live_build_log/deepin:CI:TestingIntegration:${TOPIC}:${COMPONENT}/$pkgname/testing/"
+            uploadurl="https://build.deepin.com/source/deepin:CI:TestingIntegration:${TOPIC}:${COMPONENT}/$pkgname"
           fi
           echo "targeturl=$targeturl" >> $GITHUB_OUTPUT
 
@@ -149,15 +156,37 @@ jobs:
           fi
           if [ ! -f _service ];then
             curl -o _service https://raw.githubusercontent.com/deepin-community/Repository-Integration/master/.github/workflows/obs-pkg.tpl && \
-            sed -i "s#REPO#$REPO#g" _service && osc add _service && osc ci -m "init"
+            sed -i "s#REPO#$REPO#g" _service
+            curl -X PUT -u golf66:$OSCPASS -d @_service -s "$uploadurl/_service"
           fi
           if [ $needbuild = "true" ];then
             curl -o _branch_request https://raw.githubusercontent.com/deepin-community/Repository-Integration/master/.github/workflows/obs-br.tpl
             sed -i  "s#REPO#$REPO#g" _branch_request
             sed -i "s#TAGSHA#$TAGSHA#g" _branch_request
-            osc add _branch_request && osc ci -m "Update tag release: $TAGSHA"
+            # osc add _branch_request && osc ci -m "Update tag release: $TAGSHA"
+            curl -X PUT -u golf66:$OSCPASS -d @_branch_request -s "$uploadurl/_branch_request"
           else
             echo "$REPO source unchanged, skip!!!"
           fi
 
           echo "needbuild=$needbuild" >> $GITHUB_OUTPUT
+
+  log:
+    needs: build
+    strategy:
+      matrix:
+        arch: [aarch64, x86_64]
+
+    runs-on: ubuntu-latest
+    env:
+      ARCH: ${{ matrix.arch }}
+    steps:
+      - name: Set commit status as pending
+        if: ${{ needs.build.outputs.needbuild == 'true' }}
+        uses: myrotvorets/set-commit-status-action@master
+        with:
+          token: ${{ github.token }}
+          status: pending
+          context: "${{ needs.build.outputs.pkgname }}_${{ matrix.arch }}_testing_repository_building"
+          targetUrl: "${{ needs.build.outputs.targeturl }}${{ matrix.arch }}"
+          sha: ${{ github.event.pull_request.head.sha }}
diff --git 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
@@ -114,14 +114,18 @@ jobs:
 
             if ( context.issue.number != undefined ) {
               while (true) {
-                const { data: statuses } = await github.rest.repos.listCommitStatusesForRef({
+                const { data: statuses } = await github.rest.repos.getCombinedStatusForRef({
                   owner: context.repo.owner,
                   repo: context.repo.repo,
                   ref: "${{ github.event.pull_request.head.sha }}",
                 })
 
-                buildStatuses = statuses.filter((status) => status.context.includes("testing_repository_building"));
+                console.log("ref statuses:", statuses)
+                buildStatuses = [];
+                buildStatuses = statuses.statuses.filter((status) => status.context.includes("testing_repository_building"));
+                console.log("ref build statuses:", buildStatuses)
                 const successStatuses = buildStatuses.filter((status) => status.state === "success");
+                console.log("ref success statuses:", successStatuses)
                 if (successStatuses.length == buildStatuses.length) {
                   console.log(`All build commit statuses is now a success.`);
                   break;
@@ -156,7 +160,7 @@ jobs:
       (needs.build_dde.result == 'success' || needs.build_dde.result == 'skipped') &&
       (needs.build_community.result == 'success' || needs.build_community.result == 'skipped') &&
       needs.wait_build_pending_status != 'failure'
-    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
@@ -179,7 +183,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')
@@ -197,7 +201,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 }}
@@ -212,7 +216,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 }}
@@ -229,7 +233,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 }}
@@ -247,7 +251,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 }}