From 650323faeffe3265afb3edab23a83694d9fc1fbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E5=98=89=E4=B9=90?= <hanjiale@hljit.edu.cn>
Date: Mon, 29 Dec 2025 13:57:02 +0800
Subject: [PATCH] =?UTF-8?q?[Ohos]=20=E4=BB=85=E5=9C=A8push=E6=97=B6?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=8F=91=E5=B8=83=E6=93=8D=E4=BD=9C=EF=BC=8C?=
 =?UTF-8?q?=E9=81=BF=E5=85=8D=E6=B5=81=E6=B0=B4=E7=BA=BF=E8=BF=90=E8=A1=8C?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=20(#1718)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/ohos.yml | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ohos.yml b/.github/workflows/ohos.yml
index 246e6c4a..256223c2 100644
--- a/.github/workflows/ohos.yml
+++ b/.github/workflows/ohos.yml
@@ -143,13 +143,23 @@ jobs:
           ohrs artifact
           mv package.har easytier-ohrs.har
 
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: easytier-ohos
+          path: |
+            ./easytier-contrib/easytier-ohrs/easytier-ohrs.har
+            ./easytier-contrib/easytier-ohrs/dist/arm64-v8a/libeasytier_ohrs.so
+          retention-days: 5
+          if-no-files-found: error
+
       - name: Publish To Center Ohpm
+        if: github.event_name == 'push'
         working-directory: ./easytier-contrib/easytier-ohrs
         env:
           OHPM_PUBLISH_CODE: ${{ secrets.OHPM_PUBLISH_CODE }}
           OHPM_PRIVATE_KEY: ${{ secrets.OHPM_PRIVATE_KEY }}
           OHPM_KEY_PASSPHRASE: ${{ secrets.OHPM_KEY_PASSPHRASE }}
-        if: ${{ env.OHPM_PUBLISH_CODE != '' }}
         run: |
           ohpm config set publish_id "$OHPM_PUBLISH_CODE"
           ohpm config set publish_registry https://ohpm.openharmony.cn/ohpm
@@ -166,22 +176,10 @@ jobs:
           ohpm publish easytier-ohrs.har
           
       - name: Publish To Private Ohpm
+        if: github.event_name == 'push'
         working-directory: ./easytier-contrib/easytier-ohrs
-        env:
-          OHPM_PUBLISH_CODE: ${{ secrets.OHPM_PUBLISH_CODE }}
-        if: ${{ env.OHPM_PUBLISH_CODE != '' }}
         run: |
           printf '%s' "${{ secrets.CODEARTS_PRIVATE_OHPM }}" > ~/.ohpm/.ohpmrc
           ohpm config set strict_ssl false
           ohpm publish easytier-ohrs.har
           curl --header "Content-Type: application/json" --request POST --data "{}" ${{ secrets.CODEARTS_WEBHOOKS }}
-
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: easytier-ohos
-          path: |
-            ./easytier-contrib/easytier-ohrs/easytier-ohrs.har
-            ./easytier-contrib/easytier-ohrs/dist/arm64-v8a/libeasytier_ohrs.so
-          retention-days: 5
-          if-no-files-found: error