From e30500df8d9017dadff31608c8dcea44c28c02dc Mon Sep 17 00:00:00 2001 From: ykai55 Date: Mon, 22 Jun 2026 15:05:19 +0800 Subject: [PATCH 1/2] [BugFix][iOS] Fix LynxServiceAPI header search path --- platform/darwin/ios/lynx_service_api/BUILD.gn | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/platform/darwin/ios/lynx_service_api/BUILD.gn b/platform/darwin/ios/lynx_service_api/BUILD.gn index 6e03e101d0..f1b2873eb9 100644 --- a/platform/darwin/ios/lynx_service_api/BUILD.gn +++ b/platform/darwin/ios/lynx_service_api/BUILD.gn @@ -36,7 +36,10 @@ podspec_target("LynxServiceAPI_podspec") { CLANG_CXX_LANGUAGE_STANDARD = "gnu++17" OTHER_CPLUSPLUSFLAGS = "-fno-aligned-allocation -fno-c++-static-destructors -std=gnu++17" - HEADER_SEARCH_PATHS = [ "../../../.." ] + HEADER_SEARCH_PATHS = [ + "../../../..", + "//", + ] } if (!is_debug) { pod_target_xcconfig.GCC_PREPROCESSOR_DEFINITIONS += [ "NDEBUG=1" ] From e60183f16507721403c3784c25aec6040dc4bca8 Mon Sep 17 00:00:00 2001 From: scanf3 <981544717@qq.com> Date: Mon, 22 Jun 2026 16:44:25 +0800 Subject: [PATCH 2/2] [Infra] For 3.7.1-alpha.1 publishing --- .github/workflows/publish-release.yml | 217 +------------------------- 1 file changed, 1 insertion(+), 216 deletions(-) diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 0f4a9ed142..99a30fabac 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -39,135 +39,6 @@ jobs: exit 1 fi - android-explorer-build: - timeout-minutes: 60 - runs-on: lynx-ubuntu-22.04-large - needs: get-version - steps: - - name: Download Source - uses: actions/checkout@v4.2.2 - with: - path: lynx - ref: ${{ github.event.inputs.commitId || github.ref }} - fetch-depth: 0 - - name: Build Explorer App - uses: ./lynx/.github/actions/android-explorer-build - with: - abi-list: armeabi-v7a,x86,x86_64,arm64-v8a - - name: push to release - uses: ncipollo/release-action@v1 - with: - tag: ${{ needs.get-version.outputs.version }} - token: ${{ secrets.GITHUB_TOKEN }} - artifacts: '${{ github.workspace }}/lynx/explorer/android/lynx_explorer/build/outputs/apk/noasan/release/LynxExplorer-noasan-release.apk' - allowUpdates: true - body: '' - - ios-explorer-build: - timeout-minutes: 60 - runs-on: lynx-darwin-14-medium - needs: get-version - strategy: - matrix: - arch: [arm64, x86_64] - steps: - - name: Download Source - uses: actions/checkout@v4.2.2 - with: - path: lynx - ref: ${{ github.event.inputs.commitId || github.ref }} - fetch-depth: 0 - - name: Build Explorer App - uses: ./lynx/.github/actions/ios-explorer-build - with: - build-arch: ${{ matrix.arch }} - - name: push explorer to release - uses: ncipollo/release-action@v1 - with: - tag: ${{ needs.get-version.outputs.version }} - token: ${{ secrets.GITHUB_TOKEN }} - artifacts: '${{ github.workspace }}/lynx/LynxExplorer-${{ matrix.arch }}.app.tar.gz' - allowUpdates: true - body: '' - - harmony-explorer-build: - runs-on: lynx-custom-container - container: - image: ghcr.io/lynx-family/ubuntu24.04-harmony@sha256:bf493c3710de3c44bfa84caf402c0727b9310c42497f6e52580ad441ea640ef1 - credentials: - username: lynx-family - password: ${{ secrets.GITHUB_TOKEN }} - needs: get-version - defaults: - run: - working-directory: ${{ github.workspace }} - shell: bash - steps: - - name: Download Source - uses: actions/checkout@v4.2.2 - with: - path: lynx - ref: ${{ github.event.inputs.commitId || github.ref }} - fetch-depth: 0 - - name: Build Explorer App - uses: ./lynx/.github/actions/harmony-explorer-build - - name: push explorer to release - uses: ncipollo/release-action@v1 - with: - tag: ${{ needs.get-version.outputs.version }} - token: ${{ secrets.GITHUB_TOKEN }} - artifacts: '${{ github.workspace }}/lynx/explorer/harmony/lynx_explorer/build/default/outputs/default/lynx_explorer-default-unsigned.hap' - allowUpdates: true - body: '' - - android-sdk-release: - runs-on: ubuntu-22.04 - needs: get-version - timeout-minutes: 240 - steps: - - name: Download Source - uses: actions/checkout@v4.2.2 - with: - path: lynx - ref: ${{ github.event.inputs.commitId || github.ref }} - fetch-depth: 0 - - name: Free up disk space - uses: ./lynx/.github/actions/free-android-disk - - name: Python Setup - uses: actions/setup-python@v5 - with: - python-version: '3.13' - - name: Setup Android environment - uses: ./lynx/.github/actions/setup-android-env - - name: Install Common Dependencies - uses: ./lynx/.github/actions/common-deps - with: - cache-backend: 'github' - - name: Android SDK Release - uses: ./lynx/.github/actions/android-sdk-release - with: - version: ${{ needs.get-version.outputs.version }} - signingKeyId: ${{ secrets.SIGNING_KEY_ID }} - signingPassword: ${{ secrets.SIGNING_PASSWORD }} - signingSecretKey: ${{ secrets.SIGNING_SECRET_KEY }} - abiList: 'armeabi-v7a,x86,x86_64,arm64-v8a' - - name: Package maven artifacts - run: |- - cd $GITHUB_WORKSPACE/lynx - pushd platform/android - ./gradlew zipArtifacts -Pversion=${{ needs.get-version.outputs.version }} getArtifactList - popd - pushd platform/android/build - artifact_list=$( publish_key - ${{ secrets.HARMONY_PUBLISH_KEY }} - EOF - ohpm config set publish_registry https://ohpm.openharmony.cn/ohpm - export PUBLISH_ID=${{ secrets.HARMONY_PUBLISH_ID }} - export KEY_PATH=$GITHUB_WORKSPACE/lynx/publish_key - python3 explorer/harmony/script/publish.py --modules ${{ matrix.modules }} --version ${{ needs.get-version.outputs.version }}${{ matrix.version_suffix }} + component: Lynx