Merge branch 'fix/npmignore-bun-cache'

Author: sunnylqm

.github/workflows/publish.yml

@@ -46,9 +46,6 @@ jobs:
     runs-on: ubuntu-latest
     container: ghcr.io/sanchuanhehe/harmony-next-pipeline-docker/harmonyos-ci-image:latest
     timeout-minutes: 15
-    env:
-      BUN_INSTALL_CACHE_DIR: ${{ github.workspace }}/.bun-cache
-      OHPM_CACHE_DIR: ${{ github.workspace }}/.ohpm-cache
     steps:
       - uses: actions/checkout@v6
         with:
@@ -58,37 +55,11 @@ jobs:
           git config --global --add safe.directory "$GITHUB_WORKSPACE"
           git submodule foreach --recursive 'git config --global --add safe.directory "$toplevel/$sm_path"'
       - uses: oven-sh/setup-bun@v2
-      - name: Cache Bun dependencies
-        uses: actions/cache@v4
-        with:
-          path: .bun-cache
-          key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-bun-
       # Setup .npmrc file to publish to npm
       - uses: actions/setup-node@v6
         with:
           node-version: 24
           registry-url: 'https://registry.npmjs.org'
-      - name: Cache OHPM dependencies
-        uses: actions/cache@v4
-        with:
-          path: |
-            .ohpm-cache
-            harmony/pushy/oh_modules
-            harmony/har-wrapper/oh_modules
-          key: ${{ runner.os }}-ohpm-${{ hashFiles('harmony/pushy/oh-package-lock.json5') }}
-          restore-keys: |
-            ${{ runner.os }}-ohpm-
-      - name: Cache Hvigor build outputs
-        uses: actions/cache@v4
-        with:
-          path: |
-            harmony/pushy/.hvigor
-            harmony/har-wrapper/.hvigor
-          key: ${{ runner.os }}-hvigor-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-hvigor-
       - run: bun install --frozen-lockfile
       - name: Build Harmony HAR
         run: npm run build:harmony-har -- --build-mode release
@@ -108,8 +79,6 @@ jobs:
     if: needs.check_changes.outputs.harmony_changed == 'false'
     runs-on: ubuntu-latest
     timeout-minutes: 10
-    env:
-      BUN_INSTALL_CACHE_DIR: ${{ github.workspace }}/.bun-cache
     steps:
       - uses: actions/checkout@v6
         with:
@@ -119,13 +88,6 @@ jobs:
           git config --global --add safe.directory "$GITHUB_WORKSPACE"
           git submodule foreach --recursive 'git config --global --add safe.directory "$toplevel/$sm_path"'
       - uses: oven-sh/setup-bun@v2
-      - name: Cache Bun dependencies
-        uses: actions/cache@v4
-        with:
-          path: .bun-cache
-          key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-bun-
       # Setup .npmrc file to publish to npm
       - uses: actions/setup-node@v6
         with:

.npmignore

@@ -74,4 +74,12 @@ harmony/**
 android/jni/lzma/bin
 android/jni/lzma/DOC
 
+# Ignore unnecessary development files
+scripts/**
+!scripts/check-expo-version.js
+harmony/pushy/src/test/
+babel.config.js
+tsconfig.json
+bunfig.toml
+
 

harmony/pushy/src/main/cpp/CMakeLists.txt

@@ -68,3 +68,19 @@ if(TARGET rnoh)
     target_include_directories(rnoh_pushy PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
     target_link_libraries(rnoh_pushy PUBLIC rnoh)
 endif()
+
+# Optimize binary size and performance for Release builds
+if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
+    # Enable Link Time Optimization (LTO / IPO)
+    include(CheckIPOSupported)
+    check_ipo_supported(RESULT ipo_supported OUTPUT error)
+    if(ipo_supported)
+        set_property(TARGET rnupdate PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
+        if(TARGET rnoh_pushy)
+            set_property(TARGET rnoh_pushy PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
+        endif()
+    endif()
+
+    # Strip debug symbols and perform garbage collection of unused code sections
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--gc-sections -s")
+endif()

scripts/build-harmony-har.js

@@ -134,23 +134,30 @@ function buildHar() {
   }
 
   if (!skipInstall) {
-    runCommand(ohpmPath, ['install'], {
-      cwd: harmonyModuleDir,
-      env,
-      label: 'Install Harmony dependencies',
-    });
+    if (hasDependencies(harmonyModuleDir)) {
+      runCommand(ohpmPath, ['install'], {
+        cwd: harmonyModuleDir,
+        env,
+        label: 'Install Harmony dependencies',
+      });
+    }
 
-    runCommand(ohpmPath, ['install'], {
-      cwd: wrapperProjectDir,
-      env,
-      label: 'Install wrapper project dependencies',
-    });
+    if (hasDependencies(wrapperProjectDir)) {
+      runCommand(ohpmPath, ['install'], {
+        cwd: wrapperProjectDir,
+        env,
+        label: 'Install wrapper project dependencies',
+      });
+    }
   }
 
   const hvigorArgs = ['assembleHar'];
   if (buildMode !== 'debug') {
     hvigorArgs.push('-p', `buildMode=${buildMode}`);
   }
+  if (process.env.CI === 'true') {
+    hvigorArgs.push('--no-daemon');
+  }
 
   runCommand(hvigorwPath, hvigorArgs, {
     cwd: wrapperProjectDir,
@@ -437,3 +444,20 @@ function relativeToProject(filePath) {
 function fail(message) {
   throw new Error(message);
 }
+
+function hasDependencies(dir) {
+  try {
+    const pkgPath = path.join(dir, 'oh-package.json5');
+    if (!fs.existsSync(pkgPath)) {
+      return false;
+    }
+    const pkgContent = fs.readFileSync(pkgPath, 'utf8');
+    const cleanJson = pkgContent.replace(/\/\*[\s\S]*?\*\/|([^\\:]|^)\/\/.*$/gm, '');
+    const pkg = eval('(' + cleanJson + ')');
+    const hasDeps = pkg.dependencies && Object.keys(pkg.dependencies).length > 0;
+    const hasDevDeps = pkg.devDependencies && Object.keys(pkg.devDependencies).length > 0;
+    return !!(hasDeps || hasDevDeps);
+  } catch (e) {
+    return true;
+  }
+}