From 1dd5f861f3a91f7c66b169d6d3ef247bba439cc2 Mon Sep 17 00:00:00 2001 From: ittat Date: Thu, 25 Feb 2021 11:45:00 +0800 Subject: [PATCH 001/141] Update template_b2g_config.yml --- .github/workflows/template_b2g_config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/template_b2g_config.yml b/.github/workflows/template_b2g_config.yml index 77eccfd..018e48a 100644 --- a/.github/workflows/template_b2g_config.yml +++ b/.github/workflows/template_b2g_config.yml @@ -16,11 +16,11 @@ on: # for example: env: GIT_ACCESS_TOKEN: ${{secrets.GIT_ACCESS_TOKEN}} - device_name: aosp_arm64 + device_name: generic_arm64 repo_dispatches: "https://api.github.com/repos/b2g-gsi/build-actions/dispatches" b2g_source: "https://github.com/b2g-gsi/B2G" b2g_branch: "gsi_q" - build_device_tag: aosp_arm64 + build_device_tag: generic_arm64 device_arch: aarch64-linux-android #onyx #phhgsi_arm64_a From 5b76df932fcfda85a79a09ab340c91d1ce666b2c Mon Sep 17 00:00:00 2001 From: ittat Date: Fri, 26 Feb 2021 07:55:53 +0800 Subject: [PATCH 002/141] Update repack_b2g-sysroot.sh --- b2g/build/repack_b2g-sysroot.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/b2g/build/repack_b2g-sysroot.sh b/b2g/build/repack_b2g-sysroot.sh index e78fbf8..e80a3d9 100755 --- a/b2g/build/repack_b2g-sysroot.sh +++ b/b2g/build/repack_b2g-sysroot.sh @@ -11,7 +11,9 @@ set -e fi . "${work}/B2G/.config" - export GONK_PRODUCT_NAME=${TARGET_NAME} + #TODO + #export GONK_PRODUCT_NAME=${TARGET_NAME} + export GONK_PRODUCT_NAME="generic_arm64" echo GONK_PRODUCT_NAME -- ${GONK_PRODUCT_NAME} if [ "$device_name" == "onyx" ]; then From 616db780efe9c7ac26183c007c9cc893c9bddb2f Mon Sep 17 00:00:00 2001 From: ittat Date: Fri, 26 Feb 2021 07:56:48 +0800 Subject: [PATCH 003/141] Update repack_api-sysroot.sh --- b2g/build/repack_api-sysroot.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/b2g/build/repack_api-sysroot.sh b/b2g/build/repack_api-sysroot.sh index 0b13618..dca48be 100755 --- a/b2g/build/repack_api-sysroot.sh +++ b/b2g/build/repack_api-sysroot.sh @@ -13,7 +13,8 @@ set -e . "${work}/B2G/.config" - export GONK_PRODUCT_NAME=${TARGET_NAME} + #export GONK_PRODUCT_NAME=${TARGET_NAME} + export GONK_PRODUCT_NAME="generic_arm64" echo GONK_PRODUCT_NAME -- ${GONK_PRODUCT_NAME} if [ "$device_name" == "onyx" ]; then From 8270a57b42f0e2fae6ae91b9d5b46565f1959b65 Mon Sep 17 00:00:00 2001 From: ittat Date: Fri, 26 Feb 2021 13:17:30 +0800 Subject: [PATCH 004/141] Update template_b2g_build.yml --- .github/workflows/template_b2g_build.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/template_b2g_build.yml b/.github/workflows/template_b2g_build.yml index 15e42d7..47832b9 100644 --- a/.github/workflows/template_b2g_build.yml +++ b/.github/workflows/template_b2g_build.yml @@ -30,6 +30,7 @@ env: work: /Volumes/b2g_gsi out_work: /Volumes/out remotepath: b2g_gsi_${{github.event.client_payload.device_name}} + actions_branch: b2g_gsi jobs: @@ -41,7 +42,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 with: - ref: android-build + ref: ${{ env.actions_branch }} - name: Clean system environment continue-on-error: true @@ -84,7 +85,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 with: - ref: android-build + ref: ${{ env.actions_branch }} - name: Initialization system environment run: | @@ -218,7 +219,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 with: - ref: android-build + ref: ${{ env.actions_branch }} - name: Initialization system environment run: | @@ -302,7 +303,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 with: - ref: android-build + ref: ${{ env.actions_branch }} - name: Initialization system environment run: | From 782eef5470cdb3ad50139932466a5f983ce95413 Mon Sep 17 00:00:00 2001 From: ittat Date: Fri, 26 Feb 2021 13:18:03 +0800 Subject: [PATCH 005/141] Update template_b2g_config.yml --- .github/workflows/template_b2g_config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/template_b2g_config.yml b/.github/workflows/template_b2g_config.yml index 018e48a..1162498 100644 --- a/.github/workflows/template_b2g_config.yml +++ b/.github/workflows/template_b2g_config.yml @@ -38,5 +38,5 @@ jobs: - name: Action run: | - ./b2g/init/webhook.sh b2g_repack + ./b2g/init/webhook.sh b2g_aosp_build #b2g_repack b2g_aosp_build b2g_gecko_build b2g_api_daemon_build From 3e2d8fcfeb5e9e36ff8a57307a82a87d39038ee1 Mon Sep 17 00:00:00 2001 From: ittat Date: Sun, 28 Feb 2021 13:14:56 +0800 Subject: [PATCH 006/141] Update build_without_gecko.sh --- b2g/build/build_without_gecko.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/b2g/build/build_without_gecko.sh b/b2g/build/build_without_gecko.sh index 7f8a382..97cda73 100755 --- a/b2g/build/build_without_gecko.sh +++ b/b2g/build/build_without_gecko.sh @@ -13,6 +13,8 @@ set -e export PREFERRED_B2G=${work}/b2g-dummy.tar.bz2 export USE_PREBUILT_B2G=1 export SKIP_ABI_CHECKS=true + #TODO + PATH=~/.mozbuild/node/lib/node_modules/.bin/:$PATH ./build.sh binder_b2g_stub gtimeout 245m ./build.sh -j16 systemimage #export SKIP_ABI_CHECKS=true #gtimeout 245m ./build-gsi.sh ${build_device_tag} systemimage From d683cd4b610d7e790eec0af6f733947f81dbe8c8 Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 6 Mar 2021 10:10:42 +0800 Subject: [PATCH 007/141] Update template_b2g_config.yml --- .github/workflows/template_b2g_config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/template_b2g_config.yml b/.github/workflows/template_b2g_config.yml index 1162498..e3c2a62 100644 --- a/.github/workflows/template_b2g_config.yml +++ b/.github/workflows/template_b2g_config.yml @@ -16,11 +16,11 @@ on: # for example: env: GIT_ACCESS_TOKEN: ${{secrets.GIT_ACCESS_TOKEN}} - device_name: generic_arm64 + device_name: phhgsi_arm64_ab repo_dispatches: "https://api.github.com/repos/b2g-gsi/build-actions/dispatches" b2g_source: "https://github.com/b2g-gsi/B2G" - b2g_branch: "gsi_q" - build_device_tag: generic_arm64 + b2g_branch: "ittat-patch-gsi" + build_device_tag: gsi_arm64_ab device_arch: aarch64-linux-android #onyx #phhgsi_arm64_a From b5f5e343db42408d15a59e671d0c95e6b13da868 Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 6 Mar 2021 10:12:31 +0800 Subject: [PATCH 008/141] Update repo_source.sh --- b2g/source/repo_source.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/source/repo_source.sh b/b2g/source/repo_source.sh index 109b459..65982bc 100755 --- a/b2g/source/repo_source.sh +++ b/b2g/source/repo_source.sh @@ -6,5 +6,5 @@ set -e cd ./B2G echo Download ... #TODO - GITREPO=https://github.com/b2g-gsi/manifests BRANCH=gsi_q REPO_INIT_FLAGS="--depth=1" REPO_SYNC_FLAGS=" -j128 --force-sync --current-branch --no-tags --no-clone-bundle --optimized-fetch --prune" ./config.sh aosp_arm64 + GITREPO=https://github.com/b2g-gsi/manifests BRANCH=${b2g_branch} REPO_INIT_FLAGS="--depth=1" REPO_SYNC_FLAGS=" -j128 --force-sync --current-branch --no-tags --no-clone-bundle --optimized-fetch --prune" ./config.sh ${build_device_tag} df -h From 0c6eee878fc87713a8067c8abd49bceef049760b Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 6 Mar 2021 10:14:31 +0800 Subject: [PATCH 009/141] Update template_b2g_config.yml --- .github/workflows/template_b2g_config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/template_b2g_config.yml b/.github/workflows/template_b2g_config.yml index e3c2a62..d2cb8c0 100644 --- a/.github/workflows/template_b2g_config.yml +++ b/.github/workflows/template_b2g_config.yml @@ -38,5 +38,5 @@ jobs: - name: Action run: | - ./b2g/init/webhook.sh b2g_aosp_build + ./b2g/init/webhook.sh b2g_repack #b2g_repack b2g_aosp_build b2g_gecko_build b2g_api_daemon_build From 6c2bb4eb9d1df527733cc4524e82e27e97d06241 Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 6 Mar 2021 10:23:23 +0800 Subject: [PATCH 010/141] Update repack_api-sysroot.sh --- b2g/build/repack_api-sysroot.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/b2g/build/repack_api-sysroot.sh b/b2g/build/repack_api-sysroot.sh index dca48be..0b13618 100755 --- a/b2g/build/repack_api-sysroot.sh +++ b/b2g/build/repack_api-sysroot.sh @@ -13,8 +13,7 @@ set -e . "${work}/B2G/.config" - #export GONK_PRODUCT_NAME=${TARGET_NAME} - export GONK_PRODUCT_NAME="generic_arm64" + export GONK_PRODUCT_NAME=${TARGET_NAME} echo GONK_PRODUCT_NAME -- ${GONK_PRODUCT_NAME} if [ "$device_name" == "onyx" ]; then From 3577f04ea5d825f8bd380dde8b5ee3ce85d89e93 Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 6 Mar 2021 10:23:26 +0800 Subject: [PATCH 011/141] Update repack_b2g-sysroot.sh --- b2g/build/repack_b2g-sysroot.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/b2g/build/repack_b2g-sysroot.sh b/b2g/build/repack_b2g-sysroot.sh index e80a3d9..e78fbf8 100755 --- a/b2g/build/repack_b2g-sysroot.sh +++ b/b2g/build/repack_b2g-sysroot.sh @@ -11,9 +11,7 @@ set -e fi . "${work}/B2G/.config" - #TODO - #export GONK_PRODUCT_NAME=${TARGET_NAME} - export GONK_PRODUCT_NAME="generic_arm64" + export GONK_PRODUCT_NAME=${TARGET_NAME} echo GONK_PRODUCT_NAME -- ${GONK_PRODUCT_NAME} if [ "$device_name" == "onyx" ]; then From c593a2d55fe5eff6ad8c21885d12d9557b25c999 Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 6 Mar 2021 10:25:36 +0800 Subject: [PATCH 012/141] Update template_b2g_config.yml --- .github/workflows/template_b2g_config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/template_b2g_config.yml b/.github/workflows/template_b2g_config.yml index d2cb8c0..3875606 100644 --- a/.github/workflows/template_b2g_config.yml +++ b/.github/workflows/template_b2g_config.yml @@ -22,6 +22,7 @@ env: b2g_branch: "ittat-patch-gsi" build_device_tag: gsi_arm64_ab device_arch: aarch64-linux-android + actions_branch: b2g_gsi #onyx #phhgsi_arm64_a #phhgsi_arm64_ab From 5c120e0090a0f286f7aa775b8940280b7a06419b Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 6 Mar 2021 10:26:09 +0800 Subject: [PATCH 013/141] Update template_b2g_build.yml --- .github/workflows/template_b2g_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/template_b2g_build.yml b/.github/workflows/template_b2g_build.yml index 47832b9..092bb8d 100644 --- a/.github/workflows/template_b2g_build.yml +++ b/.github/workflows/template_b2g_build.yml @@ -30,7 +30,7 @@ env: work: /Volumes/b2g_gsi out_work: /Volumes/out remotepath: b2g_gsi_${{github.event.client_payload.device_name}} - actions_branch: b2g_gsi + actions_branch: ${{github.event.client_payload.actions_branch}} jobs: From 4b00534d5c582eff8a9ec93fa1473ce9b57bfe98 Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 6 Mar 2021 10:28:04 +0800 Subject: [PATCH 014/141] Update webhook.sh --- b2g/init/webhook.sh | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/b2g/init/webhook.sh b/b2g/init/webhook.sh index b2bfb49..c008ef9 100755 --- a/b2g/init/webhook.sh +++ b/b2g/init/webhook.sh @@ -1,6 +1,15 @@ #!/bin/bash set -e -echo $b2g_source - -curl -H "Authorization: token ${GIT_ACCESS_TOKEN}" --request POST --data '{"event_type": "'$1'","client_payload": {"device_name":"'${device_name}'", "gecko_version":"'${gecko_version}'", "device_arch":"'${device_arch}'", "repo_dispatches":"'${repo_dispatches}'", "build_device_tag":"'${build_device_tag}'", "b2g_source":"'${b2g_source}'", "b2g_branch":"'${b2g_branch}'" }}' ${repo_dispatches} +curl -H "Authorization: token ${GIT_ACCESS_TOKEN}" --request POST \ + --data '{"event_type": "'$1'", \ + "client_payload": { \ + "device_name":"'${device_name}'", \ + "gecko_version":"'${gecko_version}'", \ + "device_arch":"'${device_arch}'", \ + "repo_dispatches":"'${repo_dispatches}'", \ + "build_device_tag":"'${build_device_tag}'", \ + "b2g_source":"'${b2g_source}'", \ + "b2g_branch":"'${b2g_branch}'", \ + "actions_branch":"'${actions_branch}'" \ + }}' ${repo_dispatches} From 705bc9fd6609c37323978f84f7884117e6022bee Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 6 Mar 2021 10:29:29 +0800 Subject: [PATCH 015/141] Update build_without_gecko.sh --- b2g/build/build_without_gecko.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/b2g/build/build_without_gecko.sh b/b2g/build/build_without_gecko.sh index 97cda73..aae1c7e 100755 --- a/b2g/build/build_without_gecko.sh +++ b/b2g/build/build_without_gecko.sh @@ -13,9 +13,5 @@ set -e export PREFERRED_B2G=${work}/b2g-dummy.tar.bz2 export USE_PREBUILT_B2G=1 export SKIP_ABI_CHECKS=true - #TODO - PATH=~/.mozbuild/node/lib/node_modules/.bin/:$PATH ./build.sh binder_b2g_stub - gtimeout 245m ./build.sh -j16 systemimage - #export SKIP_ABI_CHECKS=true - #gtimeout 245m ./build-gsi.sh ${build_device_tag} systemimage + gtimeout 245m ./build-gsi.sh ${build_device_tag} systemimage df -h From 0461b0490d15d9a79b011c0cd7de6aad9713fa05 Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 6 Mar 2021 10:31:10 +0800 Subject: [PATCH 016/141] Update build_with_gecko.sh --- b2g/build/build_with_gecko.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/b2g/build/build_with_gecko.sh b/b2g/build/build_with_gecko.sh index b8a2b6f..072f926 100755 --- a/b2g/build/build_with_gecko.sh +++ b/b2g/build/build_with_gecko.sh @@ -9,16 +9,14 @@ set -e rclone copy itd:ci/${remotepath}/${gecko_version} ./ #### build + cd ${work}/B2G export CCACHE_DIR=~/.ccache /usr/local/bin/ccache -M 20G /usr/local/bin/ccache -s export USE_CCACHE=1 - cd ${work}/B2G export DISABLE_SOURCES_XML=true export USE_PREBUILT_B2G=1 #export OUT_DIR_COMMON_BASE=${out_work} export PREFERRED_B2G="${work}/pre-gecko/${gecko_version}" - export SKIP_ABI_CHECKS=true - - gtimeout 245m ./build.sh -j16 systemimage + gtimeout 245m ./build-gsi.sh ${build_device_tag} systemimage From f582a3708524516db02ad677ed6ef5bcb0c18499 Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 6 Mar 2021 10:33:13 +0800 Subject: [PATCH 017/141] Update webhook.sh --- b2g/init/webhook.sh | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/b2g/init/webhook.sh b/b2g/init/webhook.sh index c008ef9..b1280b9 100755 --- a/b2g/init/webhook.sh +++ b/b2g/init/webhook.sh @@ -1,15 +1,4 @@ #!/bin/bash set -e -curl -H "Authorization: token ${GIT_ACCESS_TOKEN}" --request POST \ - --data '{"event_type": "'$1'", \ - "client_payload": { \ - "device_name":"'${device_name}'", \ - "gecko_version":"'${gecko_version}'", \ - "device_arch":"'${device_arch}'", \ - "repo_dispatches":"'${repo_dispatches}'", \ - "build_device_tag":"'${build_device_tag}'", \ - "b2g_source":"'${b2g_source}'", \ - "b2g_branch":"'${b2g_branch}'", \ - "actions_branch":"'${actions_branch}'" \ - }}' ${repo_dispatches} +curl -H "Authorization: token ${GIT_ACCESS_TOKEN}" --request POST --data '{"event_type": "'$1'", "client_payload": { "device_name":"'${device_name}'", "gecko_version":"'${gecko_version}'", "device_arch":"'${device_arch}'", "repo_dispatches":"'${repo_dispatches}'", "build_device_tag":"'${build_device_tag}'", "b2g_source":"'${b2g_source}'", "b2g_branch":"'${b2g_branch}'", "actions_branch":"'${actions_branch}'" }}' ${repo_dispatches} From 3bf0551028cf3cb2835f51a92729a9c82fad186d Mon Sep 17 00:00:00 2001 From: ittat Date: Tue, 9 Mar 2021 21:49:29 +0800 Subject: [PATCH 018/141] Update repo_source.sh --- b2g/source/repo_source.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/source/repo_source.sh b/b2g/source/repo_source.sh index 65982bc..c65be39 100755 --- a/b2g/source/repo_source.sh +++ b/b2g/source/repo_source.sh @@ -6,5 +6,5 @@ set -e cd ./B2G echo Download ... #TODO - GITREPO=https://github.com/b2g-gsi/manifests BRANCH=${b2g_branch} REPO_INIT_FLAGS="--depth=1" REPO_SYNC_FLAGS=" -j128 --force-sync --current-branch --no-tags --no-clone-bundle --optimized-fetch --prune" ./config.sh ${build_device_tag} + GITREPO=https://github.com/b2g-gsi/manifests BRANCH=${b2g_branch} REPO_INIT_FLAGS="--depth=1" REPO_SYNC_FLAGS=" -j128 --force-sync --current-branch --no-tags --no-clone-bundle --optimized-fetch --prune" ./config.sh b2g_gsi df -h From 79174c31ee19e6fdea20dadf045bc0e893678353 Mon Sep 17 00:00:00 2001 From: ittat Date: Thu, 11 Mar 2021 10:34:49 +0800 Subject: [PATCH 019/141] Update template_b2g_build.yml --- .github/workflows/template_b2g_build.yml | 25 +++--------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/.github/workflows/template_b2g_build.yml b/.github/workflows/template_b2g_build.yml index 092bb8d..09bd16a 100644 --- a/.github/workflows/template_b2g_build.yml +++ b/.github/workflows/template_b2g_build.yml @@ -105,16 +105,6 @@ jobs: curl https://packages.preprod.kaiostech.com/ndk/v4/mozbuild.tar.bz2 -o mozbuild.tar.bz2 tar -xvf mozbuild.tar.bz2 sudo rm mozbuild.tar.bz2 - - #tmp - cd ${work}/B2G/gonk-misc - sudo rm -r api-daemon - git clone https://github.com/b2g-gsi/api-daemon -b without-api-daemon - #TODO - cd ~ - git clone https://github.com/b2g-gsi/platform_build -b gsi_q --depth=1 - rm ${work}/B2G/build/make/target/product/aosp_arm64.mk - cp ~/platform_build/target/product/aosp_arm64.mk ${work}/B2G/build/make/target/product/ - name: Check The Previous “error.log” run: | @@ -135,7 +125,6 @@ jobs: id: build run: | df -h - ./b2g/build/build_without_gecko.sh @@ -196,11 +185,6 @@ jobs: run: | ./b2g/init/webhook.sh b2g_gecko_build -# - name: release WebHook -# if: github.event.action == 'b2g_build' -# run: | -# curl -H "Authorization: token ${{secrets.GIT_ACCESS_TOKEN}}" --request POST --data '{"event_type": "release","client_payload": {"image":"'${image}'", "gecko_version":"'${gecko_version}'", "device_name":"'${device_name}'","device_arch":"'${device_arch}'","kernel":"'${kernel}'"}}' https://api.github.com/repos/ittat/SuperBot/dispatches - - name: Update Build Source if: steps.check.conclusion == 'success' && github.event.action == 'b2g_aosp_build' run: | @@ -257,7 +241,7 @@ jobs: ./mach bootstrap --no-interactive --application-choice 'GeckoView/Firefox for Android' df -h - - name: Build Gecko for gsi + - name: Build Gecko run: | ./b2g/build/build_gecko.sh @@ -274,7 +258,6 @@ jobs: TARGET_ARCH=arm ARCH_ABI="androideabi" fi - #echo "::set-env name=B2G_OUT::b2g-${version}.en-US.linux-${ARCH_ABI}-${TARGET_ARCH}.tar.bz2" echo "gecko_version=b2g-${version}.en-US.linux-${ARCH_ABI}-${TARGET_ARCH}.tar.bz2" >> $GITHUB_ENV @@ -325,9 +308,10 @@ jobs: cd ~ git clone https://github.com/kaiostech/api-daemon #--depth=1 - cd api-daemon + #cd api-daemon #git checkout 405f8d72005b0d753ea3a181246d4f5dbf129669 -b test ls -al + - name: build Source run: | #### @@ -336,9 +320,6 @@ jobs: export GONK_DIR=~/.mozbuild/api-sysroot export GONK_PRODUCT=${device_name} cd ~/api-daemon - ### temp - mkdir -p ./target/aarch64-linux-android/release/symbols - ### ./update-prebuilts.sh - name: zip Artifact From 76ffa2483df5e1b28229212d7faedb75294f27f5 Mon Sep 17 00:00:00 2001 From: ittat Date: Thu, 11 Mar 2021 10:35:07 +0800 Subject: [PATCH 020/141] Rename template_b2g_build.yml to b2g_build.yml --- .github/workflows/{template_b2g_build.yml => b2g_build.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{template_b2g_build.yml => b2g_build.yml} (100%) diff --git a/.github/workflows/template_b2g_build.yml b/.github/workflows/b2g_build.yml similarity index 100% rename from .github/workflows/template_b2g_build.yml rename to .github/workflows/b2g_build.yml From fb35d38ef6e3e8f0a7d7912d9c2a0fb6dbfd6057 Mon Sep 17 00:00:00 2001 From: ittat Date: Thu, 11 Mar 2021 10:35:20 +0800 Subject: [PATCH 021/141] Update b2g_build.yml --- .github/workflows/b2g_build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/b2g_build.yml b/.github/workflows/b2g_build.yml index 09bd16a..bb4537f 100644 --- a/.github/workflows/b2g_build.yml +++ b/.github/workflows/b2g_build.yml @@ -1,4 +1,3 @@ - name: b2g-ci on: repository_dispatch: From a28446b079daede541d520cf3b600b42007134c0 Mon Sep 17 00:00:00 2001 From: ittat Date: Thu, 11 Mar 2021 10:35:54 +0800 Subject: [PATCH 022/141] Update and rename template_b2g_config.yml to b2g_config.yml --- .github/workflows/{template_b2g_config.yml => b2g_config.yml} | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) rename .github/workflows/{template_b2g_config.yml => b2g_config.yml} (97%) diff --git a/.github/workflows/template_b2g_config.yml b/.github/workflows/b2g_config.yml similarity index 97% rename from .github/workflows/template_b2g_config.yml rename to .github/workflows/b2g_config.yml index 3875606..5ef062a 100644 --- a/.github/workflows/template_b2g_config.yml +++ b/.github/workflows/b2g_config.yml @@ -1,5 +1,4 @@ - -name: template_b2g_config +name: b2g_config on: workflow_dispatch: From 1a4a2d87c51355074c861dca94586272931a1055 Mon Sep 17 00:00:00 2001 From: ittat Date: Sun, 14 Mar 2021 16:56:01 +0800 Subject: [PATCH 023/141] Update b2g_build.yml --- .github/workflows/b2g_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/b2g_build.yml b/.github/workflows/b2g_build.yml index bb4537f..aed6b18 100644 --- a/.github/workflows/b2g_build.yml +++ b/.github/workflows/b2g_build.yml @@ -143,7 +143,7 @@ jobs: if [ -s ${work}/B2G/out/error.log ]; then echo Error! cat ${work}/B2G/out/error.log - ./init/all_unmount_darwin.sh + ./common/init/all_unmount_darwin.sh exit 2 else exit 0 From 93c71955b485d90166a483997c41a85f8d938d05 Mon Sep 17 00:00:00 2001 From: ittat Date: Fri, 11 Jun 2021 11:31:36 +0800 Subject: [PATCH 024/141] Update clean_space_darwin.sh --- common/init/clean_space_darwin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/init/clean_space_darwin.sh b/common/init/clean_space_darwin.sh index 99261c1..841bd45 100755 --- a/common/init/clean_space_darwin.sh +++ b/common/init/clean_space_darwin.sh @@ -4,7 +4,7 @@ set -e df -h sudo rm -r /Applications/Xcode_10* #sudo rm -r /Applications/Xcode_12* - sudo rm -r /Applications/Xcode_11.*.app + sudo rm -r /Applications/Xcode_11* #Firefox* Julia* Microsoft* R* Visual* ls -al -h /Applications df -h From 7699391862c4eb129b51b6be3877c947b5875598 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 11 Jun 2021 12:25:56 +0800 Subject: [PATCH 025/141] Lint --- b2g/build/add_pre_api_daemon.sh | 52 ++++++------ b2g/build/build_api-daemon.sh | 45 +++++----- b2g/build/build_gecko.sh | 89 ++++++++++---------- b2g/build/build_with_gecko.sh | 38 ++++----- b2g/build/build_without_gecko.sh | 28 +++--- b2g/build/repack_api-sysroot.sh | 51 ++++++----- b2g/build/repack_b2g-sysroot.sh | 54 ++++++------ b2g/init/all_unmount_darwin.sh | 12 +-- b2g/init/clean_space_darwin.sh | 17 ++-- b2g/init/docker_env_darwin.sh | 49 +++++------ b2g/source/compress_sourceimage.sh | 12 +-- b2g/source/create_outimage.sh | 6 +- b2g/source/download_source.sh | 31 ++++--- b2g/source/fix_soucre.sh | 74 ++++++++-------- b2g/source/git_gecko.sh | 24 +++--- b2g/source/repo_source.sh | 16 ++-- b2g/source/upload_image.sh | 12 +-- b2g/source/upload_out_image.sh | 10 +-- b2g/source/upload_sysroot.sh | 10 +-- b2g/source/upload_systemimage.sh | 8 +- common/init/all_unmount_darwin.sh | 32 +++---- common/init/clean_space_darwin.sh | 16 ++-- common/init/clean_space_linux.sh | 28 +++--- common/init/env_darwin.sh | 61 +++++++------- common/init/env_linux.sh | 58 ++++++------- common/source/compress_sourceimage.sh | 8 +- common/source/download_source_from_gdrive.sh | 48 +++++------ common/source/upload_image.sh | 12 +-- common/source/upload_out_image.sh | 10 +-- 29 files changed, 451 insertions(+), 460 deletions(-) diff --git a/b2g/build/add_pre_api_daemon.sh b/b2g/build/add_pre_api_daemon.sh index 09588de..cc0b934 100755 --- a/b2g/build/add_pre_api_daemon.sh +++ b/b2g/build/add_pre_api_daemon.sh @@ -1,28 +1,28 @@ #!/bin/bash set -e - cd ${work} - mkdir pre-api - cd pre-api - rclone copy itd:ci/${remotepath}/prebuilts.zip ./ - unzip ./prebuilts.zip - APIDeamon_PreBuild="${work}/pre-api/home/runner/api-daemon/prebuilts" - ls ${APIDeamon_PreBuild} - - #### - TARGET_OUT=${out_work}/target/product/${device_name}/system - path_api=${TARGET_OUT}/api-daemon - if [ -d "${path_api}" ]; then - sudo rm -r "${path_api}" - fi - - path_b2g=${TARGET_OUT}/b2g - if [ -d "${path_b2g}" ]; then - sudo rm -r "${path_b2g}" - fi - - mkdir -p ${path_api} - mkdir -p ${path_b2g}/defaults - - cp -r ${APIDeamon_PreBuild}/http_root ${TARGET_OUT}/api-daemon - cp ${APIDeamon_PreBuild}/${device_arch}/api-daemon ${TARGET_OUT}/bin/ - chmod +x ${TARGET_OUT}/bin/api-daemon +cd ${work} +mkdir pre-api +cd pre-api +rclone copy itd:ci/${remotepath}/prebuilts.zip ./ +unzip ./prebuilts.zip +APIDeamon_PreBuild="${work}/pre-api/home/runner/api-daemon/prebuilts" +ls ${APIDeamon_PreBuild} + +#### +TARGET_OUT=${out_work}/target/product/${device_name}/system +path_api=${TARGET_OUT}/api-daemon +if [ -d "${path_api}" ]; then + sudo rm -r "${path_api}" +fi + +path_b2g=${TARGET_OUT}/b2g +if [ -d "${path_b2g}" ]; then + sudo rm -r "${path_b2g}" +fi + +mkdir -p ${path_api} +mkdir -p ${path_b2g}/defaults + +cp -r ${APIDeamon_PreBuild}/http_root ${TARGET_OUT}/api-daemon +cp ${APIDeamon_PreBuild}/${device_arch}/api-daemon ${TARGET_OUT}/bin/ +chmod +x ${TARGET_OUT}/bin/api-daem \ No newline at end of file diff --git a/b2g/build/build_api-daemon.sh b/b2g/build/build_api-daemon.sh index 13eca92..a508dba 100755 --- a/b2g/build/build_api-daemon.sh +++ b/b2g/build/build_api-daemon.sh @@ -1,26 +1,25 @@ #!/bin/bash set -e +cd ~ +#### +rustup target add aarch64-linux-android armv7-linux-androideabi +cd ~ +curl https://packages.preprod.kaiostech.com/ndk/v3/mozbuild.tar.bz2 | tar -C ${HOME}/ -xj +rclone copy itd:ci/${remotepath}/api-sysroot.tar.zst ./ +mkdir ~/.mozbuild/api-sysroot +tar -C "$HOME/.mozbuild/api-sysroot" -I zstd -x -a -f api-sysroot.tar.zst +#sudo rm api-sysroot.tar.zst +#sudo rm mozbuild.tar.bz2 +ls ~/.mozbuild/api-sysroot - cd ~ - #### - rustup target add aarch64-linux-android armv7-linux-androideabi - cd ~ - curl https://packages.preprod.kaiostech.com/ndk/v3/mozbuild.tar.bz2 | tar -C ${HOME}/ -xj - rclone copy itd:ci/${remotepath}/api-sysroot.tar.zst ./ - mkdir ~/.mozbuild/api-sysroot - tar -C "$HOME/.mozbuild/api-sysroot" -I zstd -x -a -f api-sysroot.tar.zst - #sudo rm api-sysroot.tar.zst - #sudo rm mozbuild.tar.bz2 - ls ~/.mozbuild/api-sysroot - - cd ~ - git clone https://github.com/kaiostech/api-daemon --depth=1 - ls -al - - #### - export TARGET_ARCH=${device_arch} - export BUILD_WITH_NDK_DIR=~/.mozbuild/android-ndk-r20b-canary - export GONK_DIR=~/.mozbuild/api-sysroot - export GONK_PRODUCT=${device_name} - cd ~/api-daemon - ./update-prebuilts.sh +cd ~ +git clone https://github.com/kaiostech/api-daemon --depth=1 +ls -al + +#### +export TARGET_ARCH=${device_arch} +export BUILD_WITH_NDK_DIR=~/.mozbuild/android-ndk-r20b-canary +export GONK_DIR=~/.mozbuild/api-sysroot +export GONK_PRODUCT=${device_name} +cd ~/api-daemon +./update-prebuilts.sh \ No newline at end of file diff --git a/b2g/build/build_gecko.sh b/b2g/build/build_gecko.sh index bc16bc2..a473695 100755 --- a/b2g/build/build_gecko.sh +++ b/b2g/build/build_gecko.sh @@ -1,48 +1,47 @@ #!/bin/bash set -e +df -h +cd ~/gecko-b2g +export SHELL=/bin/bash +sudo apt update +export LOCAL_NDK_BASE_URL='ftp://ftp.kaiostech.com/ndk/android-ndk' +./mach bootstrap --no-interactive --application-choice 'GeckoView/Firefox for Android' +df -h - df -h - cd ~/gecko-b2g - export SHELL=/bin/bash - sudo apt update - export LOCAL_NDK_BASE_URL='ftp://ftp.kaiostech.com/ndk/android-ndk' - ./mach bootstrap --no-interactive --application-choice 'GeckoView/Firefox for Android' - df -h - - df -h - #### - cd ~ - git clone https://github.com/OnePlus-onyx/build-CI -b b2g - chmod +x ~/build-CI/build-gsi-b2g.sh - cp ~/build-CI/build-gsi-b2g.sh ~/gecko-b2g - - rclone copy itd:ci/${remotepath}/b2g-sysroot.tar.zst ./ - tar -C "$HOME/.mozbuild" -I zstd -x -a -f b2g-sysroot.tar.zst - - mkdir ~/objdir-gsi-gecko - tar -C "$HOME/objdir-gsi-gecko" -I zstd -x -a -f b2g-sysroot.tar.zst - ls ~/objdir-gsi-gecko - - sudo rm b2g-sysroot.tar.zst - - cd ~/gecko-b2g - export SHELL=/bin/bash - export GONK_PATH=${HOME}/.mozbuild/b2g-sysroot - - if [ "$device_arch" == "aarch64-linux-android" ]; then - export TARGET_ARCH=arm64 - export TARGET_ARCH_VARIANT=armv8-a - else - export TARGET_ARCH=arm - export TARGET_ARCH_VARIANT=armv7-a-neon - fi - - export GONK_PRODUCT_NAME=${device_name} - export GECKO_OBJDIR=${HOME}/objdir-gsi-gecko - export PLATFORM_VERSION=29 - export TARGET_CPU_VARIANT=generic - export MOZ_DISABLE_LTO=1 - ./build-gsi-b2g.sh - ./build-gsi-b2g.sh package - df -h - ls ${GECKO_OBJDIR}/dist +df -h +#### +cd ~ +git clone https://github.com/OnePlus-onyx/build-CI -b b2g +chmod +x ~/build-CI/build-gsi-b2g.sh +cp ~/build-CI/build-gsi-b2g.sh ~/gecko-b2g + +rclone copy itd:ci/${remotepath}/b2g-sysroot.tar.zst ./ +tar -C "$HOME/.mozbuild" -I zstd -x -a -f b2g-sysroot.tar.zst + +mkdir ~/objdir-gsi-gecko +tar -C "$HOME/objdir-gsi-gecko" -I zstd -x -a -f b2g-sysroot.tar.zst +ls ~/objdir-gsi-gecko + +sudo rm b2g-sysroot.tar.zst + +cd ~/gecko-b2g +export SHELL=/bin/bash +export GONK_PATH=${HOME}/.mozbuild/b2g-sysroot + +if [ "$device_arch" == "aarch64-linux-android" ]; then + export TARGET_ARCH=arm64 + export TARGET_ARCH_VARIANT=armv8-a +else + export TARGET_ARCH=arm + export TARGET_ARCH_VARIANT=armv7-a-neon +fi + +export GONK_PRODUCT_NAME=${device_name} +export GECKO_OBJDIR=${HOME}/objdir-gsi-gecko +export PLATFORM_VERSION=29 +export TARGET_CPU_VARIANT=generic +export MOZ_DISABLE_LTO=1 +./build-gsi-b2g.sh +./build-gsi-b2g.sh package +df -h +ls ${GECKO_OBJDIR}/d \ No newline at end of file diff --git a/b2g/build/build_with_gecko.sh b/b2g/build/build_with_gecko.sh index 072f926..35b4f6b 100755 --- a/b2g/build/build_with_gecko.sh +++ b/b2g/build/build_with_gecko.sh @@ -1,22 +1,22 @@ #!/bin/bash set -e - df -h - #### - cd ${work} - mkdir pre-gecko - cd pre-gecko - rclone copy itd:ci/${remotepath}/${gecko_version} ./ - - #### build - cd ${work}/B2G - export CCACHE_DIR=~/.ccache - /usr/local/bin/ccache -M 20G - /usr/local/bin/ccache -s - export USE_CCACHE=1 - export DISABLE_SOURCES_XML=true - export USE_PREBUILT_B2G=1 - #export OUT_DIR_COMMON_BASE=${out_work} - export PREFERRED_B2G="${work}/pre-gecko/${gecko_version}" - export SKIP_ABI_CHECKS=true - gtimeout 245m ./build-gsi.sh ${build_device_tag} systemimage +df -h +#### +cd ${work} +mkdir pre-gecko +cd pre-gecko +rclone copy itd:ci/${remotepath}/${gecko_version} ./ + +#### build +cd ${work}/B2G +export CCACHE_DIR=~/.ccache +/usr/local/bin/ccache -M 20G +/usr/local/bin/ccache -s +export USE_CCACHE=1 +export DISABLE_SOURCES_XML=true +export USE_PREBUILT_B2G=1 +#export OUT_DIR_COMMON_BASE=${out_work} +export PREFERRED_B2G="${work}/pre-gecko/${gecko_version}" +export SKIP_ABI_CHECKS=true +gtimeout 245m ./build-gsi.sh ${build_device_tag} systemimage \ No newline at end of file diff --git a/b2g/build/build_without_gecko.sh b/b2g/build/build_without_gecko.sh index aae1c7e..26f7f0b 100755 --- a/b2g/build/build_without_gecko.sh +++ b/b2g/build/build_without_gecko.sh @@ -1,17 +1,17 @@ #!/bin/bash set -e - df -h - #### - export CCACHE_DIR=~/.ccache - /usr/local/bin/ccache -M 20G - /usr/local/bin/ccache -s - export USE_CCACHE=1 - cd ${work}/B2G - export DISABLE_SOURCES_XML=true - #export OUT_DIR_COMMON_BASE=${out_work} - export PREFERRED_B2G=${work}/b2g-dummy.tar.bz2 - export USE_PREBUILT_B2G=1 - export SKIP_ABI_CHECKS=true - gtimeout 245m ./build-gsi.sh ${build_device_tag} systemimage - df -h + df -h +#### +export CCACHE_DIR=~/.ccache +/usr/local/bin/ccache -M 20G +/usr/local/bin/ccache -s +export USE_CCACHE=1 +cd ${work}/B2G +export DISABLE_SOURCES_XML=true +#export OUT_DIR_COMMON_BASE=${out_work} +export PREFERRED_B2G=${work}/b2g-dummy.tar.bz2 +export USE_PREBUILT_B2G=1 +export SKIP_ABI_CHECKS=true +gtimeout 245m ./build-gsi.sh ${build_device_tag} systemimage +df -h \ No newline at end of file diff --git a/b2g/build/repack_api-sysroot.sh b/b2g/build/repack_api-sysroot.sh index 0b13618..2df3f49 100755 --- a/b2g/build/repack_api-sysroot.sh +++ b/b2g/build/repack_api-sysroot.sh @@ -1,29 +1,28 @@ #!/bin/bash set -e - df -h - cd ${work}/B2G +df -h +cd ${work}/B2G + +if [ "$device_arch" == "aarch64-linux-android" ]; then + export TARGET_ARCH=arm64 + export TARGET_ARCH_VARIANT=armv8-a +else + export TARGET_ARCH=arm + export TARGET_ARCH_VARIANT=armv7-a-neon +fi - if [ "$device_arch" == "aarch64-linux-android" ]; then - export TARGET_ARCH=arm64 - export TARGET_ARCH_VARIANT=armv8-a - else - export TARGET_ARCH=arm - export TARGET_ARCH_VARIANT=armv7-a-neon - fi - - - . "${work}/B2G/.config" - export GONK_PRODUCT_NAME=${TARGET_NAME} - echo GONK_PRODUCT_NAME -- ${GONK_PRODUCT_NAME} - - if [ "$device_name" == "onyx" ]; then - export TARGET_CPU_VARIANT=krait - else - export TARGET_CPU_VARIANT=generic - fi - - ./api_sysroot.sh - sudo rm -rf ./api-sysroot - ls -al - mv api-sysroot.tar.zst ${work} - df -h +. "${work}/B2G/.config" +export GONK_PRODUCT_NAME=${TARGET_NAME} +echo GONK_PRODUCT_NAME -- ${GONK_PRODUCT_NAME} + +if [ "$device_name" == "onyx" ]; then + export TARGET_CPU_VARIANT=krait +else + export TARGET_CPU_VARIANT=generic +fi + +./api_sysroot.sh +sudo rm -rf ./api-sysroot +ls -al +mv api-sysroot.tar.zst ${work} +df -h diff --git a/b2g/build/repack_b2g-sysroot.sh b/b2g/build/repack_b2g-sysroot.sh index e78fbf8..0438b5f 100755 --- a/b2g/build/repack_b2g-sysroot.sh +++ b/b2g/build/repack_b2g-sysroot.sh @@ -1,29 +1,29 @@ #!/bin/bash set -e - df -h - cd ${work}/B2G - if [ "$device_arch" == "aarch64-linux-android" ]; then - export TARGET_ARCH=arm64 - export TARGET_ARCH_VARIANT=armv8-a - else - export TARGET_ARCH=arm - export TARGET_ARCH_VARIANT=armv7-a-neon - fi - - . "${work}/B2G/.config" - export GONK_PRODUCT_NAME=${TARGET_NAME} - echo GONK_PRODUCT_NAME -- ${GONK_PRODUCT_NAME} - - if [ "$device_name" == "onyx" ]; then - export TARGET_CPU_VARIANT=krait - else - export TARGET_CPU_VARIANT=generic - fi - - #gecko/taskcluster/scripts/misc/create-b2g-sysroot.sh - ./create-b2g-sysroot.sh - ls -al - sudo rm -rf ./b2g-sysroot - ls -al - mv b2g-sysroot.tar.zst ${work} - df -h +df -h +cd ${work}/B2G +if [ "$device_arch" == "aarch64-linux-android" ]; then + export TARGET_ARCH=arm64 + export TARGET_ARCH_VARIANT=armv8-a +else + export TARGET_ARCH=arm + export TARGET_ARCH_VARIANT=armv7-a-neon +fi + +. "${work}/B2G/.config" +export GONK_PRODUCT_NAME=${TARGET_NAME} +echo GONK_PRODUCT_NAME -- ${GONK_PRODUCT_NAME} + +if [ "$device_name" == "onyx" ]; then + export TARGET_CPU_VARIANT=krait +else + export TARGET_CPU_VARIANT=generic +fi + +#gecko/taskcluster/scripts/misc/create-b2g-sysroot.sh +./create-b2g-sysroot.sh +ls -al +sudo rm -rf ./b2g-sysroot +ls -al +mv b2g-sysroot.tar.zst ${work} +df \ No newline at end of file diff --git a/b2g/init/all_unmount_darwin.sh b/b2g/init/all_unmount_darwin.sh index 77d38b0..aaefce8 100755 --- a/b2g/init/all_unmount_darwin.sh +++ b/b2g/init/all_unmount_darwin.sh @@ -3,9 +3,9 @@ set -e cd ~ df -h - while [ -d "${out_work}" ] ;do - hdiutil detach "${out_work}" -force - done - while [ -d "${work}" ] ;do - hdiutil detach "${work}" -force - done +while [ -d "${out_work}" ] ;do + hdiutil detach "${out_work}" -force +done +while [ -d "${work}" ] ;do + hdiutil detach "${work}" -force +don \ No newline at end of file diff --git a/b2g/init/clean_space_darwin.sh b/b2g/init/clean_space_darwin.sh index 3e65c98..bdb9eff 100755 --- a/b2g/init/clean_space_darwin.sh +++ b/b2g/init/clean_space_darwin.sh @@ -1,9 +1,8 @@ - - ls -al -h /Applications - df -h - sudo rm -r /Applications/Xcode_10* - #sudo rm -r /Applications/Xcode_12* - sudo rm -r /Applications/Xcode_11.*.app - #Firefox* Julia* Microsoft* R* Visual* - ls -al -h /Applications - df -h +ls -al -h /Applications +df -h +sudo rm -r /Applications/Xcode_10* +#sudo rm -r /Applications/Xcode_12* +sudo rm -r /Applications/Xcode_11.*.app +#Firefox* Julia* Microsoft* R* Visual* +ls -al -h /Applications +df -h diff --git a/b2g/init/docker_env_darwin.sh b/b2g/init/docker_env_darwin.sh index 5f4c84e..acd5c8d 100755 --- a/b2g/init/docker_env_darwin.sh +++ b/b2g/init/docker_env_darwin.sh @@ -1,28 +1,23 @@ - df -h - #### - more /System/Library/CoreServices/SystemVersion.plist - ls /Applications/Xcode_* - #sudo xcode-select --switch /Applications/Xcode_11.app/Contents/Developer - sudo xcode-select --switch /Applications/Xcode_12.app/Contents/Developer - - ####install - brew install expect gnu-sed ccache coreutils zstd gcc perl cpanm unzip binutils - - sudo ln -s /usr/local/bin/gsed /usr/local/bin/sed - #sudo ln -s /usr/local/bin/gstat /usr/local/bin/stat - - ####git - git config --global user.name "ci" - git config --global user.email "ci@github.com" - - #####zstd - brew install zstd - - #####rclone - mkdir -p ~/.config/rclone - git clone git@github.com:ittat/tmp.git - cd tmp - mv ./rclone.conf ~/.config/rclone - brew install rclone - rclone ls itd:test +df -h +#### +more /System/Library/CoreServices/SystemVersion.plist +ls /Applications/Xcode_* +#sudo xcode-select --switch /Applications/Xcode_11.app/Contents/Developer +sudo xcode-select --switch /Applications/Xcode_12.app/Contents/Developer +####install +brew install expect gnu-sed ccache coreutils zstd gcc perl cpanm unzip binutils +sudo ln -s /usr/local/bin/gsed /usr/local/bin/sed +#sudo ln -s /usr/local/bin/gstat /usr/local/bin/stat +####git +git config --global user.name "ci" +git config --global user.email "ci@github.com" +#####zstd +brew install zstd +#####rclone +mkdir -p ~/.config/rclone +git clone git@github.com:ittat/tmp.git +cd tmp +mv ./rclone.conf ~/.config/rclone +brew install rclone +rclone ls itd:tes \ No newline at end of file diff --git a/b2g/source/compress_sourceimage.sh b/b2g/source/compress_sourceimage.sh index ea2ab57..0545e38 100755 --- a/b2g/source/compress_sourceimage.sh +++ b/b2g/source/compress_sourceimage.sh @@ -1,5 +1,7 @@ - - cd ~ - zstd --fast=7 ${sourceimage}.dmg.sparseimage - rm ${sourceimage}.dmg.sparseimage - ls -al ${sourceimage}.dmg.sparseimage* +#!/bin/bash +set -e +cd ~ +zstd --fast=7 ${sourceimage}.dmg.sparseimage +rm ${sourceimage}.dmg.sparseimage +ls -al ${sourceimage}.dmg.sparseimage + \ No newline at end of file diff --git a/b2g/source/create_outimage.sh b/b2g/source/create_outimage.sh index 1a9a1a9..b5e8865 100755 --- a/b2g/source/create_outimage.sh +++ b/b2g/source/create_outimage.sh @@ -1,3 +1,3 @@ - cd ~ - hdiutil create -type SPARSE -fs 'Case-sensitive Journaled HFS+' -size 50g ~/${outimage}.dmg - ls -al ${outimage}.dmg.sparseimage* +cd ~ +hdiutil create -type SPARSE -fs 'Case-sensitive Journaled HFS+' -size 50g ~/${outimage}.dmg +ls -al ${outimage}.dmg.sparseimage* \ No newline at end of file diff --git a/b2g/source/download_source.sh b/b2g/source/download_source.sh index cc398c9..973e482 100755 --- a/b2g/source/download_source.sh +++ b/b2g/source/download_source.sh @@ -1,17 +1,16 @@ - df -h - cd ~ - rclone copy itd:ci/${remotepath}/${sourceimage}.dmg.sparseimage.zst ./ - zstd --decompress ${sourceimage}.dmg.sparseimage.zst - sudo rm -r ./${sourceimage}.dmg.sparseimage.zst - rclone copy itd:ci/${remotepath}/${outimage}.dmg.sparseimage ./ - - #####mount - hdiutil attach /Users/runner/${sourceimage}.dmg.sparseimage -mountpoint ${work} - if [ -d "${work}/B2G/out" ];then - sudo rm -r ${work}/B2G/out - fi - hdiutil attach /Users/runner/${outimage}.dmg.sparseimage -mountpoint ${out_work} - sudo ln -s ${out_path} ${work}/B2G/out - ls -al ${out_work} - df -h + df -h +cd ~ +rclone copy itd:ci/${remotepath}/${sourceimage}.dmg.sparseimage.zst ./ +zstd --decompress ${sourceimage}.dmg.sparseimage.zst +sudo rm -r ./${sourceimage}.dmg.sparseimage.zst +rclone copy itd:ci/${remotepath}/${outimage}.dmg.sparseimage ./ +#####mount +hdiutil attach /Users/runner/${sourceimage}.dmg.sparseimage -mountpoint ${work} +if [ -d "${work}/B2G/out" ];then + sudo rm -r ${work}/B2G/out +fi +hdiutil attach /Users/runner/${outimage}.dmg.sparseimage -mountpoint ${out_work} +sudo ln -s ${out_path} ${work}/B2G/out +ls -al ${out_work} +df -h \ No newline at end of file diff --git a/b2g/source/fix_soucre.sh b/b2g/source/fix_soucre.sh index 06b2cb2..a8fd82b 100755 --- a/b2g/source/fix_soucre.sh +++ b/b2g/source/fix_soucre.sh @@ -1,39 +1,39 @@ #!/bin/bash set -e - ####patcher - if [ -d "${work}/B2G/patcher" ]; then - echo apply patch - cd ${work}/B2G - ./patcher/patcher.sh - fi - - ####fix 10.15 issue - cd ${work}/B2G - /usr/bin/sed -i '' '14d' system/sepolicy/tests/Android.bp - /usr/bin/sed -i '' '65i\'$'\n\"10\.15\"\,\n' build/soong/cc/config/x86_darwin_host.go - - ### - cd ~ - git clone https://github.com/OnePlus-onyx/build-CI -b b2g - sudo chmod +x ~/build-CI/patch-b2g-aosp.sh - ~/build-CI/patch-b2g-aosp.sh - - ### - cd ${work} - # Create a dummy b2g archive - mkdir b2g - tar cvjf b2g-dummy.tar.bz2 b2g - rm -rf b2g - - ####api-daemon split - cd ${work}/B2G/gonk-misc - if [ -d "${work}/B2G/gonk-misc/api-daemon" ];then - echo api-daemon patch - sudo rm -r ${work}/B2G/gonk-misc/api-daemon - fi - git clone https://github.com/b2g-gsi/api-daemon -b without-api-daemon - - - #### - cd ${work}/B2G - sudo rm -rf .repo +####patcher +if [ -d "${work}/B2G/patcher" ]; then + echo apply patch + cd ${work}/B2G + ./patcher/patcher.sh +fi + +####fix 10.15 issue +cd ${work}/B2G +/usr/bin/sed -i '' '14d' system/sepolicy/tests/Android.bp +/usr/bin/sed -i '' '65i\'$'\n\"10\.15\"\,\n' build/soong/cc/config/x86_darwin_host.go + +### +cd ~ +git clone https://github.com/OnePlus-onyx/build-CI -b b2g +sudo chmod +x ~/build-CI/patch-b2g-aosp.sh +~/build-CI/patch-b2g-aosp.sh + +### +cd ${work} +# Create a dummy b2g archive +mkdir b2g +tar cvjf b2g-dummy.tar.bz2 b2g +rm -rf b2g + +####api-daemon split +cd ${work}/B2G/gonk-misc +if [ -d "${work}/B2G/gonk-misc/api-daemon" ];then + echo api-daemon patch + sudo rm -r ${work}/B2G/gonk-misc/api-daemon +fi +git clone https://github.com/b2g-gsi/api-daemon -b without-api-daemon + + +#### +cd ${work}/B2G +sudo rm -rf .r \ No newline at end of file diff --git a/b2g/source/git_gecko.sh b/b2g/source/git_gecko.sh index 5e6a84c..ef6f0c4 100755 --- a/b2g/source/git_gecko.sh +++ b/b2g/source/git_gecko.sh @@ -1,12 +1,12 @@ - df -h - cd ~ - curl https://packages.preprod.kaiostech.com/ndk/v3/mozbuild.tar.bz2 -o mozbuild.tar.bz2 - tar -xvf mozbuild.tar.bz2 - sudo rm mozbuild.tar.bz2 - cd ~ - git clone https://github.com/kaiostech/gecko-b2g -b gonk - cd gecko-b2g - git checkout -b 8adcdfd21c3dea054c31b2552c0c00e3517ebd7c - #git clone https://github.com/ittat/gecko-b2g-1 -b ittat-patch-2 --depth=1 - #mv gecko-b2g-1 gecko-b2g - df -h +df -h +cd ~ +curl https://packages.preprod.kaiostech.com/ndk/v3/mozbuild.tar.bz2 -o mozbuild.tar.bz2 +tar -xvf mozbuild.tar.bz2 +sudo rm mozbuild.tar.bz2 +cd ~ +git clone https://github.com/kaiostech/gecko-b2g -b gonk +cd gecko-b2g +git checkout -b 8adcdfd21c3dea054c31b2552c0c00e3517ebd7c +#git clone https://github.com/ittat/gecko-b2g-1 -b ittat-patch-2 --depth=1 +#mv gecko-b2g-1 gecko-b2g +df - diff --git a/b2g/source/repo_source.sh b/b2g/source/repo_source.sh index c65be39..81919b4 100755 --- a/b2g/source/repo_source.sh +++ b/b2g/source/repo_source.sh @@ -1,10 +1,10 @@ #!/bin/bash set -e - df -h - cd ${work} - git clone ${b2g_source} -b ${b2g_branch} --depth=1 - cd ./B2G - echo Download ... - #TODO - GITREPO=https://github.com/b2g-gsi/manifests BRANCH=${b2g_branch} REPO_INIT_FLAGS="--depth=1" REPO_SYNC_FLAGS=" -j128 --force-sync --current-branch --no-tags --no-clone-bundle --optimized-fetch --prune" ./config.sh b2g_gsi - df -h +df -h +cd ${work} +git clone ${b2g_source} -b ${b2g_branch} --depth=1 +cd ./B2G +echo Download ... +#TODO +GITREPO=https://github.com/b2g-gsi/manifests BRANCH=${b2g_branch} REPO_INIT_FLAGS="--depth=1" REPO_SYNC_FLAGS=" -j128 --force-sync --current-branch --no-tags --no-clone-bundle --optimized-fetch --prune" ./config.sh b2g_gsi +df -h \ No newline at end of file diff --git a/b2g/source/upload_image.sh b/b2g/source/upload_image.sh index 4d8d02f..c16a93e 100755 --- a/b2g/source/upload_image.sh +++ b/b2g/source/upload_image.sh @@ -1,7 +1,7 @@ - df -h - rclone copy ~/${sourceimage}.dmg.sparseimage.zst itd:ci/${remotepath} - sudo rm -rf ${sourceimage}.dmg.sparseimage.zst - rclone copy ~/${outimage}.dmg.sparseimage itd:ci/${remotepath} - sudo rm -rf ${outimage}.dmg.sparseimage - df -h +df -h +rclone copy ~/${sourceimage}.dmg.sparseimage.zst itd:ci/${remotepath} +sudo rm -rf ${sourceimage}.dmg.sparseimage.zst +rclone copy ~/${outimage}.dmg.sparseimage itd:ci/${remotepath} +sudo rm -rf ${outimage}.dmg.sparseimage +df -h \ No newline at end of file diff --git a/b2g/source/upload_out_image.sh b/b2g/source/upload_out_image.sh index 41550ba..dbf7f0a 100755 --- a/b2g/source/upload_out_image.sh +++ b/b2g/source/upload_out_image.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e - df -h - cd ~ - rclone copy ./${outimage}.dmg.sparseimage itd:ci/${remotepath} - sudo rm -rf ./${outimage}.dmg.sparseimage - df -h +df -h +cd ~ +rclone copy ./${outimage}.dmg.sparseimage itd:ci/${remotepath} +sudo rm -rf ./${outimage}.dmg.sparseimage +df -h \ No newline at end of file diff --git a/b2g/source/upload_sysroot.sh b/b2g/source/upload_sysroot.sh index c9c6a84..90e9d2a 100755 --- a/b2g/source/upload_sysroot.sh +++ b/b2g/source/upload_sysroot.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e - cd ${work} - rclone copy b2g-sysroot.tar.zst itd:ci/${remotepath} - sudo rm b2g-sysroot.tar.zst - rclone copy api-sysroot.tar.zst itd:ci/${remotepath} - sudo rm api-sysroot.tar.zst +cd ${work} +rclone copy b2g-sysroot.tar.zst itd:ci/${remotepath} +sudo rm b2g-sysroot.tar.zst +rclone copy api-sysroot.tar.zst itd:ci/${remotepath} +sudo rm api-sysroot.tar.zst \ No newline at end of file diff --git a/b2g/source/upload_systemimage.sh b/b2g/source/upload_systemimage.sh index 5d93c85..4d85722 100755 --- a/b2g/source/upload_systemimage.sh +++ b/b2g/source/upload_systemimage.sh @@ -1,6 +1,6 @@ #!/bin/bash set -e - cd ${work} - xz -c B2G/out/target/product/${device_name}/system.img > ~/${systemimage} - cd ~ - rclone copy system.img.xz itd:ci/${remotepath} +cd ${work} +xz -c B2G/out/target/product/${device_name}/system.img > ~/${systemimage} +cd ~ +rclone copy system.img.xz itd:ci/${remotepath} \ No newline at end of file diff --git a/common/init/all_unmount_darwin.sh b/common/init/all_unmount_darwin.sh index 5b561ee..041cbac 100755 --- a/common/init/all_unmount_darwin.sh +++ b/common/init/all_unmount_darwin.sh @@ -1,19 +1,19 @@ #!/bin/bash #set -e cd ~ - df -h - while [ -d "${out_work}" ] ;do - hdiutil detach "${out_work}" -force - done - while [ -d "${work}" ] ;do - hdiutil detach "${work}" -force - done - #if [ -d "${out_work}" ]; then - #hdiutil detach "${out_work}" -force; - #fi - #if [ -d "${work}" ]; then - #hdiutil detach "${work}" -force; - #fi - #rm ${sourceimage}.dmg.sparseimage* - #rm ${outimage}.dmg.sparseimage* - df -h +df -h +while [ -d "${out_work}" ] ;do + hdiutil detach "${out_work}" -force +done +while [ -d "${work}" ] ;do + hdiutil detach "${work}" -force +done +#if [ -d "${out_work}" ]; then +#hdiutil detach "${out_work}" -force; +#fi +#if [ -d "${work}" ]; then +#hdiutil detach "${work}" -force; +#fi +#rm ${sourceimage}.dmg.sparseimage* +#rm ${outimage}.dmg.sparseimage* +df - \ No newline at end of file diff --git a/common/init/clean_space_darwin.sh b/common/init/clean_space_darwin.sh index 841bd45..2a59116 100755 --- a/common/init/clean_space_darwin.sh +++ b/common/init/clean_space_darwin.sh @@ -1,10 +1,10 @@ #!/bin/bash set -e - ls -al -h /Applications - df -h - sudo rm -r /Applications/Xcode_10* - #sudo rm -r /Applications/Xcode_12* - sudo rm -r /Applications/Xcode_11* - #Firefox* Julia* Microsoft* R* Visual* - ls -al -h /Applications - df -h +ls -al -h /Applications +df -h +sudo rm -r /Applications/Xcode_10* +#sudo rm -r /Applications/Xcode_12* +sudo rm -r /Applications/Xcode_11* +#Firefox* Julia* Microsoft* R* Visual* +ls -al -h /Applications +df -h \ No newline at end of file diff --git a/common/init/clean_space_linux.sh b/common/init/clean_space_linux.sh index a67d6f6..600b5b3 100755 --- a/common/init/clean_space_linux.sh +++ b/common/init/clean_space_linux.sh @@ -1,16 +1,16 @@ #!/bin/bash set -e - df -h - echo ———————————————————————————————————— - sudo rm -rf "/usr/local/share/boost" - sudo rm -rf "$AGENT_TOOLSDIRECTORY" - sudo apt remove -y 'php.*' - sudo apt-get remove -y '^ghc-8.*' - sudo apt-get remove -y '^dotnet-.*' - sudo apt-get autoremove -y - sudo apt-get clean - sudo rm -rf /etc/mysql - echo "Removing large directories" - # deleting 15GB - rm -rf /usr/share/dotnet/ - df -h +df -h +echo ———————————————————————————————————— +sudo rm -rf "/usr/local/share/boost" +sudo rm -rf "$AGENT_TOOLSDIRECTORY" +sudo apt remove -y 'php.*' +sudo apt-get remove -y '^ghc-8.*' +sudo apt-get remove -y '^dotnet-.*' +sudo apt-get autoremove -y +sudo apt-get clean +sudo rm -rf /etc/mysql +echo "Removing large directories" +# deleting 15GB +rm -rf /usr/share/dotnet/ +df - diff --git a/common/init/env_darwin.sh b/common/init/env_darwin.sh index 58ce4aa..0b8c8b3 100755 --- a/common/init/env_darwin.sh +++ b/common/init/env_darwin.sh @@ -1,33 +1,32 @@ #!/bin/bash set -e - df -h - #### - more /System/Library/CoreServices/SystemVersion.plist - ls /Applications/Xcode_* - #sudo xcode-select --switch /Applications/Xcode_11.app/Contents/Developer - sudo xcode-select --switch /Applications/Xcode_12.app/Contents/Developer - echo [Set] Xcode_12 - - ####install - brew install expect gnu-sed ccache coreutils zstd gcc perl cpanm unzip binutils repo xmlstarlet - - sudo ln -s /usr/local/bin/gsed /usr/local/bin/sed - #sudo ln -s /usr/local/bin/gstat /usr/local/bin/stat - - ####git - git config --global user.name "ci" - git config --global user.email "ci@github.com" - - #####zstd - brew install zstd - - #####rclone - cd ~ - mkdir -p ~/.config/rclone - #your drive key - echo "$RCLONE" > ~/.config/rclone/rclone.conf - brew install rclone - echo [TEST] rclone - rclone ls itd: - echo [Done] rclone - +df -h +#### +more /System/Library/CoreServices/SystemVersion.plist +ls /Applications/Xcode_* +#sudo xcode-select --switch /Applications/Xcode_11.app/Contents/Developer +sudo xcode-select --switch /Applications/Xcode_12.app/Contents/Developer +echo [Set] Xcode_12 + +####install +brew install expect gnu-sed ccache coreutils zstd gcc perl cpanm unzip binutils repo xmlstarlet + +sudo ln -s /usr/local/bin/gsed /usr/local/bin/sed +#sudo ln -s /usr/local/bin/gstat /usr/local/bin/stat + +####git +git config --global user.name "ci" +git config --global user.email "ci@github.com" + +#####zstd +brew install zstd + +#####rclone +cd ~ +mkdir -p ~/.config/rclone +#your drive key +echo "$RCLONE" > ~/.config/rclone/rclone.conf +brew install rclone +echo [TEST] rclone +rclone ls itd: +echo [Done] rclone diff --git a/common/init/env_linux.sh b/common/init/env_linux.sh index 334a8bd..4f314fb 100755 --- a/common/init/env_linux.sh +++ b/common/init/env_linux.sh @@ -1,32 +1,32 @@ #!/bin/bash set -e - df -h - ##### - sudo apt install git make mercurial yasm libncurses5 libfuse-dev - wget http://www.nasm.us/pub/nasm/releasebuilds/2.14.02/nasm-2.14.02.tar.bz2 - tar xfj nasm-2.14.02.tar.bz2 - rm nasm-2.14.02.tar.bz2 - cd nasm-2.14.02/ - ./autogen.sh - ./configure --prefix=/usr/local/ - make - sudo make install - nasm -v - cd ../ - rm -r nasm-2.14.02/ - - #### - cd ~ - git config --global user.name "ci" - git config --global user.email "ci@github.com" +df -h +##### +sudo apt install git make mercurial yasm libncurses5 libfuse-dev +wget http://www.nasm.us/pub/nasm/releasebuilds/2.14.02/nasm-2.14.02.tar.bz2 +tar xfj nasm-2.14.02.tar.bz2 +rm nasm-2.14.02.tar.bz2 +cd nasm-2.14.02/ +./autogen.sh +./configure --prefix=/usr/local/ +make +sudo make install +nasm -v +cd ../ +rm -r nasm-2.14.02/ - #rclone - cd ~ - mkdir -p ~/.config/rclone - #your drive key - echo "$RCLONE" > ~/.config/rclone/rclone.conf - #brew install rclone - brew install --build-from-source rclone - echo [TEST] rclone - rclone ls itd: - echo [Done] rclone +#### +cd ~ +git config --global user.name "ci" +git config --global user.email "ci@github.com" + +#rclone +cd ~ +mkdir -p ~/.config/rclone +#your drive key +echo "$RCLONE" > ~/.config/rclone/rclone.conf +#brew install rclone +brew install --build-from-source rclone +echo [TEST] rclone +rclone ls itd: +echo [Done] rclone \ No newline at end of file diff --git a/common/source/compress_sourceimage.sh b/common/source/compress_sourceimage.sh index 7d1db16..b340215 100755 --- a/common/source/compress_sourceimage.sh +++ b/common/source/compress_sourceimage.sh @@ -1,6 +1,6 @@ #!/bin/bash set -e - cd ~ - zstd --fast=7 ${sourceimage}.dmg.sparseimage - rm ${sourceimage}.dmg.sparseimage - ls -al ${sourceimage}.dmg.sparseimage* +cd ~ +zstd --fast=7 ${sourceimage}.dmg.sparseimage +rm ${sourceimage}.dmg.sparseimage +ls -al ${sourceimage}.dmg.sparseimage* \ No newline at end of file diff --git a/common/source/download_source_from_gdrive.sh b/common/source/download_source_from_gdrive.sh index b31a4ab..abab575 100755 --- a/common/source/download_source_from_gdrive.sh +++ b/common/source/download_source_from_gdrive.sh @@ -1,26 +1,26 @@ #!/bin/bash set -e - df -h - cd ~ - rclone copy itd:ci/${remotepath}/${sourceimage}.dmg.sparseimage.zst ./ - zstd --decompress ${sourceimage}.dmg.sparseimage.zst - sudo rm -r ./${sourceimage}.dmg.sparseimage.zst - rclone copy itd:ci/${remotepath}/${outimage}.dmg.sparseimage ./ - - #####mount - hdiutil attach /Users/runner/${sourceimage}.dmg.sparseimage -mountpoint ${work} - - source_path=${work} - if [ -d "${work}/B2G" ];then - source_path=${work}/B2G - fi - - if [ -d "${source_path}/out" ];then - sudo rm -r ${source_path}/out - fi - hdiutil attach /Users/runner/${outimage}.dmg.sparseimage -mountpoint ${out_work} - ##TODO - # mv ${out_work}/B2G/* ${out_work} - sudo ln -s ${out_work} ${source_path}/out - ls -al ${out_work} - df -h +df -h +cd ~ +rclone copy itd:ci/${remotepath}/${sourceimage}.dmg.sparseimage.zst ./ +zstd --decompress ${sourceimage}.dmg.sparseimage.zst +sudo rm -r ./${sourceimage}.dmg.sparseimage.zst +rclone copy itd:ci/${remotepath}/${outimage}.dmg.sparseimage ./ + +#####mount +hdiutil attach /Users/runner/${sourceimage}.dmg.sparseimage -mountpoint ${work} + +source_path=${work} +if [ -d "${work}/B2G" ];then + source_path=${work}/B2G +fi + +if [ -d "${source_path}/out" ];then + sudo rm -r ${source_path}/out +fi +hdiutil attach /Users/runner/${outimage}.dmg.sparseimage -mountpoint ${out_work} +##TODO + mv ${out_work}/B2G/* ${out_work} +sudo ln -s ${out_work} ${source_path}/out +ls -al ${out_work} +df \ No newline at end of file diff --git a/common/source/upload_image.sh b/common/source/upload_image.sh index 525f304..333aebc 100755 --- a/common/source/upload_image.sh +++ b/common/source/upload_image.sh @@ -1,8 +1,8 @@ #!/bin/bash set -e - df -h - rclone copy ~/${sourceimage}.dmg.sparseimage.zst itd:ci/${remotepath} - sudo rm -rf ${sourceimage}.dmg.sparseimage.zst - rclone copy ~/${outimage}.dmg.sparseimage itd:ci/${remotepath} - sudo rm -rf ${outimage}.dmg.sparseimage - df -h +df -h +rclone copy ~/${sourceimage}.dmg.sparseimage.zst itd:ci/${remotepath} +sudo rm -rf ${sourceimage}.dmg.sparseimage.zst +rclone copy ~/${outimage}.dmg.sparseimage itd:ci/${remotepath} +sudo rm -rf ${outimage}.dmg.sparseimage +df -h \ No newline at end of file diff --git a/common/source/upload_out_image.sh b/common/source/upload_out_image.sh index 41550ba..dbf7f0a 100755 --- a/common/source/upload_out_image.sh +++ b/common/source/upload_out_image.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e - df -h - cd ~ - rclone copy ./${outimage}.dmg.sparseimage itd:ci/${remotepath} - sudo rm -rf ./${outimage}.dmg.sparseimage - df -h +df -h +cd ~ +rclone copy ./${outimage}.dmg.sparseimage itd:ci/${remotepath} +sudo rm -rf ./${outimage}.dmg.sparseimage +df -h \ No newline at end of file From 03b67345a5580ccbebedf083023b13ea6d44b022 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 11 Jun 2021 13:57:18 +0800 Subject: [PATCH 026/141] fix one --- common/init/all_unmount_darwin.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/common/init/all_unmount_darwin.sh b/common/init/all_unmount_darwin.sh index 041cbac..12348b0 100755 --- a/common/init/all_unmount_darwin.sh +++ b/common/init/all_unmount_darwin.sh @@ -15,5 +15,4 @@ done #hdiutil detach "${work}" -force; #fi #rm ${sourceimage}.dmg.sparseimage* -#rm ${outimage}.dmg.sparseimage* -df - \ No newline at end of file +#rm ${outimage}.dmg.sparseimage* \ No newline at end of file From 0f25f023db2076712343a0fe977db7ca24bc8973 Mon Sep 17 00:00:00 2001 From: ittat Date: Sun, 13 Jun 2021 10:09:19 +0800 Subject: [PATCH 027/141] Update download_source_from_gdrive.sh --- common/source/download_source_from_gdrive.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/source/download_source_from_gdrive.sh b/common/source/download_source_from_gdrive.sh index abab575..9b7cc00 100755 --- a/common/source/download_source_from_gdrive.sh +++ b/common/source/download_source_from_gdrive.sh @@ -20,7 +20,8 @@ if [ -d "${source_path}/out" ];then fi hdiutil attach /Users/runner/${outimage}.dmg.sparseimage -mountpoint ${out_work} ##TODO + ls ${out_work} mv ${out_work}/B2G/* ${out_work} sudo ln -s ${out_work} ${source_path}/out ls -al ${out_work} -df \ No newline at end of file +df From d100e58429b130e255419bdddce460694ee1f14c Mon Sep 17 00:00:00 2001 From: ittat Date: Sun, 13 Jun 2021 16:41:16 +0800 Subject: [PATCH 028/141] Update b2g_config.yml --- .github/workflows/b2g_config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/b2g_config.yml b/.github/workflows/b2g_config.yml index 5ef062a..00fbe9c 100644 --- a/.github/workflows/b2g_config.yml +++ b/.github/workflows/b2g_config.yml @@ -38,5 +38,5 @@ jobs: - name: Action run: | - ./b2g/init/webhook.sh b2g_repack + ./b2g/init/webhook.sh b2g_aosp_build #b2g_repack b2g_aosp_build b2g_gecko_build b2g_api_daemon_build From 5d7e3384579a74c11153c3bfe878c4e495d2cb6b Mon Sep 17 00:00:00 2001 From: ittat Date: Mon, 14 Jun 2021 20:06:18 +0800 Subject: [PATCH 029/141] Update download_source_from_gdrive.sh --- common/source/download_source_from_gdrive.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/common/source/download_source_from_gdrive.sh b/common/source/download_source_from_gdrive.sh index 9b7cc00..dedcdd3 100755 --- a/common/source/download_source_from_gdrive.sh +++ b/common/source/download_source_from_gdrive.sh @@ -20,8 +20,11 @@ if [ -d "${source_path}/out" ];then fi hdiutil attach /Users/runner/${outimage}.dmg.sparseimage -mountpoint ${out_work} ##TODO - ls ${out_work} - mv ${out_work}/B2G/* ${out_work} +#if [ -d "${source_path}/out" ];then +# sudo rm -r ${source_path}/out +#fi +# ls ${out_work} +# mv ${out_work}/B2G/* ${out_work} sudo ln -s ${out_work} ${source_path}/out ls -al ${out_work} df From b71ff6a70059b78741d789814369541a8f3205a5 Mon Sep 17 00:00:00 2001 From: ittat Date: Tue, 15 Jun 2021 21:25:39 +0800 Subject: [PATCH 030/141] Update clean_space_linux.sh --- common/init/clean_space_linux.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/common/init/clean_space_linux.sh b/common/init/clean_space_linux.sh index 600b5b3..1e2f2f7 100755 --- a/common/init/clean_space_linux.sh +++ b/common/init/clean_space_linux.sh @@ -13,4 +13,3 @@ sudo rm -rf /etc/mysql echo "Removing large directories" # deleting 15GB rm -rf /usr/share/dotnet/ -df - From 2cc6286f1ad37959d1ebf460951e7d8290fb8379 Mon Sep 17 00:00:00 2001 From: ittat Date: Fri, 18 Jun 2021 19:52:58 +0800 Subject: [PATCH 031/141] Update b2g_build.yml --- .github/workflows/b2g_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/b2g_build.yml b/.github/workflows/b2g_build.yml index aed6b18..28fd792 100644 --- a/.github/workflows/b2g_build.yml +++ b/.github/workflows/b2g_build.yml @@ -237,7 +237,7 @@ jobs: export SHELL=/bin/bash sudo apt update export LOCAL_NDK_BASE_URL='ftp://ftp.kaiostech.com/ndk/android-ndk' - ./mach bootstrap --no-interactive --application-choice 'GeckoView/Firefox for Android' + ./mach bootstrap --application-choice 'GeckoView/Firefox for Android' df -h - name: Build Gecko From e69371852984e78b4b3ac6e332663ed2b3cf06bd Mon Sep 17 00:00:00 2001 From: ittat Date: Fri, 18 Jun 2021 19:53:45 +0800 Subject: [PATCH 032/141] Update b2g_config.yml --- .github/workflows/b2g_config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/b2g_config.yml b/.github/workflows/b2g_config.yml index 00fbe9c..0354e61 100644 --- a/.github/workflows/b2g_config.yml +++ b/.github/workflows/b2g_config.yml @@ -38,5 +38,5 @@ jobs: - name: Action run: | - ./b2g/init/webhook.sh b2g_aosp_build + ./b2g/init/webhook.sh b2g_gecko_build #b2g_repack b2g_aosp_build b2g_gecko_build b2g_api_daemon_build From cf94a5f7253325693a7dda025c0e59cd86f16bdb Mon Sep 17 00:00:00 2001 From: ittat Date: Fri, 18 Jun 2021 22:51:38 +0800 Subject: [PATCH 033/141] Update build_gecko.sh --- b2g/build/build_gecko.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/build/build_gecko.sh b/b2g/build/build_gecko.sh index a473695..8b98e91 100755 --- a/b2g/build/build_gecko.sh +++ b/b2g/build/build_gecko.sh @@ -5,7 +5,7 @@ cd ~/gecko-b2g export SHELL=/bin/bash sudo apt update export LOCAL_NDK_BASE_URL='ftp://ftp.kaiostech.com/ndk/android-ndk' -./mach bootstrap --no-interactive --application-choice 'GeckoView/Firefox for Android' +#./mach bootstrap --application-choice 'GeckoView/Firefox for Android' df -h df -h @@ -44,4 +44,4 @@ export MOZ_DISABLE_LTO=1 ./build-gsi-b2g.sh ./build-gsi-b2g.sh package df -h -ls ${GECKO_OBJDIR}/d \ No newline at end of file +ls ${GECKO_OBJDIR}/d From dff7ad75841cdf33ece7422386c56f2f1f877d9e Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 19 Jun 2021 10:25:26 +0800 Subject: [PATCH 034/141] Update create-b2g-sysroot.sh --- b2g/build/create-b2g-sysroot.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/b2g/build/create-b2g-sysroot.sh b/b2g/build/create-b2g-sysroot.sh index 7b0b966..c769d2c 100644 --- a/b2g/build/create-b2g-sysroot.sh +++ b/b2g/build/create-b2g-sysroot.sh @@ -112,6 +112,7 @@ out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/libhwbinder.so out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/libmedia_omx.so out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/libmedia.so out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/libmtp.so +out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/libnetdbpf.so out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/libstagefright_foundation.so out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/libstagefright_omx.so out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/libstagefright.so @@ -152,6 +153,7 @@ hardware/interfaces/graphics/composer/2.2/utils/command-buffer/include hardware/interfaces/graphics/composer/2.3/utils/command-buffer/include hardware/libhardware/include hardware/libhardware_legacy/include +system/bpf/libbpf_android/include system/connectivity system/core/base/include system/core/libcutils/include @@ -167,7 +169,9 @@ system/libhidl/base/include system/libhidl/transport/include system/libhidl/transport/token/1.0/utils/include system/media/audio/include -system/media/camera/include" +system/media/camera/include +system/netd/libnetdbpf/include +system/netd/libnetdutils/include" copy_to_sysroot "${INCLUDE_FOLDERS}" "include" From db662da0c834a9f172492963ee3b72d419e3ae54 Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 19 Jun 2021 12:24:27 +0800 Subject: [PATCH 035/141] Update b2g_config.yml --- .github/workflows/b2g_config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/b2g_config.yml b/.github/workflows/b2g_config.yml index 0354e61..00fbe9c 100644 --- a/.github/workflows/b2g_config.yml +++ b/.github/workflows/b2g_config.yml @@ -38,5 +38,5 @@ jobs: - name: Action run: | - ./b2g/init/webhook.sh b2g_gecko_build + ./b2g/init/webhook.sh b2g_aosp_build #b2g_repack b2g_aosp_build b2g_gecko_build b2g_api_daemon_build From 997fc3ebb6bbf8b64ac81fccd7b1cde42670518e Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 19 Jun 2021 12:35:55 +0800 Subject: [PATCH 036/141] Create b2g_config.yml From ebda842a1a361ec432f3abc72d2bb0744f0e04a6 Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 19 Jun 2021 21:56:09 +0800 Subject: [PATCH 037/141] Update create-b2g-sysroot.sh --- b2g/build/create-b2g-sysroot.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/b2g/build/create-b2g-sysroot.sh b/b2g/build/create-b2g-sysroot.sh index c769d2c..b560abc 100644 --- a/b2g/build/create-b2g-sysroot.sh +++ b/b2g/build/create-b2g-sysroot.sh @@ -78,6 +78,7 @@ out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/android.hardware. out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/android.hardware.radio@1.0.so out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/android.hardware.radio@1.1.so out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/android.hardware.sensors@1.0.so +out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/android.hardware.sensors@2.0.so out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/android.hardware.vibrator@1.0.so out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/android.hardware.wifi@1.0.so out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/android.hardware.wifi@1.1.so @@ -109,6 +110,7 @@ out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/libhidlbase.so out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/libhidlmemory.so out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/libhidltransport.so out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/libhwbinder.so +out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/libmedia_helper.so out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/libmedia_omx.so out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/libmedia.so out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/libmtp.so @@ -211,6 +213,7 @@ out/soong/.intermediates/hardware/interfaces/power/1.0/android.hardware.power@1. out/soong/.intermediates/hardware/interfaces/radio/1.0/android.hardware.radio@1.0_genc++_headers/gen out/soong/.intermediates/hardware/interfaces/radio/1.1/android.hardware.radio@1.1_genc++_headers/gen out/soong/.intermediates/hardware/interfaces/sensors/1.0/android.hardware.sensors@1.0_genc++_headers/gen +out/soong/.intermediates/hardware/interfaces/sensors/1.0/android.hardware.sensors@2.0_genc++_headers/gen out/soong/.intermediates/hardware/interfaces/vibrator/1.0/android.hardware.vibrator@1.0_genc++_headers/gen out/soong/.intermediates/hardware/interfaces/wifi/1.0/android.hardware.wifi@1.0_genc++_headers/gen out/soong/.intermediates/hardware/interfaces/wifi/1.1/android.hardware.wifi@1.1_genc++_headers/gen From 7ced68b6538c3355ee28f8e01de815d4f7bd9930 Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 19 Jun 2021 22:20:57 +0800 Subject: [PATCH 038/141] Update all_unmount_darwin.sh --- b2g/init/all_unmount_darwin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/init/all_unmount_darwin.sh b/b2g/init/all_unmount_darwin.sh index aaefce8..6489102 100755 --- a/b2g/init/all_unmount_darwin.sh +++ b/b2g/init/all_unmount_darwin.sh @@ -8,4 +8,4 @@ while [ -d "${out_work}" ] ;do done while [ -d "${work}" ] ;do hdiutil detach "${work}" -force -don \ No newline at end of file +done From 1174aa39f94df4f1e315d5457f7275d5ed46165f Mon Sep 17 00:00:00 2001 From: ittat Date: Sun, 20 Jun 2021 08:16:46 +0800 Subject: [PATCH 039/141] Update create-b2g-sysroot.sh --- b2g/build/create-b2g-sysroot.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/build/create-b2g-sysroot.sh b/b2g/build/create-b2g-sysroot.sh index b560abc..3d03116 100644 --- a/b2g/build/create-b2g-sysroot.sh +++ b/b2g/build/create-b2g-sysroot.sh @@ -213,7 +213,7 @@ out/soong/.intermediates/hardware/interfaces/power/1.0/android.hardware.power@1. out/soong/.intermediates/hardware/interfaces/radio/1.0/android.hardware.radio@1.0_genc++_headers/gen out/soong/.intermediates/hardware/interfaces/radio/1.1/android.hardware.radio@1.1_genc++_headers/gen out/soong/.intermediates/hardware/interfaces/sensors/1.0/android.hardware.sensors@1.0_genc++_headers/gen -out/soong/.intermediates/hardware/interfaces/sensors/1.0/android.hardware.sensors@2.0_genc++_headers/gen +out/soong/.intermediates/hardware/interfaces/sensors/2.0/android.hardware.sensors@2.0_genc++_headers/gen out/soong/.intermediates/hardware/interfaces/vibrator/1.0/android.hardware.vibrator@1.0_genc++_headers/gen out/soong/.intermediates/hardware/interfaces/wifi/1.0/android.hardware.wifi@1.0_genc++_headers/gen out/soong/.intermediates/hardware/interfaces/wifi/1.1/android.hardware.wifi@1.1_genc++_headers/gen From fbef229825129915a813a6f68681030dc7834fc6 Mon Sep 17 00:00:00 2001 From: ittat Date: Sun, 20 Jun 2021 02:29:02 +0000 Subject: [PATCH 040/141] update --- .github/workflows/b2g_config.yml | 4 ++-- b2g/source/repo_source.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/b2g_config.yml b/.github/workflows/b2g_config.yml index 00fbe9c..89cc7a2 100644 --- a/.github/workflows/b2g_config.yml +++ b/.github/workflows/b2g_config.yml @@ -18,7 +18,7 @@ env: device_name: phhgsi_arm64_ab repo_dispatches: "https://api.github.com/repos/b2g-gsi/build-actions/dispatches" b2g_source: "https://github.com/b2g-gsi/B2G" - b2g_branch: "ittat-patch-gsi" + b2g_branch: "gsi" build_device_tag: gsi_arm64_ab device_arch: aarch64-linux-android actions_branch: b2g_gsi @@ -38,5 +38,5 @@ jobs: - name: Action run: | - ./b2g/init/webhook.sh b2g_aosp_build + ./b2g/init/webhook.sh b2g_repack #b2g_repack b2g_aosp_build b2g_gecko_build b2g_api_daemon_build diff --git a/b2g/source/repo_source.sh b/b2g/source/repo_source.sh index 81919b4..47732c2 100755 --- a/b2g/source/repo_source.sh +++ b/b2g/source/repo_source.sh @@ -6,5 +6,5 @@ git clone ${b2g_source} -b ${b2g_branch} --depth=1 cd ./B2G echo Download ... #TODO -GITREPO=https://github.com/b2g-gsi/manifests BRANCH=${b2g_branch} REPO_INIT_FLAGS="--depth=1" REPO_SYNC_FLAGS=" -j128 --force-sync --current-branch --no-tags --no-clone-bundle --optimized-fetch --prune" ./config.sh b2g_gsi +GITREPO=https://github.com/b2gos/manifests BRANCH=${b2g_branch} REPO_INIT_FLAGS="--depth=1" REPO_SYNC_FLAGS=" -j128 --force-sync --current-branch --no-tags --no-clone-bundle --optimized-fetch --prune" ./config.sh b2g_gsi df -h \ No newline at end of file From 33506ca2ba7defaf3937643fb39c809b6ab4c1ef Mon Sep 17 00:00:00 2001 From: ittat Date: Sun, 20 Jun 2021 03:36:41 +0000 Subject: [PATCH 041/141] b2g to gsi --- .github/workflows/b2g_build.yml | 47 +++--- .github/workflows/b2g_config.yml | 2 +- b2g/init/all_unmount_darwin.sh | 11 -- b2g/init/clean_space_darwin.sh | 8 - b2g/init/docker_env_darwin.sh | 23 --- b2g/source/compress_sourceimage.sh | 7 - b2g/source/create_outimage.sh | 3 - b2g/source/download_source.sh | 16 -- b2g/source/git_gecko.sh | 12 -- b2g/source/upload_image.sh | 7 - b2g/source/upload_out_image.sh | 7 - {b2g => common}/build/add_pre_api_daemon.sh | 0 .../build/create-api_sysroot.sh | 0 {b2g => common}/build/create-b2g-sysroot.sh | 0 {b2g => common}/build/repack_api-sysroot.sh | 0 {b2g => common}/build/repack_b2g-sysroot.sh | 0 common/source/download_source_from_gdrive.sh | 6 - {b2g => common}/source/fix_soucre.sh | 10 +- common/source/patch-b2g-aosp.sh | 39 +++++ {b2g => common}/source/upload_sysroot.sh | 0 {b2g => common}/source/upload_systemimage.sh | 0 gsi/build/build-gsi-b2g.sh | 156 ++++++++++++++++++ {b2g => gsi}/build/build_api-daemon.sh | 0 {b2g => gsi}/build/build_gecko.sh | 14 +- {b2g => gsi}/build/build_with_gecko.sh | 3 +- {b2g => gsi}/build/build_without_gecko.sh | 5 +- {b2g => gsi}/init/webhook.sh | 1 - gsi/source/fix_soucre.sh | 0 {b2g => gsi}/source/repo_source.sh | 0 29 files changed, 224 insertions(+), 153 deletions(-) delete mode 100755 b2g/init/all_unmount_darwin.sh delete mode 100755 b2g/init/clean_space_darwin.sh delete mode 100755 b2g/init/docker_env_darwin.sh delete mode 100755 b2g/source/compress_sourceimage.sh delete mode 100755 b2g/source/create_outimage.sh delete mode 100755 b2g/source/download_source.sh delete mode 100755 b2g/source/git_gecko.sh delete mode 100755 b2g/source/upload_image.sh delete mode 100755 b2g/source/upload_out_image.sh rename {b2g => common}/build/add_pre_api_daemon.sh (100%) rename b2g/build/api_sysroot.sh => common/build/create-api_sysroot.sh (100%) mode change 100644 => 100755 rename {b2g => common}/build/create-b2g-sysroot.sh (100%) mode change 100644 => 100755 rename {b2g => common}/build/repack_api-sysroot.sh (100%) rename {b2g => common}/build/repack_b2g-sysroot.sh (100%) rename {b2g => common}/source/fix_soucre.sh (79%) create mode 100755 common/source/patch-b2g-aosp.sh rename {b2g => common}/source/upload_sysroot.sh (100%) rename {b2g => common}/source/upload_systemimage.sh (100%) create mode 100755 gsi/build/build-gsi-b2g.sh rename {b2g => gsi}/build/build_api-daemon.sh (100%) rename {b2g => gsi}/build/build_gecko.sh (61%) rename {b2g => gsi}/build/build_with_gecko.sh (91%) rename {b2g => gsi}/build/build_without_gecko.sh (87%) rename {b2g => gsi}/init/webhook.sh (99%) create mode 100644 gsi/source/fix_soucre.sh rename {b2g => gsi}/source/repo_source.sh (100%) diff --git a/.github/workflows/b2g_build.yml b/.github/workflows/b2g_build.yml index 28fd792..a10efc5 100644 --- a/.github/workflows/b2g_build.yml +++ b/.github/workflows/b2g_build.yml @@ -56,14 +56,14 @@ jobs: - name: Fetch source run: | - ./b2g/source/repo_source.sh + ./gsi/source/repo_source.sh - name: Fix source continue-on-error: true run: | echo Fix source - ./b2g/source/fix_soucre.sh - sudo rm -rf .repo + ./common/source/fix_soucre.sh + ./gsi/source/fix_soucre.sh # upload sparseimage to gdrive - name: Upload Source @@ -74,7 +74,7 @@ jobs: - name: Start build job run: | - ./b2g/init/webhook.sh b2g_aosp_build + ./gsi/init/webhook.sh b2g_aosp_build aosp_build: if: github.event.action == 'b2g_aosp_build' || github.event.action == 'b2g_b2g_build' @@ -94,12 +94,11 @@ jobs: ./common/source/download_source_from_gdrive.sh df -h - - name: fix + - name: Env run: | brew install cpanm sudo cpan LWP::UserAgent - ####pre-api-daemon cd ~ curl https://packages.preprod.kaiostech.com/ndk/v4/mozbuild.tar.bz2 -o mozbuild.tar.bz2 tar -xvf mozbuild.tar.bz2 @@ -124,17 +123,16 @@ jobs: id: build run: | df -h - ./b2g/build/build_without_gecko.sh + ./gsi/build/build_without_gecko.sh - name: B2G Build - Build Source include Gecko if: github.event.action == 'b2g_b2g_build' run: | df -h - ./b2g/build/add_pre_api_daemon.sh - + ./common/build/add_pre_api_daemon.sh #### build - ./b2g/build/build_with_gecko.sh + ./gsi/build/build_with_gecko.sh - name: Check Current ”error.log“ Status @@ -153,26 +151,23 @@ jobs: id: sysroot if: github.event.action == 'b2g_aosp_build' && steps.check.conclusion == 'success' && steps.build.outcome == 'success' && steps.build.conclusion == 'success' run: | - chmod +x ./b2g/build/create-b2g-sysroot.sh - chmod +x ./b2g/build/api_sysroot.sh - cp ./b2g/build/create-b2g-sysroot.sh ${work}/B2G - cp ./b2g/build/api_sysroot.sh ${work}/B2G + cp ./common/build/create-b2g-sysroot.sh ${work}/B2G + cp ./common/build/create-api_sysroot.sh ${work}/B2G pip3 install zstandard pip install zstandard echo repack_b2g-sysroot - ./b2g/build/repack_b2g-sysroot.sh + ./common/build/repack_b2g-sysroot.sh echo repack_api-sysroot - ./b2g/build/repack_api-sysroot.sh + ./common/build/repack_api-sysroot.sh echo Upload b2g-sysroot and api-sysroot - ./b2g/source/upload_sysroot.sh + ./common/source/upload_sysroot.sh - name: Updoal systemimage if: github.event.action == 'b2g_b2g_build' continue-on-error: true run: | - chmod +x ./b2g/source/upload_systemimage.sh - ./b2g/source/upload_systemimage.sh + ./common/source/upload_systemimage.sh - name: Clean system environment continue-on-error: true @@ -182,7 +177,7 @@ jobs: - name: Send "build_gecko" WebHook if: github.event.action == 'b2g_aosp_build' && steps.check.conclusion == 'success' && steps.build.outcome == 'success' && steps.build.conclusion == 'success' run: | - ./b2g/init/webhook.sh b2g_gecko_build + ./gsi/init/webhook.sh b2g_gecko_build - name: Update Build Source if: steps.check.conclusion == 'success' && github.event.action == 'b2g_aosp_build' @@ -192,7 +187,7 @@ jobs: - name: Send "aosp_build" WebHook Again if: github.event.action == 'b2g_aosp_build' && steps.build.outcome == 'failure' && steps.build.conclusion == 'success' && steps.check.conclusion == 'success' run: | - ./b2g/init/webhook.sh b2g_aosp_build + ./gsi/init/webhook.sh b2g_aosp_build gecko_build: if: github.event.action == 'b2g_gecko_build' || github.event_name == 'schedule' @@ -242,7 +237,8 @@ jobs: - name: Build Gecko run: | - ./b2g/build/build_gecko.sh + cp ./gsi/build/build-gsi-b2g.sh ~/gecko-b2g + ./gsi/build/build_gecko.sh - name: Get Gecko Version run: | @@ -275,7 +271,7 @@ jobs: - name: Send "b2g_api_daemon_build" WebHook run: | - ./b2g/init/webhook.sh b2g_api_daemon_build + ./gsi/init/webhook.sh b2g_api_daemon_build api-daemon_build: if: github.event.action == 'b2g_api_daemon_build' @@ -306,9 +302,6 @@ jobs: cd ~ git clone https://github.com/kaiostech/api-daemon - #--depth=1 - #cd api-daemon - #git checkout 405f8d72005b0d753ea3a181246d4f5dbf129669 -b test ls -al - name: build Source @@ -337,4 +330,4 @@ jobs: - name: Send Done Notify && Send "b2g_build" WebHook run: | - ./b2g/init/webhook.sh b2g_b2g_build + ./gsi/init/webhook.sh b2g_b2g_build diff --git a/.github/workflows/b2g_config.yml b/.github/workflows/b2g_config.yml index 89cc7a2..1a75fff 100644 --- a/.github/workflows/b2g_config.yml +++ b/.github/workflows/b2g_config.yml @@ -38,5 +38,5 @@ jobs: - name: Action run: | - ./b2g/init/webhook.sh b2g_repack + ./gsi/init/webhook.sh b2g_repack #b2g_repack b2g_aosp_build b2g_gecko_build b2g_api_daemon_build diff --git a/b2g/init/all_unmount_darwin.sh b/b2g/init/all_unmount_darwin.sh deleted file mode 100755 index 6489102..0000000 --- a/b2g/init/all_unmount_darwin.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -set -e - -cd ~ -df -h -while [ -d "${out_work}" ] ;do - hdiutil detach "${out_work}" -force -done -while [ -d "${work}" ] ;do - hdiutil detach "${work}" -force -done diff --git a/b2g/init/clean_space_darwin.sh b/b2g/init/clean_space_darwin.sh deleted file mode 100755 index bdb9eff..0000000 --- a/b2g/init/clean_space_darwin.sh +++ /dev/null @@ -1,8 +0,0 @@ -ls -al -h /Applications -df -h -sudo rm -r /Applications/Xcode_10* -#sudo rm -r /Applications/Xcode_12* -sudo rm -r /Applications/Xcode_11.*.app -#Firefox* Julia* Microsoft* R* Visual* -ls -al -h /Applications -df -h diff --git a/b2g/init/docker_env_darwin.sh b/b2g/init/docker_env_darwin.sh deleted file mode 100755 index acd5c8d..0000000 --- a/b2g/init/docker_env_darwin.sh +++ /dev/null @@ -1,23 +0,0 @@ - -df -h -#### -more /System/Library/CoreServices/SystemVersion.plist -ls /Applications/Xcode_* -#sudo xcode-select --switch /Applications/Xcode_11.app/Contents/Developer -sudo xcode-select --switch /Applications/Xcode_12.app/Contents/Developer -####install -brew install expect gnu-sed ccache coreutils zstd gcc perl cpanm unzip binutils -sudo ln -s /usr/local/bin/gsed /usr/local/bin/sed -#sudo ln -s /usr/local/bin/gstat /usr/local/bin/stat -####git -git config --global user.name "ci" -git config --global user.email "ci@github.com" -#####zstd -brew install zstd -#####rclone -mkdir -p ~/.config/rclone -git clone git@github.com:ittat/tmp.git -cd tmp -mv ./rclone.conf ~/.config/rclone -brew install rclone -rclone ls itd:tes \ No newline at end of file diff --git a/b2g/source/compress_sourceimage.sh b/b2g/source/compress_sourceimage.sh deleted file mode 100755 index 0545e38..0000000 --- a/b2g/source/compress_sourceimage.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -set -e -cd ~ -zstd --fast=7 ${sourceimage}.dmg.sparseimage -rm ${sourceimage}.dmg.sparseimage -ls -al ${sourceimage}.dmg.sparseimage - \ No newline at end of file diff --git a/b2g/source/create_outimage.sh b/b2g/source/create_outimage.sh deleted file mode 100755 index b5e8865..0000000 --- a/b2g/source/create_outimage.sh +++ /dev/null @@ -1,3 +0,0 @@ -cd ~ -hdiutil create -type SPARSE -fs 'Case-sensitive Journaled HFS+' -size 50g ~/${outimage}.dmg -ls -al ${outimage}.dmg.sparseimage* \ No newline at end of file diff --git a/b2g/source/download_source.sh b/b2g/source/download_source.sh deleted file mode 100755 index 973e482..0000000 --- a/b2g/source/download_source.sh +++ /dev/null @@ -1,16 +0,0 @@ - - df -h -cd ~ -rclone copy itd:ci/${remotepath}/${sourceimage}.dmg.sparseimage.zst ./ -zstd --decompress ${sourceimage}.dmg.sparseimage.zst -sudo rm -r ./${sourceimage}.dmg.sparseimage.zst -rclone copy itd:ci/${remotepath}/${outimage}.dmg.sparseimage ./ -#####mount -hdiutil attach /Users/runner/${sourceimage}.dmg.sparseimage -mountpoint ${work} -if [ -d "${work}/B2G/out" ];then - sudo rm -r ${work}/B2G/out -fi -hdiutil attach /Users/runner/${outimage}.dmg.sparseimage -mountpoint ${out_work} -sudo ln -s ${out_path} ${work}/B2G/out -ls -al ${out_work} -df -h \ No newline at end of file diff --git a/b2g/source/git_gecko.sh b/b2g/source/git_gecko.sh deleted file mode 100755 index ef6f0c4..0000000 --- a/b2g/source/git_gecko.sh +++ /dev/null @@ -1,12 +0,0 @@ -df -h -cd ~ -curl https://packages.preprod.kaiostech.com/ndk/v3/mozbuild.tar.bz2 -o mozbuild.tar.bz2 -tar -xvf mozbuild.tar.bz2 -sudo rm mozbuild.tar.bz2 -cd ~ -git clone https://github.com/kaiostech/gecko-b2g -b gonk -cd gecko-b2g -git checkout -b 8adcdfd21c3dea054c31b2552c0c00e3517ebd7c -#git clone https://github.com/ittat/gecko-b2g-1 -b ittat-patch-2 --depth=1 -#mv gecko-b2g-1 gecko-b2g -df - diff --git a/b2g/source/upload_image.sh b/b2g/source/upload_image.sh deleted file mode 100755 index c16a93e..0000000 --- a/b2g/source/upload_image.sh +++ /dev/null @@ -1,7 +0,0 @@ - -df -h -rclone copy ~/${sourceimage}.dmg.sparseimage.zst itd:ci/${remotepath} -sudo rm -rf ${sourceimage}.dmg.sparseimage.zst -rclone copy ~/${outimage}.dmg.sparseimage itd:ci/${remotepath} -sudo rm -rf ${outimage}.dmg.sparseimage -df -h \ No newline at end of file diff --git a/b2g/source/upload_out_image.sh b/b2g/source/upload_out_image.sh deleted file mode 100755 index dbf7f0a..0000000 --- a/b2g/source/upload_out_image.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -set -e -df -h -cd ~ -rclone copy ./${outimage}.dmg.sparseimage itd:ci/${remotepath} -sudo rm -rf ./${outimage}.dmg.sparseimage -df -h \ No newline at end of file diff --git a/b2g/build/add_pre_api_daemon.sh b/common/build/add_pre_api_daemon.sh similarity index 100% rename from b2g/build/add_pre_api_daemon.sh rename to common/build/add_pre_api_daemon.sh diff --git a/b2g/build/api_sysroot.sh b/common/build/create-api_sysroot.sh old mode 100644 new mode 100755 similarity index 100% rename from b2g/build/api_sysroot.sh rename to common/build/create-api_sysroot.sh diff --git a/b2g/build/create-b2g-sysroot.sh b/common/build/create-b2g-sysroot.sh old mode 100644 new mode 100755 similarity index 100% rename from b2g/build/create-b2g-sysroot.sh rename to common/build/create-b2g-sysroot.sh diff --git a/b2g/build/repack_api-sysroot.sh b/common/build/repack_api-sysroot.sh similarity index 100% rename from b2g/build/repack_api-sysroot.sh rename to common/build/repack_api-sysroot.sh diff --git a/b2g/build/repack_b2g-sysroot.sh b/common/build/repack_b2g-sysroot.sh similarity index 100% rename from b2g/build/repack_b2g-sysroot.sh rename to common/build/repack_b2g-sysroot.sh diff --git a/common/source/download_source_from_gdrive.sh b/common/source/download_source_from_gdrive.sh index dedcdd3..3202b5f 100755 --- a/common/source/download_source_from_gdrive.sh +++ b/common/source/download_source_from_gdrive.sh @@ -19,12 +19,6 @@ if [ -d "${source_path}/out" ];then sudo rm -r ${source_path}/out fi hdiutil attach /Users/runner/${outimage}.dmg.sparseimage -mountpoint ${out_work} -##TODO -#if [ -d "${source_path}/out" ];then -# sudo rm -r ${source_path}/out -#fi -# ls ${out_work} -# mv ${out_work}/B2G/* ${out_work} sudo ln -s ${out_work} ${source_path}/out ls -al ${out_work} df diff --git a/b2g/source/fix_soucre.sh b/common/source/fix_soucre.sh similarity index 79% rename from b2g/source/fix_soucre.sh rename to common/source/fix_soucre.sh index a8fd82b..53ae1ff 100755 --- a/b2g/source/fix_soucre.sh +++ b/common/source/fix_soucre.sh @@ -12,11 +12,9 @@ cd ${work}/B2G /usr/bin/sed -i '' '14d' system/sepolicy/tests/Android.bp /usr/bin/sed -i '' '65i\'$'\n\"10\.15\"\,\n' build/soong/cc/config/x86_darwin_host.go -### +###build/soong cd ~ -git clone https://github.com/OnePlus-onyx/build-CI -b b2g -sudo chmod +x ~/build-CI/patch-b2g-aosp.sh -~/build-CI/patch-b2g-aosp.sh +./common/source/patch-b2g-aosp.sh ### cd ${work} @@ -25,7 +23,7 @@ mkdir b2g tar cvjf b2g-dummy.tar.bz2 b2g rm -rf b2g -####api-daemon split +####api-daemon cd ${work}/B2G/gonk-misc if [ -d "${work}/B2G/gonk-misc/api-daemon" ];then echo api-daemon patch @@ -36,4 +34,4 @@ git clone https://github.com/b2g-gsi/api-daemon -b without-api-daemon #### cd ${work}/B2G -sudo rm -rf .r \ No newline at end of file +sudo rm -rf .repo \ No newline at end of file diff --git a/common/source/patch-b2g-aosp.sh b/common/source/patch-b2g-aosp.sh new file mode 100755 index 0000000..0982838 --- /dev/null +++ b/common/source/patch-b2g-aosp.sh @@ -0,0 +1,39 @@ +#https://github.com/kaiostech/gecko-b2g/blob/gonk/taskcluster/scripts/misc/build-b2g-emulator.sh +# + +#!/bin/bash +set -x -e -v + +cd "${work}/B2G" + +# Force compressing debug symbols +patch -d build/soong -p1 <<'EOF' +diff --git a/cc/config/global.go b/cc/config/global.go +index 815c31d8..9d82d460 100644 +--- a/cc/config/global.go ++++ b/cc/config/global.go +@@ -44,6 +44,7 @@ var ( + + "-O2", + "-g", ++ "-gz", // Compress debug symbols + + "-fno-strict-aliasing", + } +@@ -69,6 +70,7 @@ var ( + "-Werror=sequence-point", + "-Werror=date-time", + "-Werror=format-security", ++ "-gz", // Compress debug symbols + } + + deviceGlobalCppflags = []string{ +@@ -85,6 +87,7 @@ var ( + "-Wl,--no-undefined-version", + "-Wl,--exclude-libs,libgcc.a", + "-Wl,--exclude-libs,libgcc_stripped.a", ++ "-Wl,--compress-debug-sections=zlib", // Compress debug symbols + } + + deviceGlobalLldflags = append(ClangFilterUnknownLldflags(deviceGlobalLdflags), +EOF \ No newline at end of file diff --git a/b2g/source/upload_sysroot.sh b/common/source/upload_sysroot.sh similarity index 100% rename from b2g/source/upload_sysroot.sh rename to common/source/upload_sysroot.sh diff --git a/b2g/source/upload_systemimage.sh b/common/source/upload_systemimage.sh similarity index 100% rename from b2g/source/upload_systemimage.sh rename to common/source/upload_systemimage.sh diff --git a/gsi/build/build-gsi-b2g.sh b/gsi/build/build-gsi-b2g.sh new file mode 100755 index 0000000..c191a01 --- /dev/null +++ b/gsi/build/build-gsi-b2g.sh @@ -0,0 +1,156 @@ +#!/bin/bash + +set -e + +export RUSTUP_TOOLCHAIN=${RUSTUP_TOOLCHAIN:-stable} + +# Check that the GONK_PATH environment variable is set. +if [ -z ${GONK_PATH+x} ]; +then + echo "Please set GONK_PATH to the root of your Gonk directory first."; + exit 1; +else + echo "Using '$GONK_PATH'"; +fi + +# Check that the GONK_PRODUCT_NAME environment variable is set. +if [ -z ${GONK_PRODUCT_NAME+x} ]; +then + echo "Please set GONK_PRODUCT_NAME to the name of the device (look at $GONK_PATH/out/target/product)."; + exit 1; +else + echo "Product is '$GONK_PRODUCT_NAME'"; +fi + +if [ -z ${GECKO_OBJDIR+x} ]; then + echo "Using default objdir" +else + export MOZ_OBJDIR="$GECKO_OBJDIR" + echo "Building in $MOZ_OBJDIR" +fi + +if [ -z ${PLATFORM_VERSION+x} ]; then + echo "Please set PLATFORM_VERSION to the android version of the device" + exit 1; +elif [ $PLATFORM_VERSION -lt 27 ]; then + echo "This script is not supporting platform version less than 27" + exit 1; +else + echo "Building in platform version $PLATFORM_VERSION" +fi + +export ANDROID_PLATFORM=android-${PLATFORM_VERSION} + +if [ -z ${GET_FRAMEBUFFER_FORMAT_FROM_HWC+x} ]; then + echo "GET_FRAMEBUFFER_FORMAT_FROM_HWC is not set" +else + HWC_DEFINE="-DGET_FRAMEBUFFER_FORMAT_FROM_HWC" + echo "Setting -DGET_FRAMEBUFFER_FORMAT_FROM_HWC" +fi + +# When user build, check if the JS shell is available. If not, download it +# to make sure we can minify JS code when packaging. +if [[ "$VARIANT" == "user" ]];then + if [ -f "./jsshell/js" ]; then + echo "JS shell found." + else + echo "Downloading JS shell..." + HOST_OS=$(uname -s) + if [ "$HOST_OS" == "Darwin" ]; then + SHELL_ARCH=mac + else + SHELL_ARCH=linux-x86_64 + fi + + mkdir -p jsshell + curl https://ftp.mozilla.org/pub/firefox/releases/67.0b8/jsshell/jsshell-${SHELL_ARCH}.zip > /tmp/jsshell-${SHELL_ARCH}.zip + cd jsshell + unzip /tmp/jsshell-${SHELL_ARCH}.zip + rm /tmp/jsshell-${SHELL_ARCH}.zip + cd .. + fi + export JS_BINARY=`pwd`/jsshell/js +fi + +export MOZCONFIG=`pwd`/mozconfig-b2g + +ANDROID_NDK=${ANDROID_NDK:-$HOME/.mozbuild/android-ndk-r20b-canary} +export ANDROID_NDK="${ANDROID_NDK/#\~/$HOME}" + +TARGET_GCC_VERSION=${TARGET_GCC_VERSION:-4.9} + +export CLANG_PATH=${CLANG_PATH:-$HOME/.mozbuild/clang/bin} + +export PYTHON_PATH=${PYTHON_PATH:-/usr/bin} + +case $TARGET_ARCH in + arm) + ARCH_NAME="arm" + ARCH_DIR="arch-arm" + ARCH_ABI="androideabi" + ;; + arm64) + ARCH_NAME="aarch64" + ARCH_DIR="arch-arm64" + ARCH_ABI="android" + TARGET_TRIPLE=$ARCH_NAME-linux-$ARCH_ABI + BINSUFFIX=64 + ;; + x86) + ARCH_NAME="i686" + ARCH_DIR="arch-x86" + ARCH_ABI="android" + TARGET_TRIPLE=$ARCH_NAME-linux-$ARCH_ABI + ;; + x86_64) + ARCH_NAME="x86" + ARCH_DIR="arch-x86_64" + ARCH_ABI="android" + BINSUFFIX=64 + ;; + *) + echo "Unsupported $TARGET_ARCH" + exit 1 + ;; +esac + +TARGET_TRIPLE=${TARGET_TRIPLE:-$TARGET_ARCH-linux-$ARCH_ABI} +export TARGET_TRIPLE + +export CROSS_TOOLCHAIN_LINKER_PATH=${CROSS_TOOLCHAIN_LINKER_PATH=:-$GONK_PATH/prebuilts/gcc/linux-x86/$ARCH_NAME/$TARGET_TRIPLE-$TARGET_GCC_VERSION/$TARGET_TRIPLE/bin} + +export PATH=$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin:$GONK_PATH/prebuilts/linux-x86_64/bin/:$CLANG_PATH:$PYTHON_PATH:$CROSS_TOOLCHAIN_LINKER_PATH:$PATH + +SYSROOT=$ANDROID_NDK/platforms/$ANDROID_PLATFORM/$ARCH_DIR/ + +export GONK_PRODUCT=$GONK_PRODUCT_NAME + +# Create the sysroot +if [ -z ${GECKO_OBJDIR+x} ]; then + SYSROOT_DEST=$(./mach environment | grep -A1 '^object directory' | tail -n 1 | cut -b2-) +else + SYSROOT_DEST="${GECKO_OBJDIR}" +fi + +if [ -d "koost" ]; then + export BUILD_KOOST=1 +fi + +#rm -rf "${SYSROOT_DEST}/b2g-sysroot" +#taskcluster/scripts/misc/create-b2g-sysroot.sh "${GONK_PATH}" "${SYSROOT_DEST}" + +rustc --version + +export CFLAGS="-Wno-nullability-completeness" + +export CPPFLAGS="-DANDROID -DTARGET_OS_GONK \ +-DJE_FORCE_SYNC_COMPARE_AND_SWAP_4=1 \ +-D_USING_LIBCXX \ +-DGR_GL_USE_NEW_SHADER_SOURCE_SIGNATURE=1 \ +-isystem $ANDROID_NDK/platforms/$ANDROID_PLATFORM/$ARCH_DIR/usr/include" + +export ANDROID_PLATFORM=$ANDROID_PLATFORM + +export LDFLAGS="--sysroot=${SYSROOT}" + +./mach build $@ \ No newline at end of file diff --git a/b2g/build/build_api-daemon.sh b/gsi/build/build_api-daemon.sh similarity index 100% rename from b2g/build/build_api-daemon.sh rename to gsi/build/build_api-daemon.sh diff --git a/b2g/build/build_gecko.sh b/gsi/build/build_gecko.sh similarity index 61% rename from b2g/build/build_gecko.sh rename to gsi/build/build_gecko.sh index 8b98e91..1efc6f9 100755 --- a/b2g/build/build_gecko.sh +++ b/gsi/build/build_gecko.sh @@ -1,26 +1,14 @@ #!/bin/bash set -e -df -h -cd ~/gecko-b2g -export SHELL=/bin/bash -sudo apt update -export LOCAL_NDK_BASE_URL='ftp://ftp.kaiostech.com/ndk/android-ndk' -#./mach bootstrap --application-choice 'GeckoView/Firefox for Android' -df -h df -h #### cd ~ -git clone https://github.com/OnePlus-onyx/build-CI -b b2g -chmod +x ~/build-CI/build-gsi-b2g.sh -cp ~/build-CI/build-gsi-b2g.sh ~/gecko-b2g rclone copy itd:ci/${remotepath}/b2g-sysroot.tar.zst ./ tar -C "$HOME/.mozbuild" -I zstd -x -a -f b2g-sysroot.tar.zst mkdir ~/objdir-gsi-gecko -tar -C "$HOME/objdir-gsi-gecko" -I zstd -x -a -f b2g-sysroot.tar.zst -ls ~/objdir-gsi-gecko sudo rm b2g-sysroot.tar.zst @@ -44,4 +32,4 @@ export MOZ_DISABLE_LTO=1 ./build-gsi-b2g.sh ./build-gsi-b2g.sh package df -h -ls ${GECKO_OBJDIR}/d +ls ${GECKO_OBJDIR} \ No newline at end of file diff --git a/b2g/build/build_with_gecko.sh b/gsi/build/build_with_gecko.sh similarity index 91% rename from b2g/build/build_with_gecko.sh rename to gsi/build/build_with_gecko.sh index 35b4f6b..e77f59b 100755 --- a/b2g/build/build_with_gecko.sh +++ b/gsi/build/build_with_gecko.sh @@ -1,6 +1,5 @@ #!/bin/bash set -e - df -h #### cd ${work} @@ -16,7 +15,7 @@ export CCACHE_DIR=~/.ccache export USE_CCACHE=1 export DISABLE_SOURCES_XML=true export USE_PREBUILT_B2G=1 -#export OUT_DIR_COMMON_BASE=${out_work} export PREFERRED_B2G="${work}/pre-gecko/${gecko_version}" export SKIP_ABI_CHECKS=true +#gsi gtimeout 245m ./build-gsi.sh ${build_device_tag} systemimage \ No newline at end of file diff --git a/b2g/build/build_without_gecko.sh b/gsi/build/build_without_gecko.sh similarity index 87% rename from b2g/build/build_without_gecko.sh rename to gsi/build/build_without_gecko.sh index 26f7f0b..d9f01c6 100755 --- a/b2g/build/build_without_gecko.sh +++ b/gsi/build/build_without_gecko.sh @@ -1,7 +1,6 @@ #!/bin/bash set -e - - df -h +df -h #### export CCACHE_DIR=~/.ccache /usr/local/bin/ccache -M 20G @@ -9,9 +8,9 @@ export CCACHE_DIR=~/.ccache export USE_CCACHE=1 cd ${work}/B2G export DISABLE_SOURCES_XML=true -#export OUT_DIR_COMMON_BASE=${out_work} export PREFERRED_B2G=${work}/b2g-dummy.tar.bz2 export USE_PREBUILT_B2G=1 export SKIP_ABI_CHECKS=true +#gsi gtimeout 245m ./build-gsi.sh ${build_device_tag} systemimage df -h \ No newline at end of file diff --git a/b2g/init/webhook.sh b/gsi/init/webhook.sh similarity index 99% rename from b2g/init/webhook.sh rename to gsi/init/webhook.sh index b1280b9..30826c0 100755 --- a/b2g/init/webhook.sh +++ b/gsi/init/webhook.sh @@ -1,4 +1,3 @@ #!/bin/bash set -e - curl -H "Authorization: token ${GIT_ACCESS_TOKEN}" --request POST --data '{"event_type": "'$1'", "client_payload": { "device_name":"'${device_name}'", "gecko_version":"'${gecko_version}'", "device_arch":"'${device_arch}'", "repo_dispatches":"'${repo_dispatches}'", "build_device_tag":"'${build_device_tag}'", "b2g_source":"'${b2g_source}'", "b2g_branch":"'${b2g_branch}'", "actions_branch":"'${actions_branch}'" }}' ${repo_dispatches} diff --git a/gsi/source/fix_soucre.sh b/gsi/source/fix_soucre.sh new file mode 100644 index 0000000..e69de29 diff --git a/b2g/source/repo_source.sh b/gsi/source/repo_source.sh similarity index 100% rename from b2g/source/repo_source.sh rename to gsi/source/repo_source.sh From 649746db657d983d0d61164708992338c51f8f24 Mon Sep 17 00:00:00 2001 From: ittat Date: Sun, 20 Jun 2021 04:25:36 +0000 Subject: [PATCH 042/141] gsi --> b2gos org --- .github/workflows/b2g_config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/b2g_config.yml b/.github/workflows/b2g_config.yml index 1a75fff..f72904e 100644 --- a/.github/workflows/b2g_config.yml +++ b/.github/workflows/b2g_config.yml @@ -17,7 +17,7 @@ env: GIT_ACCESS_TOKEN: ${{secrets.GIT_ACCESS_TOKEN}} device_name: phhgsi_arm64_ab repo_dispatches: "https://api.github.com/repos/b2g-gsi/build-actions/dispatches" - b2g_source: "https://github.com/b2g-gsi/B2G" + b2g_source: "https://github.com/b2gos/B2G" b2g_branch: "gsi" build_device_tag: gsi_arm64_ab device_arch: aarch64-linux-android From 61d2e222f289a0537e1d39648f684b486726d5d0 Mon Sep 17 00:00:00 2001 From: ittat Date: Sun, 20 Jun 2021 06:18:09 +0000 Subject: [PATCH 043/141] api-daemon --> ittat --- common/source/fix_soucre.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/common/source/fix_soucre.sh b/common/source/fix_soucre.sh index 53ae1ff..69084b2 100755 --- a/common/source/fix_soucre.sh +++ b/common/source/fix_soucre.sh @@ -29,8 +29,7 @@ if [ -d "${work}/B2G/gonk-misc/api-daemon" ];then echo api-daemon patch sudo rm -r ${work}/B2G/gonk-misc/api-daemon fi -git clone https://github.com/b2g-gsi/api-daemon -b without-api-daemon - +git clone https://github.com/ittat/api-daemon -b without-api-daemon #### cd ${work}/B2G From bdeaec5caab938fcda75b9a04ab68aafaecd6ce1 Mon Sep 17 00:00:00 2001 From: ittat Date: Sun, 20 Jun 2021 06:34:16 +0000 Subject: [PATCH 044/141] try --- .github/workflows/b2g_config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/b2g_config.yml b/.github/workflows/b2g_config.yml index f72904e..5d89016 100644 --- a/.github/workflows/b2g_config.yml +++ b/.github/workflows/b2g_config.yml @@ -1,6 +1,8 @@ name: b2g_config on: - workflow_dispatch: + workflow_dispatch: + types: + - b2g_gsi # NEED # 1. secrets.GIT_ACCESS_TOKEN From bbb9e18f1d2df6e4c03732cc5e8afeabb08b7c17 Mon Sep 17 00:00:00 2001 From: ittat Date: Sun, 20 Jun 2021 07:45:12 +0000 Subject: [PATCH 045/141] Add onyx --- .../{b2g_build.yml => b2g_gsi_build.yml} | 44 +-- .../{b2g_config.yml => b2g_gsi_config.yml} | 10 +- .github/workflows/onyx_b2g_build.yml | 337 ++++++++++++++++++ .github/workflows/onyx_b2g_config.yml | 35 ++ .../build/build-gecko-srcipt.sh | 0 {gsi => common}/build/build_gecko.sh | 8 +- gsi/build/build_api-daemon.sh | 25 -- onyx/build/build_with_gecko.sh | 18 + onyx/build/build_without_gecko.sh | 15 + onyx/init/webhook.sh | 6 + ...8680baef9b9b4538dff707eb1f7328756222.patch | 30 ++ ...3e0d3ee242a68f0484cc00cda6ed8c02c5f2.patch | 40 +++ onyx/source/fix_soucre.sh | 2 + onyx/source/repo_source.sh | 10 + 14 files changed, 523 insertions(+), 57 deletions(-) rename .github/workflows/{b2g_build.yml => b2g_gsi_build.yml} (90%) rename .github/workflows/{b2g_config.yml => b2g_gsi_config.yml} (86%) create mode 100644 .github/workflows/onyx_b2g_build.yml create mode 100644 .github/workflows/onyx_b2g_config.yml rename gsi/build/build-gsi-b2g.sh => common/build/build-gecko-srcipt.sh (100%) rename {gsi => common}/build/build_gecko.sh (83%) delete mode 100755 gsi/build/build_api-daemon.sh create mode 100755 onyx/build/build_with_gecko.sh create mode 100755 onyx/build/build_without_gecko.sh create mode 100755 onyx/init/webhook.sh create mode 100644 onyx/source/44fd8680baef9b9b4538dff707eb1f7328756222.patch create mode 100644 onyx/source/cff33e0d3ee242a68f0484cc00cda6ed8c02c5f2.patch create mode 100755 onyx/source/fix_soucre.sh create mode 100755 onyx/source/repo_source.sh diff --git a/.github/workflows/b2g_build.yml b/.github/workflows/b2g_gsi_build.yml similarity index 90% rename from .github/workflows/b2g_build.yml rename to .github/workflows/b2g_gsi_build.yml index a10efc5..c69b974 100644 --- a/.github/workflows/b2g_build.yml +++ b/.github/workflows/b2g_gsi_build.yml @@ -1,12 +1,12 @@ -name: b2g-ci +name: b2g-gsi-ci on: repository_dispatch: types: - - b2g_repack - - b2g_aosp_build - - b2g_gecko_build - - b2g_b2g_build - - b2g_api_daemon_build + - gsi_b2g_repack + - gsi_aosp_build + - gsi_gecko_build + - gsi_b2g_build + - gsi_api_daemon_build env: RCLONE: ${{secrets.RCLONE}} @@ -34,7 +34,7 @@ env: jobs: repack_aosp: - if: github.event.action == 'b2g_repack' + if: github.event.action == 'gsi_b2g_repack' runs-on: macos-latest timeout-minutes: 360 steps: @@ -74,10 +74,10 @@ jobs: - name: Start build job run: | - ./gsi/init/webhook.sh b2g_aosp_build + ./gsi/init/webhook.sh gsi_aosp_build aosp_build: - if: github.event.action == 'b2g_aosp_build' || github.event.action == 'b2g_b2g_build' + if: github.event.action == 'gsi_aosp_build' || github.event.action == 'gsi_b2g_build' runs-on: macos-latest timeout-minutes: 360 steps: @@ -164,7 +164,7 @@ jobs: ./common/source/upload_sysroot.sh - name: Updoal systemimage - if: github.event.action == 'b2g_b2g_build' + if: github.event.action == 'gsi_b2g_build' continue-on-error: true run: | ./common/source/upload_systemimage.sh @@ -175,9 +175,9 @@ jobs: ./common/init/all_unmount_darwin.sh - name: Send "build_gecko" WebHook - if: github.event.action == 'b2g_aosp_build' && steps.check.conclusion == 'success' && steps.build.outcome == 'success' && steps.build.conclusion == 'success' + if: github.event.action == 'gsi_aosp_build' && steps.check.conclusion == 'success' && steps.build.outcome == 'success' && steps.build.conclusion == 'success' run: | - ./gsi/init/webhook.sh b2g_gecko_build + ./gsi/init/webhook.sh gsi_gecko_build - name: Update Build Source if: steps.check.conclusion == 'success' && github.event.action == 'b2g_aosp_build' @@ -185,12 +185,12 @@ jobs: ./common/source/upload_out_image.sh - name: Send "aosp_build" WebHook Again - if: github.event.action == 'b2g_aosp_build' && steps.build.outcome == 'failure' && steps.build.conclusion == 'success' && steps.check.conclusion == 'success' + if: github.event.action == 'gsi_aosp_build' && steps.build.outcome == 'failure' && steps.build.conclusion == 'success' && steps.check.conclusion == 'success' run: | - ./gsi/init/webhook.sh b2g_aosp_build + ./gsi/init/webhook.sh gsi_aosp_build gecko_build: - if: github.event.action == 'b2g_gecko_build' || github.event_name == 'schedule' + if: github.event.action == 'gsi_gecko_build' || github.event_name == 'schedule' runs-on: ubuntu-18.04 timeout-minutes: 360 steps: @@ -237,8 +237,8 @@ jobs: - name: Build Gecko run: | - cp ./gsi/build/build-gsi-b2g.sh ~/gecko-b2g - ./gsi/build/build_gecko.sh + cp ./common/build/build-gecko-srcipt.sh ~/gecko-b2g + ./common/build/build_gecko.sh - name: Get Gecko Version run: | @@ -260,21 +260,21 @@ jobs: uses: actions/upload-artifact@master with: name: ${{ env.gecko_version }} - path: ~/objdir-gsi-gecko/dist/${{ env.gecko_version }} + path: ~/objdir-gecko/dist/${{ env.gecko_version }} - name: Upload to Gdrive run: | df -h - cd ~/objdir-gsi-gecko/dist + cd ~/objdir-gecko/dist rclone copy ${{ env.gecko_version }} itd:ci/${remotepath} df -h - name: Send "b2g_api_daemon_build" WebHook run: | - ./gsi/init/webhook.sh b2g_api_daemon_build + ./gsi/init/webhook.sh gsi_api_daemon_build api-daemon_build: - if: github.event.action == 'b2g_api_daemon_build' + if: github.event.action == 'gsi_api_daemon_build' runs-on: ubuntu-18.04 timeout-minutes: 360 steps: @@ -330,4 +330,4 @@ jobs: - name: Send Done Notify && Send "b2g_build" WebHook run: | - ./gsi/init/webhook.sh b2g_b2g_build + ./gsi/init/webhook.sh gsi_b2g_build diff --git a/.github/workflows/b2g_config.yml b/.github/workflows/b2g_gsi_config.yml similarity index 86% rename from .github/workflows/b2g_config.yml rename to .github/workflows/b2g_gsi_config.yml index 5d89016..c15e7dd 100644 --- a/.github/workflows/b2g_config.yml +++ b/.github/workflows/b2g_gsi_config.yml @@ -1,9 +1,7 @@ -name: b2g_config +name: b2g-gsi-config on: workflow_dispatch: - types: - - b2g_gsi - + # NEED # 1. secrets.GIT_ACCESS_TOKEN # 2. secrets.RCLONE @@ -40,5 +38,5 @@ jobs: - name: Action run: | - ./gsi/init/webhook.sh b2g_repack - #b2g_repack b2g_aosp_build b2g_gecko_build b2g_api_daemon_build + ./gsi/init/webhook.sh gsi_b2g_repack + #gsi_b2g_repack gsi_aosp_build gsi_gecko_build gsi_b2g_build gsi_api_daemon_build diff --git a/.github/workflows/onyx_b2g_build.yml b/.github/workflows/onyx_b2g_build.yml new file mode 100644 index 0000000..cf860d9 --- /dev/null +++ b/.github/workflows/onyx_b2g_build.yml @@ -0,0 +1,337 @@ +name: onyx-b2g-ci +on: + repository_dispatch: + types: + - onyx_b2g_repack + - onyx_aosp_build + - onyx_gecko_build + - onyx_b2g_build + - onyx_api_daemon_build + +env: + RCLONE: ${{secrets.RCLONE}} + GIT_ACCESS_TOKEN: ${{secrets.GIT_ACCESS_TOKEN}} + gecko_version: ${{github.event.client_payload.gecko_version}} + device_name: ${{github.event.client_payload.device_name}} + device_arch: ${{github.event.client_payload.device_arch}} + build_device_tag: ${{github.event.client_payload.build_device_tag}} + repo_dispatches: ${{github.event.client_payload.repo_dispatches}} + b2g_source: ${{github.event.client_payload.b2g_source}} + b2g_branch: ${{github.event.client_payload.b2g_branch}} + + + systemimage: system.img.xz + outimage: out + out_path: /Volumes/out/B2G + + image: b2g_onyx + sourceimage: b2g_onyx + work: /Volumes/b2g_onyx + out_work: /Volumes/out + remotepath: b2g_${{github.event.client_payload.device_name}} + + +jobs: + repack_aosp: + if: github.event.action == 'onyx_b2g_repack' + runs-on: macos-latest + timeout-minutes: 360 + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + ref: onyx_b2g-build + + - name: Clean system environment + continue-on-error: true + run: | + ./common/init/all_unmount_darwin.sh + + - name: Initialization system environment + run: | + ./common/init/clean_space_darwin.sh + ./common/init/env_darwin.sh + ./common/source/create_sparseimage.sh + + - name: Fetch source + run: | + ./onyx/source/repo_source.sh + + - name: Fix source + continue-on-error: true + run: | + echo Fix source + ./common/source/fix_soucre.sh + ./onyx/source/fix_soucre.sh + + # upload sparseimage to gdrive + - name: Upload Source + run: | + ./common/init/all_unmount_darwin.sh + ./common/source/compress_sourceimage.sh + ./common/source/upload_image.sh + + - name: Start build job + run: | + ./onyx/init/webhook.sh onyx_aosp_build + + aosp_build: + if: github.event.action == 'onyx_aosp_build' || github.event.action == 'onyx_b2g_build' + runs-on: macos-latest + timeout-minutes: 360 + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + ref: onyx_b2g-build + + - name: Initialization system environment + run: | + ./common/init/all_unmount_darwin.sh + ./common/init/clean_space_darwin.sh + ./common/init/env_darwin.sh + ./common/source/download_source_from_gdrive.sh + df -h + + - name: fix + run: | + brew install cpanm + sudo cpan LWP::UserAgent + + cd ~ + curl https://packages.preprod.kaiostech.com/ndk/v4/mozbuild.tar.bz2 -o mozbuild.tar.bz2 + tar -xvf mozbuild.tar.bz2 + sudo rm mozbuild.tar.bz2 + + - name: Check The Previous “error.log” + run: | + if [ -d "${work}/B2G/out/error.log" ];then + ls ${work}/out + fi + if [ -d "${work}/B2G/out/error.log" ];then + ls -al ${work}/B2G/out/error* + echo "old error.log:" + cat ${work}/B2G/out/error.log + sudo rm ${work}/B2G/out/error.log + touch ${work}/B2G/out/error.log + fi + + - name: Build Source Without Gecko + if: github.event.action == 'b2g_aosp_build' + continue-on-error: true + id: build + run: | + df -h + ./onyx/build/build_without_gecko.sh + + - name: B2G Build - Build Source include Gecko + if: github.event.action == 'onyx_b2g_build' + run: | + df -h + ./onyx/build/add_pre_api_daemon.sh + #### build + ./onyx/build/build_with_gecko.sh + + + - name: Check Current ”error.log“ Status + id: check + run: | + if [ -s ${work}/B2G/out/error.log ]; then + echo Error! + cat ${work}/B2G/out/error.log + ./init/all_unmount_darwin.sh + exit 2 + else + exit 0 + fi + + - name: Repack b2g-sysroot and api-sysroot + id: sysroot + if: github.event.action == 'onyx_aosp_build' && steps.check.conclusion == 'success' && steps.build.outcome == 'success' && steps.build.conclusion == 'success' + run: | + cp ./common/build/create-b2g-sysroot.sh ${work}/B2G + cp ./common/build/create-api_sysroot.sh ${work}/B2G + pip3 install zstandard + pip install zstandard + + echo repack_b2g-sysroot + ./common/build/repack_b2g-sysroot.sh + echo repack_api-sysroot + ./common/build/repack_api-sysroot.sh + echo Upload b2g-sysroot and api-sysroot + ./common/source/upload_sysroot.sh + + - name: Updoal systemimage + if: github.event.action == 'onyx_b2g_build' + continue-on-error: true + run: | + chmod +x ./common/source/upload_systemimage.sh + ./common/source/upload_systemimage.sh + + - name: Clean system environment + continue-on-error: true + run: | + ./common/init/all_unmount_darwin.sh + + - name: Send "build_gecko" WebHook + if: github.event.action == 'onyx_aosp_build' && steps.check.conclusion == 'success' && steps.build.outcome == 'success' && steps.build.conclusion == 'success' + run: | + ./onyx/init/webhook.sh onyx_gecko_build + + + - name: Update Build Source + if: steps.check.conclusion == 'success' && github.event.action == 'b2g_aosp_build' + run: | + ./common/source/upload_out_image.sh + + - name: Send "aosp_build" WebHook Again + if: github.event.action == 'onyx_aosp_build' && steps.build.outcome == 'failure' && steps.build.conclusion == 'success' && steps.check.conclusion == 'success' + run: | + ./onyx/init/webhook.sh onyx_aosp_build + + gecko_build: + if: github.event.action == 'onyx_gecko_build' || github.event_name == 'schedule' + runs-on: ubuntu-18.04 + timeout-minutes: 360 + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + ref: onyx_b2g-build + + - name: Initialization system environment + run: | + ./common/init/env_linux.sh + + - name: clean disk + run: | + ./common/init/clean_space_linux.sh + + - uses: hecrj/setup-rust-action@v1 + with: + rust-version: stable + - uses: actions/checkout@master + - name: Install sccache + run: cargo install sccache + + - name: Fetch Source + run: | + df -h + cd ~ + curl https://packages.preprod.kaiostech.com/ndk/v4/mozbuild.tar.bz2 -o mozbuild.tar.bz2 + tar -xvf mozbuild.tar.bz2 + sudo rm mozbuild.tar.bz2 + cd ~ + git clone https://github.com/kaiostech/gecko-b2g -b gonk + #for onyx + git am ./onyx/source/44fd8680baef9b9b4538dff707eb1f7328756222.patch + git am ./onyx/source/cff33e0d3ee242a68f0484cc00cda6ed8c02c5f2.patch + #git clone https://github.com/OnePlus-onyx/gecko-b2g-onyx -b onyx --depth=1 + df -h + + - name: Bootstrap Gecko + run: | + df -h + cd ~/gecko-b2g + export SHELL=/bin/bash + sudo apt update + export LOCAL_NDK_BASE_URL='ftp://ftp.kaiostech.com/ndk/android-ndk' + ./mach bootstrap --application-choice 'GeckoView/Firefox for Android' + df -h + + - name: Build Gecko + run: | + cp ./common/build/build-gecko-srcipt.sh ~/gecko-b2g + ./common/build/build_gecko.sh + + - name: Get Gecko Version + run: | + cd ~/gecko-b2g + echo `cat browser/config/version.txt` + export version=`cat browser/config/version.txt` + + if [ "$device_arch" == "aarch64-linux-android" ]; then + TARGET_ARCH=aarch64 + ARCH_ABI="android" + else + TARGET_ARCH=arm + ARCH_ABI="androideabi" + fi + echo "gecko_version=b2g-${version}.en-US.linux-${ARCH_ABI}-${TARGET_ARCH}.tar.bz2" >> $GITHUB_ENV + + + - name: Upload Artifact + uses: actions/upload-artifact@master + with: + name: ${{ env.gecko_version }} + path: ~/objdir-gecko/dist/${{ env.gecko_version }} + + - name: Upload to Gdrive + run: | + df -h + cd ~/objdir-gecko/dist + rclone copy ${{ env.gecko_version }} itd:ci/${remotepath} + df -h + + - name: Send "b2g_api_daemon_build" WebHook + run: | + ./onyx/init/webhook.sh onyx_api_daemon_build + + api-daemon_build: + if: github.event.action == 'onyx_api_daemon_build' + runs-on: ubuntu-18.04 + timeout-minutes: 360 + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + ref: onyx_b2g-build + + - name: Initialization system environment + run: | + df -h + ./common/init/env_linux.sh + + - name: Download Source + run: | + cd ~ + #### + rustup target add aarch64-linux-android armv7-linux-androideabi + cd ~ + curl https://packages.preprod.kaiostech.com/ndk/v4/mozbuild.tar.bz2 | tar -C ${HOME}/ -xj + rclone copy itd:ci/${remotepath}/api-sysroot.tar.zst ./ + mkdir ~/.mozbuild/api-sysroot + tar -C "$HOME/.mozbuild/api-sysroot" -I zstd -x -a -f api-sysroot.tar.zst + ls ~/.mozbuild/api-sysroot/out + + cd ~ + git clone https://github.com/kaiostech/api-daemon + ls -al + + - name: build Source + run: | + #### + export TARGET_ARCH=${device_arch} + export BUILD_WITH_NDK_DIR=~/.mozbuild/android-ndk-r20b-canary + export GONK_DIR=~/.mozbuild/api-sysroot + export GONK_PRODUCT=${device_name} + cd ~/api-daemon + ./update-prebuilts.sh + + - name: zip Artifact + run: | + cd ~ + zip -r ~/prebuilts.zip ~/api-daemon/prebuilts + rclone copy ~/prebuilts.zip itd:ci/${remotepath} + ls -al -h + + - name: Upload Artifact + continue-on-error: true + uses: actions/upload-artifact@master + with: + name: prebuilts.zip + path: ~/prebuilts.zip + + - name: Send Done Notify && Send "b2g_build" WebHook + run: | + ./onyx/init/webhook.sh onyx_b2g_build diff --git a/.github/workflows/onyx_b2g_config.yml b/.github/workflows/onyx_b2g_config.yml new file mode 100644 index 0000000..c4b72ad --- /dev/null +++ b/.github/workflows/onyx_b2g_config.yml @@ -0,0 +1,35 @@ +name: onyx_b2g_config +on: + workflow_dispatch: + +# NEED +# 1. secrets.GIT_ACCESS_TOKEN +# 2. secrets.RCLONE +# 3. device_name eg；onyx(oneplus x), bacon(oneplus one), phhgsi_arm64_a(phh's gsi) etc. +# out/device_name +# 4. build_device_tag: eg: full-onyx-eng, full-bacon-userdebug etc. +# gsi-build.sh build_device_tag +# 5. repo_dispatches: https://api.github.com/repos/(you id)/(you repo name)/dispatches +# 6. b2g_source: +# remote soucre address +# for example: +env: + GIT_ACCESS_TOKEN: ${{secrets.GIT_ACCESS_TOKEN}} + device_name: onyx + repo_dispatches: "https://api.github.com/repos/OnePlus-onyx/build-actions/dispatches" + b2g_source: "https://github.com/b2gos/B2G" + b2g_branch: "gsi" + build_device_tag: onyx + device_arch: armv7-linux-androideabi + +jobs: + config: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v1 + + - name: Action + run: | + ./onyx/init/webhook.sh onyx_b2g_repack + #onyx_b2g_repack onyx_aosp_build onyx_gecko_build onyx_b2g_build onyx_api_daemon_build diff --git a/gsi/build/build-gsi-b2g.sh b/common/build/build-gecko-srcipt.sh similarity index 100% rename from gsi/build/build-gsi-b2g.sh rename to common/build/build-gecko-srcipt.sh diff --git a/gsi/build/build_gecko.sh b/common/build/build_gecko.sh similarity index 83% rename from gsi/build/build_gecko.sh rename to common/build/build_gecko.sh index 1efc6f9..be73dbd 100755 --- a/gsi/build/build_gecko.sh +++ b/common/build/build_gecko.sh @@ -8,7 +8,7 @@ cd ~ rclone copy itd:ci/${remotepath}/b2g-sysroot.tar.zst ./ tar -C "$HOME/.mozbuild" -I zstd -x -a -f b2g-sysroot.tar.zst -mkdir ~/objdir-gsi-gecko +mkdir ~/objdir-gecko sudo rm b2g-sysroot.tar.zst @@ -25,11 +25,11 @@ else fi export GONK_PRODUCT_NAME=${device_name} -export GECKO_OBJDIR=${HOME}/objdir-gsi-gecko +export GECKO_OBJDIR=${HOME}/objdir-gecko export PLATFORM_VERSION=29 export TARGET_CPU_VARIANT=generic export MOZ_DISABLE_LTO=1 -./build-gsi-b2g.sh -./build-gsi-b2g.sh package +./build-gecko-srcipt.sh +./build-gecko-srcipt.sh package df -h ls ${GECKO_OBJDIR} \ No newline at end of file diff --git a/gsi/build/build_api-daemon.sh b/gsi/build/build_api-daemon.sh deleted file mode 100755 index a508dba..0000000 --- a/gsi/build/build_api-daemon.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -set -e -cd ~ -#### -rustup target add aarch64-linux-android armv7-linux-androideabi -cd ~ -curl https://packages.preprod.kaiostech.com/ndk/v3/mozbuild.tar.bz2 | tar -C ${HOME}/ -xj -rclone copy itd:ci/${remotepath}/api-sysroot.tar.zst ./ -mkdir ~/.mozbuild/api-sysroot -tar -C "$HOME/.mozbuild/api-sysroot" -I zstd -x -a -f api-sysroot.tar.zst -#sudo rm api-sysroot.tar.zst -#sudo rm mozbuild.tar.bz2 -ls ~/.mozbuild/api-sysroot - -cd ~ -git clone https://github.com/kaiostech/api-daemon --depth=1 -ls -al - -#### -export TARGET_ARCH=${device_arch} -export BUILD_WITH_NDK_DIR=~/.mozbuild/android-ndk-r20b-canary -export GONK_DIR=~/.mozbuild/api-sysroot -export GONK_PRODUCT=${device_name} -cd ~/api-daemon -./update-prebuilts.sh \ No newline at end of file diff --git a/onyx/build/build_with_gecko.sh b/onyx/build/build_with_gecko.sh new file mode 100755 index 0000000..0684664 --- /dev/null +++ b/onyx/build/build_with_gecko.sh @@ -0,0 +1,18 @@ +#!/bin/bash +set -e +df -h +#### +cd ${work} +mkdir pre-gecko +cd pre-gecko +rclone copy itd:ci/${remotepath}/${gecko_version} ./ +#### build +export CCACHE_DIR=~/.ccache +/usr/local/bin/ccache -M 20G +/usr/local/bin/ccache -s +export USE_CCACHE=1 +cd ${work}/B2G +export DISABLE_SOURCES_XML=true +export USE_PREBUILT_B2G=1 +export PREFERRED_B2G="${work}/pre-gecko/${gecko_version}" +gtimeout 245m ./build.sh -j16 \ No newline at end of file diff --git a/onyx/build/build_without_gecko.sh b/onyx/build/build_without_gecko.sh new file mode 100755 index 0000000..e7a8961 --- /dev/null +++ b/onyx/build/build_without_gecko.sh @@ -0,0 +1,15 @@ +#!/bin/bash +set -e +df -h +#### +export CCACHE_DIR=~/.ccache +/usr/local/bin/ccache -M 20G +/usr/local/bin/ccache -s +export USE_CCACHE=1 +cd ${work}/B2G +export DISABLE_SOURCES_XML=true +#export OUT_DIR_COMMON_BASE=${out_work} +export PREFERRED_B2G=${work}/b2g-dummy.tar.bz2 +export USE_PREBUILT_B2G=1 +gtimeout 245m ./build.sh -j16 +df -h \ No newline at end of file diff --git a/onyx/init/webhook.sh b/onyx/init/webhook.sh new file mode 100755 index 0000000..b2bfb49 --- /dev/null +++ b/onyx/init/webhook.sh @@ -0,0 +1,6 @@ +#!/bin/bash +set -e + +echo $b2g_source + +curl -H "Authorization: token ${GIT_ACCESS_TOKEN}" --request POST --data '{"event_type": "'$1'","client_payload": {"device_name":"'${device_name}'", "gecko_version":"'${gecko_version}'", "device_arch":"'${device_arch}'", "repo_dispatches":"'${repo_dispatches}'", "build_device_tag":"'${build_device_tag}'", "b2g_source":"'${b2g_source}'", "b2g_branch":"'${b2g_branch}'" }}' ${repo_dispatches} diff --git a/onyx/source/44fd8680baef9b9b4538dff707eb1f7328756222.patch b/onyx/source/44fd8680baef9b9b4538dff707eb1f7328756222.patch new file mode 100644 index 0000000..684061c --- /dev/null +++ b/onyx/source/44fd8680baef9b9b4538dff707eb1f7328756222.patch @@ -0,0 +1,30 @@ +From 44fd8680baef9b9b4538dff707eb1f7328756222 Mon Sep 17 00:00:00 2001 +From: ittat +Date: Mon, 31 May 2021 10:54:47 +0800 +Subject: [PATCH] Update HwcHAL.cpp + +--- + widget/gonk/hwchal/HwcHAL.cpp | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/widget/gonk/hwchal/HwcHAL.cpp b/widget/gonk/hwchal/HwcHAL.cpp +index 5021981c4806c..bd37ece9943bb 100644 +--- a/widget/gonk/hwchal/HwcHAL.cpp ++++ b/widget/gonk/hwchal/HwcHAL.cpp +@@ -108,7 +108,8 @@ UniquePtr HwcHALBase::CreateHwcHAL() { + + extern "C" MOZ_EXPORT __attribute__((weak)) HWC2::Display* hwc2_getDisplayById( + HWC2::Device* p, hwc2_display_t id) { +- return p->getDisplayById(id); ++ ALOGI("####test ----------> HW2_libcarthage get a response: display %" PRIu64, id); ++ return p->getDisplayById(1); + } + + extern "C" MOZ_EXPORT __attribute__((weak)) void hwc2_registerCallback( +@@ -124,4 +125,4 @@ extern "C" MOZ_EXPORT __attribute__((weak)) HWC2::Error hwc2_setVsyncEnabled( + extern "C" MOZ_EXPORT __attribute__((weak)) void hwc2_onHotplug( + HWC2::Device* p, hwc2_display_t displayId, HWC2::Connection connection) { + return p->onHotplug(displayId, connection); +-} +\ No newline at end of file ++} diff --git a/onyx/source/cff33e0d3ee242a68f0484cc00cda6ed8c02c5f2.patch b/onyx/source/cff33e0d3ee242a68f0484cc00cda6ed8c02c5f2.patch new file mode 100644 index 0000000..204b342 --- /dev/null +++ b/onyx/source/cff33e0d3ee242a68f0484cc00cda6ed8c02c5f2.patch @@ -0,0 +1,40 @@ +From cff33e0d3ee242a68f0484cc00cda6ed8c02c5f2 Mon Sep 17 00:00:00 2001 +From: ittat +Date: Mon, 31 May 2021 10:54:17 +0800 +Subject: [PATCH] Update GonkDisplay.cpp + +--- + widget/gonk/libdisplay/GonkDisplay.cpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/widget/gonk/libdisplay/GonkDisplay.cpp b/widget/gonk/libdisplay/GonkDisplay.cpp +index a0bb8475d8713..1965a5cb9f6b9 100644 +--- a/widget/gonk/libdisplay/GonkDisplay.cpp ++++ b/widget/gonk/libdisplay/GonkDisplay.cpp +@@ -155,7 +155,7 @@ GonkDisplayP::GonkDisplayP() + + std::unique_lock lock(hotplugMutex); + HWC2::Display* hwcDisplay; +- while (!(hwcDisplay = mHwc->getDisplayById(HWC_DISPLAY_PRIMARY))) { ++ while (!(hwcDisplay = mHwc->getDisplayById(1))) { + /* Wait at most 5s for hotplug events */ + hotplugCv.wait_for(lock, std::chrono::seconds(5)); + } +@@ -186,7 +186,7 @@ GonkDisplayP::GonkDisplayP() + /* The emulator actually reports RGBA_8888, but EGL doesn't return + * any matching configuration. We force RGBX here to fix it. */ + /*TODO: need to discuss with vendor to check this format issue.*/ +- dispData.mSurfaceformat = HAL_PIXEL_FORMAT_RGB_565; ++ dispData.mSurfaceformat = HAL_PIXEL_FORMAT_RGBA_8888; + } + (void)hwcDisplay->createLayer(&mlayer); + +@@ -200,7 +200,7 @@ GonkDisplayP::GonkDisplayP() + (void)mPowerModule; + + ALOGI("created native window\n"); +- native_gralloc_initialize(1); ++ native_gralloc_initialize(0); + + mPower = IPower::getService(); + if (mPower == nullptr) { diff --git a/onyx/source/fix_soucre.sh b/onyx/source/fix_soucre.sh new file mode 100755 index 0000000..977df42 --- /dev/null +++ b/onyx/source/fix_soucre.sh @@ -0,0 +1,2 @@ +#!/bin/bash +set -e diff --git a/onyx/source/repo_source.sh b/onyx/source/repo_source.sh new file mode 100755 index 0000000..549a55b --- /dev/null +++ b/onyx/source/repo_source.sh @@ -0,0 +1,10 @@ +#!/bin/bash +set -e +df -h +cd ${work} +git clone ${b2g_source} -b ${b2g_branch} --depth=1 +cd ./B2G +echo Download ... +#TODO +GITREPO=https://github.com/b2gos/manifests BRANCH=gsi REPO_INIT_FLAGS="--depth=1" REPO_SYNC_FLAGS=" -j128 --force-sync --current-branch --no-tags --no-clone-bundle --optimized-fetch --prune" ./config.sh ${device_name} +df -h \ No newline at end of file From 9eb922a8ece3deaaba43f08cf54da55c1234151f Mon Sep 17 00:00:00 2001 From: ittat Date: Sun, 20 Jun 2021 07:51:13 +0000 Subject: [PATCH 046/141] dispatches --- .github/workflows/onyx_b2g_config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/onyx_b2g_config.yml b/.github/workflows/onyx_b2g_config.yml index c4b72ad..b706ab2 100644 --- a/.github/workflows/onyx_b2g_config.yml +++ b/.github/workflows/onyx_b2g_config.yml @@ -16,7 +16,7 @@ on: env: GIT_ACCESS_TOKEN: ${{secrets.GIT_ACCESS_TOKEN}} device_name: onyx - repo_dispatches: "https://api.github.com/repos/OnePlus-onyx/build-actions/dispatches" + repo_dispatches: "https://api.github.com/repos/b2g-gsi/build-actions/dispatches" b2g_source: "https://github.com/b2gos/B2G" b2g_branch: "gsi" build_device_tag: onyx From 809cee15a9f3fe5774bb56474cb90b3f6e889003 Mon Sep 17 00:00:00 2001 From: ittat Date: Sun, 20 Jun 2021 08:36:38 +0000 Subject: [PATCH 047/141] add actions_branch --- .github/workflows/onyx_b2g_build.yml | 10 +++++----- .github/workflows/onyx_b2g_config.yml | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/onyx_b2g_build.yml b/.github/workflows/onyx_b2g_build.yml index cf860d9..f351097 100644 --- a/.github/workflows/onyx_b2g_build.yml +++ b/.github/workflows/onyx_b2g_build.yml @@ -40,7 +40,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 with: - ref: onyx_b2g-build + ref: ${{ env.actions_branch }} - name: Clean system environment continue-on-error: true @@ -83,7 +83,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 with: - ref: onyx_b2g-build + ref: ${{ env.actions_branch }} - name: Initialization system environment run: | @@ -197,7 +197,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 with: - ref: onyx_b2g-build + ref: ${{ env.actions_branch }} - name: Initialization system environment run: | @@ -285,8 +285,8 @@ jobs: - name: Checkout uses: actions/checkout@v2 with: - ref: onyx_b2g-build - + ref: ${{ env.actions_branch }} + - name: Initialization system environment run: | df -h diff --git a/.github/workflows/onyx_b2g_config.yml b/.github/workflows/onyx_b2g_config.yml index b706ab2..361668c 100644 --- a/.github/workflows/onyx_b2g_config.yml +++ b/.github/workflows/onyx_b2g_config.yml @@ -21,6 +21,7 @@ env: b2g_branch: "gsi" build_device_tag: onyx device_arch: armv7-linux-androideabi + actions_branch: b2g_gsi jobs: config: From c76de6b619dc6b7c8ca6d8d07ade1c24b15edea1 Mon Sep 17 00:00:00 2001 From: ittat Date: Sun, 20 Jun 2021 11:24:17 +0000 Subject: [PATCH 048/141] fix it --- .github/workflows/b2g_gsi_build.yml | 2 +- .github/workflows/b2g_gsi_config.yml | 2 +- .github/workflows/onyx_b2g_build.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/b2g_gsi_build.yml b/.github/workflows/b2g_gsi_build.yml index c69b974..f2619b6 100644 --- a/.github/workflows/b2g_gsi_build.yml +++ b/.github/workflows/b2g_gsi_build.yml @@ -180,7 +180,7 @@ jobs: ./gsi/init/webhook.sh gsi_gecko_build - name: Update Build Source - if: steps.check.conclusion == 'success' && github.event.action == 'b2g_aosp_build' + if: steps.check.conclusion == 'success' && github.event.action == 'gsi_aosp_build' run: | ./common/source/upload_out_image.sh diff --git a/.github/workflows/b2g_gsi_config.yml b/.github/workflows/b2g_gsi_config.yml index c15e7dd..39896fa 100644 --- a/.github/workflows/b2g_gsi_config.yml +++ b/.github/workflows/b2g_gsi_config.yml @@ -13,7 +13,7 @@ on: # 6. b2g_source: # remote soucre address # for example: -env: +env: GIT_ACCESS_TOKEN: ${{secrets.GIT_ACCESS_TOKEN}} device_name: phhgsi_arm64_ab repo_dispatches: "https://api.github.com/repos/b2g-gsi/build-actions/dispatches" diff --git a/.github/workflows/onyx_b2g_build.yml b/.github/workflows/onyx_b2g_build.yml index f351097..4b50615 100644 --- a/.github/workflows/onyx_b2g_build.yml +++ b/.github/workflows/onyx_b2g_build.yml @@ -180,7 +180,7 @@ jobs: - name: Update Build Source - if: steps.check.conclusion == 'success' && github.event.action == 'b2g_aosp_build' + if: steps.check.conclusion == 'success' && github.event.action == 'onyx_aosp_build' run: | ./common/source/upload_out_image.sh From 31ff89fee4431f595e9072b67d5e72933ac6a29c Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 23 Jun 2021 13:52:48 +0800 Subject: [PATCH 049/141] fix tag --- .github/workflows/b2g_gsi_build.yml | 6 +++--- .github/workflows/onyx_b2g_build.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/b2g_gsi_build.yml b/.github/workflows/b2g_gsi_build.yml index f2619b6..9cd0a1b 100644 --- a/.github/workflows/b2g_gsi_build.yml +++ b/.github/workflows/b2g_gsi_build.yml @@ -118,7 +118,7 @@ jobs: fi - name: Build Source Without Gecko - if: github.event.action == 'b2g_aosp_build' + if: github.event.action == 'gsi_aosp_build' continue-on-error: true id: build run: | @@ -127,7 +127,7 @@ jobs: - name: B2G Build - Build Source include Gecko - if: github.event.action == 'b2g_b2g_build' + if: github.event.action == 'gsi_b2g_build' run: | df -h ./common/build/add_pre_api_daemon.sh @@ -149,7 +149,7 @@ jobs: - name: Repack b2g-sysroot and api-sysroot id: sysroot - if: github.event.action == 'b2g_aosp_build' && steps.check.conclusion == 'success' && steps.build.outcome == 'success' && steps.build.conclusion == 'success' + if: github.event.action == 'gsi_aosp_build' && steps.check.conclusion == 'success' && steps.build.outcome == 'success' && steps.build.conclusion == 'success' run: | cp ./common/build/create-b2g-sysroot.sh ${work}/B2G cp ./common/build/create-api_sysroot.sh ${work}/B2G diff --git a/.github/workflows/onyx_b2g_build.yml b/.github/workflows/onyx_b2g_build.yml index 4b50615..5316716 100644 --- a/.github/workflows/onyx_b2g_build.yml +++ b/.github/workflows/onyx_b2g_build.yml @@ -117,7 +117,7 @@ jobs: fi - name: Build Source Without Gecko - if: github.event.action == 'b2g_aosp_build' + if: github.event.action == 'onyx_aosp_build' continue-on-error: true id: build run: | From 1d5dfb0a924b3a0055dc10b934a22d6bc2cca67f Mon Sep 17 00:00:00 2001 From: ittat Date: Wed, 23 Jun 2021 23:53:27 +0800 Subject: [PATCH 050/141] Update fix_soucre.sh --- common/source/fix_soucre.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/common/source/fix_soucre.sh b/common/source/fix_soucre.sh index 69084b2..3988846 100755 --- a/common/source/fix_soucre.sh +++ b/common/source/fix_soucre.sh @@ -1,5 +1,9 @@ #!/bin/bash set -e + +###build/soong +./common/source/patch-b2g-aosp.sh + ####patcher if [ -d "${work}/B2G/patcher" ]; then echo apply patch @@ -12,10 +16,6 @@ cd ${work}/B2G /usr/bin/sed -i '' '14d' system/sepolicy/tests/Android.bp /usr/bin/sed -i '' '65i\'$'\n\"10\.15\"\,\n' build/soong/cc/config/x86_darwin_host.go -###build/soong -cd ~ -./common/source/patch-b2g-aosp.sh - ### cd ${work} # Create a dummy b2g archive @@ -33,4 +33,4 @@ git clone https://github.com/ittat/api-daemon -b without-api-daemon #### cd ${work}/B2G -sudo rm -rf .repo \ No newline at end of file +sudo rm -rf .repo From 540b3e681531d85475ef19001ebbc19dbeb38b98 Mon Sep 17 00:00:00 2001 From: ittat Date: Thu, 24 Jun 2021 08:31:52 +0800 Subject: [PATCH 051/141] Update repack_api-sysroot.sh --- common/build/repack_api-sysroot.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/build/repack_api-sysroot.sh b/common/build/repack_api-sysroot.sh index 2df3f49..c78ca21 100755 --- a/common/build/repack_api-sysroot.sh +++ b/common/build/repack_api-sysroot.sh @@ -1,6 +1,7 @@ #!/bin/bash set -e df -h +cp common/build/create-api_sysroot.sh ${work}/B2G cd ${work}/B2G if [ "$device_arch" == "aarch64-linux-android" ]; then @@ -21,7 +22,7 @@ else export TARGET_CPU_VARIANT=generic fi -./api_sysroot.sh +./create-api_sysroot.sh sudo rm -rf ./api-sysroot ls -al mv api-sysroot.tar.zst ${work} From c8e7f6c822392e59a935d18e98461db64c2de265 Mon Sep 17 00:00:00 2001 From: ittat Date: Thu, 24 Jun 2021 12:56:39 +0800 Subject: [PATCH 052/141] Update b2g_gsi_config.yml --- .github/workflows/b2g_gsi_config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/b2g_gsi_config.yml b/.github/workflows/b2g_gsi_config.yml index 39896fa..9da8a48 100644 --- a/.github/workflows/b2g_gsi_config.yml +++ b/.github/workflows/b2g_gsi_config.yml @@ -38,5 +38,5 @@ jobs: - name: Action run: | - ./gsi/init/webhook.sh gsi_b2g_repack + ./gsi/init/webhook.sh gsi_aosp_build #gsi_b2g_repack gsi_aosp_build gsi_gecko_build gsi_b2g_build gsi_api_daemon_build From dbaecbd68978a53a4f32b6f9d25c895650d6204f Mon Sep 17 00:00:00 2001 From: ittat Date: Thu, 24 Jun 2021 12:56:48 +0800 Subject: [PATCH 053/141] Update onyx_b2g_config.yml --- .github/workflows/onyx_b2g_config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/onyx_b2g_config.yml b/.github/workflows/onyx_b2g_config.yml index 361668c..5a15977 100644 --- a/.github/workflows/onyx_b2g_config.yml +++ b/.github/workflows/onyx_b2g_config.yml @@ -32,5 +32,5 @@ jobs: - name: Action run: | - ./onyx/init/webhook.sh onyx_b2g_repack + ./onyx/init/webhook.sh onyx_aosp_build #onyx_b2g_repack onyx_aosp_build onyx_gecko_build onyx_b2g_build onyx_api_daemon_build From 88700fe19894b95ea4bd98097e4fd3ea9512cba0 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 25 Jun 2021 12:20:58 +0800 Subject: [PATCH 054/141] fix patch --- .github/workflows/onyx_b2g_build.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/onyx_b2g_build.yml b/.github/workflows/onyx_b2g_build.yml index 5316716..d3f07f6 100644 --- a/.github/workflows/onyx_b2g_build.yml +++ b/.github/workflows/onyx_b2g_build.yml @@ -217,6 +217,8 @@ jobs: - name: Fetch Source run: | df -h + cp ./onyx/source/44fd8680baef9b9b4538dff707eb1f7328756222.patch ~ + cp ./onyx/source/cff33e0d3ee242a68f0484cc00cda6ed8c02c5f2.patch ~ cd ~ curl https://packages.preprod.kaiostech.com/ndk/v4/mozbuild.tar.bz2 -o mozbuild.tar.bz2 tar -xvf mozbuild.tar.bz2 @@ -224,8 +226,8 @@ jobs: cd ~ git clone https://github.com/kaiostech/gecko-b2g -b gonk #for onyx - git am ./onyx/source/44fd8680baef9b9b4538dff707eb1f7328756222.patch - git am ./onyx/source/cff33e0d3ee242a68f0484cc00cda6ed8c02c5f2.patch + git am ~/44fd8680baef9b9b4538dff707eb1f7328756222.patch + git am ~/cff33e0d3ee242a68f0484cc00cda6ed8c02c5f2.patch #git clone https://github.com/OnePlus-onyx/gecko-b2g-onyx -b onyx --depth=1 df -h From 4efefbc103f4193588d1a55948c56ba7a76c813c Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 25 Jun 2021 12:22:48 +0800 Subject: [PATCH 055/141] switch to gecko_build --- .github/workflows/b2g_gsi_config.yml | 2 +- .github/workflows/onyx_b2g_config.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/b2g_gsi_config.yml b/.github/workflows/b2g_gsi_config.yml index 9da8a48..f70f45e 100644 --- a/.github/workflows/b2g_gsi_config.yml +++ b/.github/workflows/b2g_gsi_config.yml @@ -38,5 +38,5 @@ jobs: - name: Action run: | - ./gsi/init/webhook.sh gsi_aosp_build + ./gsi/init/webhook.sh gsi_gecko_build #gsi_b2g_repack gsi_aosp_build gsi_gecko_build gsi_b2g_build gsi_api_daemon_build diff --git a/.github/workflows/onyx_b2g_config.yml b/.github/workflows/onyx_b2g_config.yml index 5a15977..0568c33 100644 --- a/.github/workflows/onyx_b2g_config.yml +++ b/.github/workflows/onyx_b2g_config.yml @@ -32,5 +32,5 @@ jobs: - name: Action run: | - ./onyx/init/webhook.sh onyx_aosp_build + ./onyx/init/webhook.sh onyx_gecko_build #onyx_b2g_repack onyx_aosp_build onyx_gecko_build onyx_b2g_build onyx_api_daemon_build From 3f5f901300a18a8f340884d63e8a9593fdd66bb5 Mon Sep 17 00:00:00 2001 From: ittat Date: Sun, 27 Jun 2021 10:17:03 +0800 Subject: [PATCH 056/141] Update onyx_b2g_build.yml --- .github/workflows/onyx_b2g_build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/onyx_b2g_build.yml b/.github/workflows/onyx_b2g_build.yml index d3f07f6..2db0b28 100644 --- a/.github/workflows/onyx_b2g_build.yml +++ b/.github/workflows/onyx_b2g_build.yml @@ -226,6 +226,7 @@ jobs: cd ~ git clone https://github.com/kaiostech/gecko-b2g -b gonk #for onyx + cd gecko-b2g git am ~/44fd8680baef9b9b4538dff707eb1f7328756222.patch git am ~/cff33e0d3ee242a68f0484cc00cda6ed8c02c5f2.patch #git clone https://github.com/OnePlus-onyx/gecko-b2g-onyx -b onyx --depth=1 From ec9669d51fdeba5b5c5b551cca627bdab493c68c Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 29 Jun 2021 12:50:22 +0800 Subject: [PATCH 057/141] fix --- common/build/build_gecko.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/common/build/build_gecko.sh b/common/build/build_gecko.sh index be73dbd..9aca4c0 100755 --- a/common/build/build_gecko.sh +++ b/common/build/build_gecko.sh @@ -8,7 +8,10 @@ cd ~ rclone copy itd:ci/${remotepath}/b2g-sysroot.tar.zst ./ tar -C "$HOME/.mozbuild" -I zstd -x -a -f b2g-sysroot.tar.zst -mkdir ~/objdir-gecko +mkdir ${HOME}/objdir-gecko + + +tar -C "$HOME/objdir-gecko" -I zstd -x -a -f b2g-sysroot.tar.zst sudo rm b2g-sysroot.tar.zst From d98c804322e275f1496dce305502d0274c916bd9 Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 29 Jun 2021 16:15:22 +0800 Subject: [PATCH 058/141] fix --- .github/workflows/onyx_b2g_build.yml | 2 +- common/build/add_pre_api_daemon.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/onyx_b2g_build.yml b/.github/workflows/onyx_b2g_build.yml index 2db0b28..a136ba4 100644 --- a/.github/workflows/onyx_b2g_build.yml +++ b/.github/workflows/onyx_b2g_build.yml @@ -128,7 +128,7 @@ jobs: if: github.event.action == 'onyx_b2g_build' run: | df -h - ./onyx/build/add_pre_api_daemon.sh + ./common/build/add_pre_api_daemon.sh #### build ./onyx/build/build_with_gecko.sh diff --git a/common/build/add_pre_api_daemon.sh b/common/build/add_pre_api_daemon.sh index cc0b934..73e5e17 100755 --- a/common/build/add_pre_api_daemon.sh +++ b/common/build/add_pre_api_daemon.sh @@ -25,4 +25,4 @@ mkdir -p ${path_b2g}/defaults cp -r ${APIDeamon_PreBuild}/http_root ${TARGET_OUT}/api-daemon cp ${APIDeamon_PreBuild}/${device_arch}/api-daemon ${TARGET_OUT}/bin/ -chmod +x ${TARGET_OUT}/bin/api-daem \ No newline at end of file +chmod +x ${TARGET_OUT}/bin/api-daemon \ No newline at end of file From e7c5c9528bbb794e78336e0303c493419d71f0ba Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 7 Jul 2021 12:31:29 +0800 Subject: [PATCH 059/141] add all gsi type --- .github/workflows/b2g_gsi_arm64_a_config.yml | 42 +++++++++++++++++++ ...config.yml => b2g_gsi_arm64_ab_config.yml} | 4 +- .github/workflows/b2g_gsi_arm_a_config.yml | 42 +++++++++++++++++++ .github/workflows/b2g_gsi_arm_ab_config.yml | 42 +++++++++++++++++++ .github/workflows/onyx_b2g_config.yml | 2 +- 5 files changed, 129 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/b2g_gsi_arm64_a_config.yml rename .github/workflows/{b2g_gsi_config.yml => b2g_gsi_arm64_ab_config.yml} (93%) create mode 100644 .github/workflows/b2g_gsi_arm_a_config.yml create mode 100644 .github/workflows/b2g_gsi_arm_ab_config.yml diff --git a/.github/workflows/b2g_gsi_arm64_a_config.yml b/.github/workflows/b2g_gsi_arm64_a_config.yml new file mode 100644 index 0000000..577fedd --- /dev/null +++ b/.github/workflows/b2g_gsi_arm64_a_config.yml @@ -0,0 +1,42 @@ +name: b2g-gsi-arm64_a-config +on: + workflow_dispatch: + +# NEED +# 1. secrets.GIT_ACCESS_TOKEN +# 2. secrets.RCLONE +# 3. device_name eg；onyx(oneplus x), bacon(oneplus one), phhgsi_arm64_a(phh's gsi) etc. +# out/device_name +# 4. build_device_tag: eg: full-onyx-eng, full-bacon-userdebug etc. +# gsi-build.sh build_device_tag +# 5. repo_dispatches: https://api.github.com/repos/(you id)/(you repo name)/dispatches +# 6. b2g_source: +# remote soucre address +# for example: +env: + GIT_ACCESS_TOKEN: ${{secrets.GIT_ACCESS_TOKEN}} + device_name: phhgsi_arm64_a + repo_dispatches: "https://api.github.com/repos/b2g-gsi/build-actions/dispatches" + b2g_source: "https://github.com/b2gos/B2G" + b2g_branch: "gsi" + build_device_tag: gsi_arm64_a + device_arch: aarch64-linux-android + actions_branch: b2g_gsi +#onyx +#phhgsi_arm64_a +#phhgsi_arm64_ab +#phhgsi_arm_a +#phhgsi_arm_ab +#RUST_TARGET := armv7-linux-androideabi + +jobs: + config: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v1 + + - name: Action + run: | + ./gsi/init/webhook.sh gsi_b2g_repack + #gsi_b2g_repack gsi_aosp_build gsi_gecko_build gsi_b2g_build gsi_api_daemon_build diff --git a/.github/workflows/b2g_gsi_config.yml b/.github/workflows/b2g_gsi_arm64_ab_config.yml similarity index 93% rename from .github/workflows/b2g_gsi_config.yml rename to .github/workflows/b2g_gsi_arm64_ab_config.yml index f70f45e..cdb846a 100644 --- a/.github/workflows/b2g_gsi_config.yml +++ b/.github/workflows/b2g_gsi_arm64_ab_config.yml @@ -1,4 +1,4 @@ -name: b2g-gsi-config +name: b2g-gsi-arm64_ab-config on: workflow_dispatch: @@ -38,5 +38,5 @@ jobs: - name: Action run: | - ./gsi/init/webhook.sh gsi_gecko_build + ./gsi/init/webhook.sh gsi_b2g_repack #gsi_b2g_repack gsi_aosp_build gsi_gecko_build gsi_b2g_build gsi_api_daemon_build diff --git a/.github/workflows/b2g_gsi_arm_a_config.yml b/.github/workflows/b2g_gsi_arm_a_config.yml new file mode 100644 index 0000000..c81a3c2 --- /dev/null +++ b/.github/workflows/b2g_gsi_arm_a_config.yml @@ -0,0 +1,42 @@ +name: b2g-gsi-arm_a-config +on: + workflow_dispatch: + +# NEED +# 1. secrets.GIT_ACCESS_TOKEN +# 2. secrets.RCLONE +# 3. device_name eg；onyx(oneplus x), bacon(oneplus one), phhgsi_arm64_a(phh's gsi) etc. +# out/device_name +# 4. build_device_tag: eg: full-onyx-eng, full-bacon-userdebug etc. +# gsi-build.sh build_device_tag +# 5. repo_dispatches: https://api.github.com/repos/(you id)/(you repo name)/dispatches +# 6. b2g_source: +# remote soucre address +# for example: +env: + GIT_ACCESS_TOKEN: ${{secrets.GIT_ACCESS_TOKEN}} + device_name: phhgsi_arm_a + repo_dispatches: "https://api.github.com/repos/b2g-gsi/build-actions/dispatches" + b2g_source: "https://github.com/b2gos/B2G" + b2g_branch: "gsi" + build_device_tag: gsi_arm_a + device_arch: armv7-linux-androideabi + actions_branch: b2g_gsi +#onyx +#phhgsi_arm64_a +#phhgsi_arm64_ab +#phhgsi_arm_a +#phhgsi_arm_ab +#RUST_TARGET := armv7-linux-androideabi + +jobs: + config: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v1 + + - name: Action + run: | + ./gsi/init/webhook.sh gsi_b2g_repack + #gsi_b2g_repack gsi_aosp_build gsi_gecko_build gsi_b2g_build gsi_api_daemon_build diff --git a/.github/workflows/b2g_gsi_arm_ab_config.yml b/.github/workflows/b2g_gsi_arm_ab_config.yml new file mode 100644 index 0000000..abf53fd --- /dev/null +++ b/.github/workflows/b2g_gsi_arm_ab_config.yml @@ -0,0 +1,42 @@ +name: b2g-gsi-arm_ab-config +on: + workflow_dispatch: + +# NEED +# 1. secrets.GIT_ACCESS_TOKEN +# 2. secrets.RCLONE +# 3. device_name eg；onyx(oneplus x), bacon(oneplus one), phhgsi_arm64_a(phh's gsi) etc. +# out/device_name +# 4. build_device_tag: eg: full-onyx-eng, full-bacon-userdebug etc. +# gsi-build.sh build_device_tag +# 5. repo_dispatches: https://api.github.com/repos/(you id)/(you repo name)/dispatches +# 6. b2g_source: +# remote soucre address +# for example: +env: + GIT_ACCESS_TOKEN: ${{secrets.GIT_ACCESS_TOKEN}} + device_name: phhgsi_arm_ab + repo_dispatches: "https://api.github.com/repos/b2g-gsi/build-actions/dispatches" + b2g_source: "https://github.com/b2gos/B2G" + b2g_branch: "gsi" + build_device_tag: gsi_arm_ab + device_arch: armv7-linux-androideabi + actions_branch: b2g_gsi +#onyx +#phhgsi_arm64_a +#phhgsi_arm64_ab +#phhgsi_arm_a +#phhgsi_arm_ab +#RUST_TARGET := armv7-linux-androideabi + +jobs: + config: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v1 + + - name: Action + run: | + ./gsi/init/webhook.sh gsi_b2g_repack + #gsi_b2g_repack gsi_aosp_build gsi_gecko_build gsi_b2g_build gsi_api_daemon_build diff --git a/.github/workflows/onyx_b2g_config.yml b/.github/workflows/onyx_b2g_config.yml index 0568c33..361668c 100644 --- a/.github/workflows/onyx_b2g_config.yml +++ b/.github/workflows/onyx_b2g_config.yml @@ -32,5 +32,5 @@ jobs: - name: Action run: | - ./onyx/init/webhook.sh onyx_gecko_build + ./onyx/init/webhook.sh onyx_b2g_repack #onyx_b2g_repack onyx_aosp_build onyx_gecko_build onyx_b2g_build onyx_api_daemon_build From c5370c2de64f8b3258542e784c4e78b8400b7d23 Mon Sep 17 00:00:00 2001 From: ittat Date: Sun, 17 Oct 2021 10:39:59 +0800 Subject: [PATCH 060/141] revert ghc- --- common/init/clean_space_linux.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/init/clean_space_linux.sh b/common/init/clean_space_linux.sh index 1e2f2f7..8a0a44a 100755 --- a/common/init/clean_space_linux.sh +++ b/common/init/clean_space_linux.sh @@ -5,7 +5,7 @@ echo ————————————————————————— sudo rm -rf "/usr/local/share/boost" sudo rm -rf "$AGENT_TOOLSDIRECTORY" sudo apt remove -y 'php.*' -sudo apt-get remove -y '^ghc-8.*' +#sudo apt-get remove -y '^ghc-8.*' sudo apt-get remove -y '^dotnet-.*' sudo apt-get autoremove -y sudo apt-get clean From e928f6f2e4c14bea3c9eec49546e7bb9d42ce2bf Mon Sep 17 00:00:00 2001 From: "ittat@IMac" Date: Sun, 17 Oct 2021 12:38:22 +0800 Subject: [PATCH 061/141] split gecko part from ci --- common/build/bootstrap_gecko.sh | 7 +++++++ common/source/download_kaios_ndk.sh | 5 +++++ 2 files changed, 12 insertions(+) create mode 100755 common/build/bootstrap_gecko.sh create mode 100755 common/source/download_kaios_ndk.sh diff --git a/common/build/bootstrap_gecko.sh b/common/build/bootstrap_gecko.sh new file mode 100755 index 0000000..743ef37 --- /dev/null +++ b/common/build/bootstrap_gecko.sh @@ -0,0 +1,7 @@ +#!/bin/bash +set -e + +export SHELL=/bin/bash +sudo apt update +export LOCAL_NDK_BASE_URL='ftp://ftp.kaiostech.com/ndk/android-ndk' +#./mach bootstrap --application-choice 'GeckoView/Firefox for Android' \ No newline at end of file diff --git a/common/source/download_kaios_ndk.sh b/common/source/download_kaios_ndk.sh new file mode 100755 index 0000000..2fc851e --- /dev/null +++ b/common/source/download_kaios_ndk.sh @@ -0,0 +1,5 @@ +#!/bin/bash +set -e + +cd ~ +curl https://packages.preprod.kaiostech.com/ndk/v4/mozbuild.tar.bz2 | tar -C ${HOME}/ -xj From 4558bec1cfb03de1078e7b0b9c487ffbbbf90d6d Mon Sep 17 00:00:00 2001 From: "ittat@IMac" Date: Sun, 17 Oct 2021 12:44:21 +0800 Subject: [PATCH 062/141] split gecko part from ci --- .github/workflows/b2g_gsi_build.yml | 21 ++++----------------- common/build/bootstrap_gecko.sh | 7 +++++++ common/source/download_kaios_ndk.sh | 5 +++++ 3 files changed, 16 insertions(+), 17 deletions(-) create mode 100755 common/build/bootstrap_gecko.sh create mode 100755 common/source/download_kaios_ndk.sh diff --git a/.github/workflows/b2g_gsi_build.yml b/.github/workflows/b2g_gsi_build.yml index 9cd0a1b..27c5a08 100644 --- a/.github/workflows/b2g_gsi_build.yml +++ b/.github/workflows/b2g_gsi_build.yml @@ -98,11 +98,7 @@ jobs: run: | brew install cpanm sudo cpan LWP::UserAgent - - cd ~ - curl https://packages.preprod.kaiostech.com/ndk/v4/mozbuild.tar.bz2 -o mozbuild.tar.bz2 - tar -xvf mozbuild.tar.bz2 - sudo rm mozbuild.tar.bz2 + ./common/source/download_kaios_ndk.sh - name: Check The Previous “error.log” run: | @@ -217,10 +213,7 @@ jobs: - name: Fetch Source run: | df -h - cd ~ - curl https://packages.preprod.kaiostech.com/ndk/v4/mozbuild.tar.bz2 -o mozbuild.tar.bz2 - tar -xvf mozbuild.tar.bz2 - sudo rm mozbuild.tar.bz2 + ./common/source/download_kaios_ndk.sh cd ~ git clone https://github.com/kaiostech/gecko-b2g -b gonk --depth=1 df -h @@ -229,11 +222,7 @@ jobs: run: | df -h cd ~/gecko-b2g - export SHELL=/bin/bash - sudo apt update - export LOCAL_NDK_BASE_URL='ftp://ftp.kaiostech.com/ndk/android-ndk' - ./mach bootstrap --application-choice 'GeckoView/Firefox for Android' - df -h + ./common/build/bootstrap_gecko.sh - name: Build Gecko run: | @@ -290,16 +279,14 @@ jobs: - name: Download Source run: | + ./common/source/download_kaios_ndk.sh cd ~ #### rustup target add aarch64-linux-android armv7-linux-androideabi - cd ~ - curl https://packages.preprod.kaiostech.com/ndk/v4/mozbuild.tar.bz2 | tar -C ${HOME}/ -xj rclone copy itd:ci/${remotepath}/api-sysroot.tar.zst ./ mkdir ~/.mozbuild/api-sysroot tar -C "$HOME/.mozbuild/api-sysroot" -I zstd -x -a -f api-sysroot.tar.zst ls ~/.mozbuild/api-sysroot/out - cd ~ git clone https://github.com/kaiostech/api-daemon ls -al diff --git a/common/build/bootstrap_gecko.sh b/common/build/bootstrap_gecko.sh new file mode 100755 index 0000000..743ef37 --- /dev/null +++ b/common/build/bootstrap_gecko.sh @@ -0,0 +1,7 @@ +#!/bin/bash +set -e + +export SHELL=/bin/bash +sudo apt update +export LOCAL_NDK_BASE_URL='ftp://ftp.kaiostech.com/ndk/android-ndk' +#./mach bootstrap --application-choice 'GeckoView/Firefox for Android' \ No newline at end of file diff --git a/common/source/download_kaios_ndk.sh b/common/source/download_kaios_ndk.sh new file mode 100755 index 0000000..2fc851e --- /dev/null +++ b/common/source/download_kaios_ndk.sh @@ -0,0 +1,5 @@ +#!/bin/bash +set -e + +cd ~ +curl https://packages.preprod.kaiostech.com/ndk/v4/mozbuild.tar.bz2 | tar -C ${HOME}/ -xj From b09e247c4681982b327981d9e73950f9008d8d6f Mon Sep 17 00:00:00 2001 From: "ittat@IMac" Date: Sun, 17 Oct 2021 23:08:45 +0800 Subject: [PATCH 063/141] fix path error --- .github/workflows/b2g_gsi_build.yml | 1 - common/build/bootstrap_gecko.sh | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/b2g_gsi_build.yml b/.github/workflows/b2g_gsi_build.yml index 27c5a08..bc09a3e 100644 --- a/.github/workflows/b2g_gsi_build.yml +++ b/.github/workflows/b2g_gsi_build.yml @@ -221,7 +221,6 @@ jobs: - name: Bootstrap Gecko run: | df -h - cd ~/gecko-b2g ./common/build/bootstrap_gecko.sh - name: Build Gecko diff --git a/common/build/bootstrap_gecko.sh b/common/build/bootstrap_gecko.sh index 743ef37..b50d726 100755 --- a/common/build/bootstrap_gecko.sh +++ b/common/build/bootstrap_gecko.sh @@ -1,6 +1,7 @@ #!/bin/bash set -e +cd ~/gecko-b2g export SHELL=/bin/bash sudo apt update export LOCAL_NDK_BASE_URL='ftp://ftp.kaiostech.com/ndk/android-ndk' From 3912ad10f0a89823e95dfde51f060e921d8f8437 Mon Sep 17 00:00:00 2001 From: ittat Date: Mon, 18 Oct 2021 08:42:25 +0800 Subject: [PATCH 064/141] GeckoView/Firefox for Android by default --- common/build/bootstrap_gecko.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/build/bootstrap_gecko.sh b/common/build/bootstrap_gecko.sh index b50d726..f62d3f0 100755 --- a/common/build/bootstrap_gecko.sh +++ b/common/build/bootstrap_gecko.sh @@ -4,5 +4,5 @@ set -e cd ~/gecko-b2g export SHELL=/bin/bash sudo apt update -export LOCAL_NDK_BASE_URL='ftp://ftp.kaiostech.com/ndk/android-ndk' -#./mach bootstrap --application-choice 'GeckoView/Firefox for Android' \ No newline at end of file +#export LOCAL_NDK_BASE_URL='ftp://ftp.kaiostech.com/ndk/android-ndk' +./mach bootstrap --application-choice 'GeckoView/Firefox for Android' From 965b80bff04dba2be1906ca123eee5e5d813f55b Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 22 Jan 2022 10:41:40 +0800 Subject: [PATCH 065/141] Update download_kaios_ndk.sh --- common/source/download_kaios_ndk.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/source/download_kaios_ndk.sh b/common/source/download_kaios_ndk.sh index 2fc851e..9b88614 100755 --- a/common/source/download_kaios_ndk.sh +++ b/common/source/download_kaios_ndk.sh @@ -2,4 +2,4 @@ set -e cd ~ -curl https://packages.preprod.kaiostech.com/ndk/v4/mozbuild.tar.bz2 | tar -C ${HOME}/ -xj +curl https://packages.preprod.kaiostech.com/ndk/v7/mozbuild.tar.bz2 | tar -C ${HOME}/ -xj From d784d135f42ad5f8a30501a1d105831ddb54e77b Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 22 Jan 2022 10:50:59 +0800 Subject: [PATCH 066/141] Update download_kaios_ndk.sh --- common/source/download_kaios_ndk.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/common/source/download_kaios_ndk.sh b/common/source/download_kaios_ndk.sh index 9b88614..9e5bfd9 100755 --- a/common/source/download_kaios_ndk.sh +++ b/common/source/download_kaios_ndk.sh @@ -1,5 +1,9 @@ #!/bin/bash set -e +cd ~ +git clone https://github.com/mozilla/gecko-dev -b master --depth=1 +cd ~/gecko-dev +./mach bootstrap --application-choice 'GeckoView/Firefox for Android' cd ~ curl https://packages.preprod.kaiostech.com/ndk/v7/mozbuild.tar.bz2 | tar -C ${HOME}/ -xj From c5a9b2c3f1b5e50c2a236d1186de1dce1767cd2c Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 22 Jan 2022 10:52:05 +0800 Subject: [PATCH 067/141] Update clean_space_darwin.sh --- common/init/clean_space_darwin.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/common/init/clean_space_darwin.sh b/common/init/clean_space_darwin.sh index 2a59116..fc6f44d 100755 --- a/common/init/clean_space_darwin.sh +++ b/common/init/clean_space_darwin.sh @@ -2,9 +2,10 @@ set -e ls -al -h /Applications df -h -sudo rm -r /Applications/Xcode_10* +# sudo rm -r /Applications/Xcode_10* #sudo rm -r /Applications/Xcode_12* sudo rm -r /Applications/Xcode_11* +sudo rm -r /Applications/Xcode_13* #Firefox* Julia* Microsoft* R* Visual* ls -al -h /Applications -df -h \ No newline at end of file +df -h From 962e08dbc39bf4dadfa652f32870adaee9f33173 Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 22 Jan 2022 12:18:25 +0800 Subject: [PATCH 068/141] Update b2g_gsi_arm_ab_config.yml --- .github/workflows/b2g_gsi_arm_ab_config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/b2g_gsi_arm_ab_config.yml b/.github/workflows/b2g_gsi_arm_ab_config.yml index abf53fd..50e078b 100644 --- a/.github/workflows/b2g_gsi_arm_ab_config.yml +++ b/.github/workflows/b2g_gsi_arm_ab_config.yml @@ -38,5 +38,5 @@ jobs: - name: Action run: | - ./gsi/init/webhook.sh gsi_b2g_repack + ./gsi/init/webhook.sh gsi_gecko_build #gsi_b2g_repack gsi_aosp_build gsi_gecko_build gsi_b2g_build gsi_api_daemon_build From 078132e6340359f371381b0025bbe964fdb6b68f Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 22 Jan 2022 12:27:04 +0800 Subject: [PATCH 069/141] Update bootstrap_gecko.sh --- common/build/bootstrap_gecko.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/build/bootstrap_gecko.sh b/common/build/bootstrap_gecko.sh index f62d3f0..4cd7cc3 100755 --- a/common/build/bootstrap_gecko.sh +++ b/common/build/bootstrap_gecko.sh @@ -5,4 +5,4 @@ cd ~/gecko-b2g export SHELL=/bin/bash sudo apt update #export LOCAL_NDK_BASE_URL='ftp://ftp.kaiostech.com/ndk/android-ndk' -./mach bootstrap --application-choice 'GeckoView/Firefox for Android' +# ./mach bootstrap --application-choice 'GeckoView/Firefox for Android' From 25f6d6e28993f765a303d04b83228f3548a7a7f7 Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 22 Jan 2022 12:57:26 +0800 Subject: [PATCH 070/141] Update download_kaios_ndk.sh --- common/source/download_kaios_ndk.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/source/download_kaios_ndk.sh b/common/source/download_kaios_ndk.sh index 9e5bfd9..dc880bb 100755 --- a/common/source/download_kaios_ndk.sh +++ b/common/source/download_kaios_ndk.sh @@ -4,6 +4,6 @@ set -e cd ~ git clone https://github.com/mozilla/gecko-dev -b master --depth=1 cd ~/gecko-dev -./mach bootstrap --application-choice 'GeckoView/Firefox for Android' +./mach bootstrap --application-choice 'GeckoView/Firefox for Android' --no-interactive cd ~ curl https://packages.preprod.kaiostech.com/ndk/v7/mozbuild.tar.bz2 | tar -C ${HOME}/ -xj From 155f7615fcdcb12e56ab4f8c49f3517ebd1a42c4 Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 22 Jan 2022 14:10:28 +0800 Subject: [PATCH 071/141] Update download_kaios_ndk.sh --- common/source/download_kaios_ndk.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/source/download_kaios_ndk.sh b/common/source/download_kaios_ndk.sh index dc880bb..2ba2d3c 100755 --- a/common/source/download_kaios_ndk.sh +++ b/common/source/download_kaios_ndk.sh @@ -4,6 +4,7 @@ set -e cd ~ git clone https://github.com/mozilla/gecko-dev -b master --depth=1 cd ~/gecko-dev -./mach bootstrap --application-choice 'GeckoView/Firefox for Android' --no-interactive +./mach --no-interactive bootstrap --application-choice 'GeckoView/Firefox for Android' cd ~ curl https://packages.preprod.kaiostech.com/ndk/v7/mozbuild.tar.bz2 | tar -C ${HOME}/ -xj + From 8c7e4b343674fd002e0649d7ccb28b3c03868e36 Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 5 Mar 2022 11:35:02 +0800 Subject: [PATCH 072/141] Update b2g_gsi_build.yml --- .github/workflows/b2g_gsi_build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/b2g_gsi_build.yml b/.github/workflows/b2g_gsi_build.yml index bc09a3e..89d631f 100644 --- a/.github/workflows/b2g_gsi_build.yml +++ b/.github/workflows/b2g_gsi_build.yml @@ -218,6 +218,10 @@ jobs: git clone https://github.com/kaiostech/gecko-b2g -b gonk --depth=1 df -h + - uses: actions/checkout@v2 + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 + - name: Bootstrap Gecko run: | df -h From 0385ba9667cb1f626f1280b6e87d685c81af44ce Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 5 Mar 2022 11:55:36 +0800 Subject: [PATCH 073/141] Update download_kaios_ndk.sh --- common/source/download_kaios_ndk.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/source/download_kaios_ndk.sh b/common/source/download_kaios_ndk.sh index 2ba2d3c..ade682b 100755 --- a/common/source/download_kaios_ndk.sh +++ b/common/source/download_kaios_ndk.sh @@ -2,9 +2,9 @@ set -e cd ~ -git clone https://github.com/mozilla/gecko-dev -b master --depth=1 -cd ~/gecko-dev -./mach --no-interactive bootstrap --application-choice 'GeckoView/Firefox for Android' -cd ~ +# git clone https://github.com/mozilla/gecko-dev -b master --depth=1 +# cd ~/gecko-dev +# ./mach --no-interactive bootstrap --application-choice 'GeckoView/Firefox for Android' +# cd ~ curl https://packages.preprod.kaiostech.com/ndk/v7/mozbuild.tar.bz2 | tar -C ${HOME}/ -xj From 9a84796800fffb88c371a3d0b5b33b3e41bc5de7 Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 19 Mar 2022 10:46:58 +0800 Subject: [PATCH 074/141] Update bootstrap_gecko.sh --- common/build/bootstrap_gecko.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/common/build/bootstrap_gecko.sh b/common/build/bootstrap_gecko.sh index 4cd7cc3..4a5c81c 100755 --- a/common/build/bootstrap_gecko.sh +++ b/common/build/bootstrap_gecko.sh @@ -1,8 +1,10 @@ #!/bin/bash set -e -cd ~/gecko-b2g -export SHELL=/bin/bash -sudo apt update +# cd ~/gecko-b2g +# export SHELL=/bin/bash +# sudo apt update #export LOCAL_NDK_BASE_URL='ftp://ftp.kaiostech.com/ndk/android-ndk' # ./mach bootstrap --application-choice 'GeckoView/Firefox for Android' +wget -q https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozboot/bin/bootstrap.py -O bootstrap.py +echo 4 | python3 bootstrap.py --no-interactive From 6b1a1bb263906574acc5ad47ba42b08b6817add8 Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 19 Mar 2022 10:47:14 +0800 Subject: [PATCH 075/141] Update b2g_gsi_build.yml --- .github/workflows/b2g_gsi_build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/b2g_gsi_build.yml b/.github/workflows/b2g_gsi_build.yml index 89d631f..64849e4 100644 --- a/.github/workflows/b2g_gsi_build.yml +++ b/.github/workflows/b2g_gsi_build.yml @@ -213,19 +213,19 @@ jobs: - name: Fetch Source run: | df -h - ./common/source/download_kaios_ndk.sh cd ~ git clone https://github.com/kaiostech/gecko-b2g -b gonk --depth=1 df -h - - uses: actions/checkout@v2 - - name: Setup tmate session - uses: mxschmitt/action-tmate@v3 +# - uses: actions/checkout@v2 +# - name: Setup tmate session +# uses: mxschmitt/action-tmate@v3 - name: Bootstrap Gecko run: | df -h ./common/build/bootstrap_gecko.sh + ./common/source/download_kaios_ndk.sh - name: Build Gecko run: | From 1430dc4ec51db85174eecc2c9acb6c0588baabfd Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 19 Mar 2022 11:02:09 +0800 Subject: [PATCH 076/141] Update b2g_gsi_build.yml --- .github/workflows/b2g_gsi_build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/b2g_gsi_build.yml b/.github/workflows/b2g_gsi_build.yml index 64849e4..fba0983 100644 --- a/.github/workflows/b2g_gsi_build.yml +++ b/.github/workflows/b2g_gsi_build.yml @@ -226,6 +226,7 @@ jobs: df -h ./common/build/bootstrap_gecko.sh ./common/source/download_kaios_ndk.sh + rustup target add aarch64-linux-android armv7-linux-androideabi - name: Build Gecko run: | From b1ed4bdf9467e3216d977a7b207b2db5fd7139ea Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 19 Mar 2022 11:32:57 +0800 Subject: [PATCH 077/141] Update build-gecko-srcipt.sh --- common/build/build-gecko-srcipt.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/build/build-gecko-srcipt.sh b/common/build/build-gecko-srcipt.sh index c191a01..09aa371 100755 --- a/common/build/build-gecko-srcipt.sh +++ b/common/build/build-gecko-srcipt.sh @@ -74,7 +74,7 @@ fi export MOZCONFIG=`pwd`/mozconfig-b2g -ANDROID_NDK=${ANDROID_NDK:-$HOME/.mozbuild/android-ndk-r20b-canary} +ANDROID_NDK=${ANDROID_NDK:-$HOME/.mozbuild/android-ndk-r21d} export ANDROID_NDK="${ANDROID_NDK/#\~/$HOME}" TARGET_GCC_VERSION=${TARGET_GCC_VERSION:-4.9} @@ -153,4 +153,4 @@ export ANDROID_PLATFORM=$ANDROID_PLATFORM export LDFLAGS="--sysroot=${SYSROOT}" -./mach build $@ \ No newline at end of file +./mach build $@ From 92c561f1845228bf01bbe479b3fc8e02266b8076 Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 19 Mar 2022 12:56:27 +0800 Subject: [PATCH 078/141] Update b2g_gsi_build.yml --- .github/workflows/b2g_gsi_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/b2g_gsi_build.yml b/.github/workflows/b2g_gsi_build.yml index fba0983..90fe0b1 100644 --- a/.github/workflows/b2g_gsi_build.yml +++ b/.github/workflows/b2g_gsi_build.yml @@ -226,7 +226,7 @@ jobs: df -h ./common/build/bootstrap_gecko.sh ./common/source/download_kaios_ndk.sh - rustup target add aarch64-linux-android armv7-linux-androideabi + rustup target add aarch64-linux-android armv7-linux-androideabi thumbv7neon-linux-androideabi - name: Build Gecko run: | From 9ec9386dfe81c326945cc32c0953271480c6b2e1 Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 19 Mar 2022 15:02:21 +0800 Subject: [PATCH 079/141] Update b2g_gsi_arm_ab_config.yml --- .github/workflows/b2g_gsi_arm_ab_config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/b2g_gsi_arm_ab_config.yml b/.github/workflows/b2g_gsi_arm_ab_config.yml index 50e078b..abf53fd 100644 --- a/.github/workflows/b2g_gsi_arm_ab_config.yml +++ b/.github/workflows/b2g_gsi_arm_ab_config.yml @@ -38,5 +38,5 @@ jobs: - name: Action run: | - ./gsi/init/webhook.sh gsi_gecko_build + ./gsi/init/webhook.sh gsi_b2g_repack #gsi_b2g_repack gsi_aosp_build gsi_gecko_build gsi_b2g_build gsi_api_daemon_build From 34650611378f669f89a7f0c81996217c8b21c17f Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 19 Mar 2022 15:36:46 +0800 Subject: [PATCH 080/141] Update env_darwin.sh --- common/init/env_darwin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/init/env_darwin.sh b/common/init/env_darwin.sh index 0b8c8b3..073fdaa 100755 --- a/common/init/env_darwin.sh +++ b/common/init/env_darwin.sh @@ -5,7 +5,7 @@ df -h more /System/Library/CoreServices/SystemVersion.plist ls /Applications/Xcode_* #sudo xcode-select --switch /Applications/Xcode_11.app/Contents/Developer -sudo xcode-select --switch /Applications/Xcode_12.app/Contents/Developer +sudo xcode-select --switch /Applications/Xcode_12.4.app/Contents/Developer echo [Set] Xcode_12 ####install From 099d65e9797929d5346aae512bcae91f650fd617 Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 19 Mar 2022 18:27:24 +0800 Subject: [PATCH 081/141] Update onyx_b2g_build.yml --- .github/workflows/onyx_b2g_build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/onyx_b2g_build.yml b/.github/workflows/onyx_b2g_build.yml index a136ba4..e9afaa5 100644 --- a/.github/workflows/onyx_b2g_build.yml +++ b/.github/workflows/onyx_b2g_build.yml @@ -34,7 +34,7 @@ env: jobs: repack_aosp: if: github.event.action == 'onyx_b2g_repack' - runs-on: macos-latest + runs-on: macos-10.15 timeout-minutes: 360 steps: - name: Checkout @@ -77,7 +77,7 @@ jobs: aosp_build: if: github.event.action == 'onyx_aosp_build' || github.event.action == 'onyx_b2g_build' - runs-on: macos-latest + runs-on: macos-10.15 timeout-minutes: 360 steps: - name: Checkout From 4cb3132d08e73bf4c185ce7d1a85f574369d5036 Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 19 Mar 2022 18:28:22 +0800 Subject: [PATCH 082/141] Update b2g_gsi_build.yml --- .github/workflows/b2g_gsi_build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/b2g_gsi_build.yml b/.github/workflows/b2g_gsi_build.yml index 90fe0b1..a4695ce 100644 --- a/.github/workflows/b2g_gsi_build.yml +++ b/.github/workflows/b2g_gsi_build.yml @@ -35,7 +35,7 @@ env: jobs: repack_aosp: if: github.event.action == 'gsi_b2g_repack' - runs-on: macos-latest + runs-on: macos-10.15 timeout-minutes: 360 steps: - name: Checkout @@ -78,7 +78,7 @@ jobs: aosp_build: if: github.event.action == 'gsi_aosp_build' || github.event.action == 'gsi_b2g_build' - runs-on: macos-latest + runs-on: macos-10.15 timeout-minutes: 360 steps: - name: Checkout From 9fced286457d654eb61354106eb151cb08ddfc55 Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 19 Mar 2022 18:42:07 +0800 Subject: [PATCH 083/141] Update onyx_b2g_config.yml --- .github/workflows/onyx_b2g_config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/onyx_b2g_config.yml b/.github/workflows/onyx_b2g_config.yml index 361668c..5a15977 100644 --- a/.github/workflows/onyx_b2g_config.yml +++ b/.github/workflows/onyx_b2g_config.yml @@ -32,5 +32,5 @@ jobs: - name: Action run: | - ./onyx/init/webhook.sh onyx_b2g_repack + ./onyx/init/webhook.sh onyx_aosp_build #onyx_b2g_repack onyx_aosp_build onyx_gecko_build onyx_b2g_build onyx_api_daemon_build From 66f9c2805283e2407fe5683224ad3a8c27a3b310 Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 19 Mar 2022 18:42:37 +0800 Subject: [PATCH 084/141] Update b2g_gsi_arm_ab_config.yml --- .github/workflows/b2g_gsi_arm_ab_config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/b2g_gsi_arm_ab_config.yml b/.github/workflows/b2g_gsi_arm_ab_config.yml index abf53fd..a828dc2 100644 --- a/.github/workflows/b2g_gsi_arm_ab_config.yml +++ b/.github/workflows/b2g_gsi_arm_ab_config.yml @@ -38,5 +38,5 @@ jobs: - name: Action run: | - ./gsi/init/webhook.sh gsi_b2g_repack + ./gsi/init/webhook.sh gsi_aosp_build #gsi_b2g_repack gsi_aosp_build gsi_gecko_build gsi_b2g_build gsi_api_daemon_build From 1a21c95b03a58cd3edf30681763417d8244fa42a Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 19 Mar 2022 19:20:55 +0800 Subject: [PATCH 085/141] Update clean_space_darwin.sh --- common/init/clean_space_darwin.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/init/clean_space_darwin.sh b/common/init/clean_space_darwin.sh index fc6f44d..fcff69e 100755 --- a/common/init/clean_space_darwin.sh +++ b/common/init/clean_space_darwin.sh @@ -2,10 +2,10 @@ set -e ls -al -h /Applications df -h -# sudo rm -r /Applications/Xcode_10* +sudo rm -r /Applications/Xcode_10* #sudo rm -r /Applications/Xcode_12* sudo rm -r /Applications/Xcode_11* -sudo rm -r /Applications/Xcode_13* +# sudo rm -r /Applications/Xcode_13* #Firefox* Julia* Microsoft* R* Visual* ls -al -h /Applications df -h From 3926264186b70fe8492c1edd7e9494fd71ece276 Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 19 Mar 2022 20:56:37 +0800 Subject: [PATCH 086/141] Update env_darwin.sh --- common/init/env_darwin.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/init/env_darwin.sh b/common/init/env_darwin.sh index 073fdaa..8bb751f 100755 --- a/common/init/env_darwin.sh +++ b/common/init/env_darwin.sh @@ -4,8 +4,8 @@ df -h #### more /System/Library/CoreServices/SystemVersion.plist ls /Applications/Xcode_* -#sudo xcode-select --switch /Applications/Xcode_11.app/Contents/Developer -sudo xcode-select --switch /Applications/Xcode_12.4.app/Contents/Developer +sudo xcode-select --switch /Applications/Xcode_11.app/Contents/Developer +#sudo xcode-select --switch /Applications/Xcode_12.4.app/Contents/Developer echo [Set] Xcode_12 ####install From c7e9953aedaa59bf4c12c7564ab0a223d9fa7fdd Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 19 Mar 2022 20:59:12 +0800 Subject: [PATCH 087/141] Update clean_space_darwin.sh --- common/init/clean_space_darwin.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/init/clean_space_darwin.sh b/common/init/clean_space_darwin.sh index fcff69e..26e7f80 100755 --- a/common/init/clean_space_darwin.sh +++ b/common/init/clean_space_darwin.sh @@ -3,8 +3,8 @@ set -e ls -al -h /Applications df -h sudo rm -r /Applications/Xcode_10* -#sudo rm -r /Applications/Xcode_12* -sudo rm -r /Applications/Xcode_11* +sudo rm -r /Applications/Xcode_12* +#sudo rm -r /Applications/Xcode_11* # sudo rm -r /Applications/Xcode_13* #Firefox* Julia* Microsoft* R* Visual* ls -al -h /Applications From 6d4dc947b39296a2237c56af13dd315de8d2aa50 Mon Sep 17 00:00:00 2001 From: ittat Date: Sun, 20 Mar 2022 05:35:34 +0800 Subject: [PATCH 088/141] Update env_darwin.sh --- common/init/env_darwin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/init/env_darwin.sh b/common/init/env_darwin.sh index 8bb751f..baaef60 100755 --- a/common/init/env_darwin.sh +++ b/common/init/env_darwin.sh @@ -4,7 +4,7 @@ df -h #### more /System/Library/CoreServices/SystemVersion.plist ls /Applications/Xcode_* -sudo xcode-select --switch /Applications/Xcode_11.app/Contents/Developer +sudo xcode-select --switch /Applications/Xcode_11.2.app/Contents/Developer #sudo xcode-select --switch /Applications/Xcode_12.4.app/Contents/Developer echo [Set] Xcode_12 From 423c78d2b5d33d45b07bbabf4e484430f542fa9b Mon Sep 17 00:00:00 2001 From: ittat Date: Sun, 20 Mar 2022 11:32:30 +0800 Subject: [PATCH 089/141] Update build_without_gecko.sh --- gsi/build/build_without_gecko.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gsi/build/build_without_gecko.sh b/gsi/build/build_without_gecko.sh index d9f01c6..cd9e933 100755 --- a/gsi/build/build_without_gecko.sh +++ b/gsi/build/build_without_gecko.sh @@ -11,6 +11,7 @@ export DISABLE_SOURCES_XML=true export PREFERRED_B2G=${work}/b2g-dummy.tar.bz2 export USE_PREBUILT_B2G=1 export SKIP_ABI_CHECKS=true +export ANDROID_NDK="${HOME}/.mozbuild/android-ndk-r21d" #gsi gtimeout 245m ./build-gsi.sh ${build_device_tag} systemimage -df -h \ No newline at end of file +df -h From 90d42300bf570a3d1833f5777f3bedd1b5f61d98 Mon Sep 17 00:00:00 2001 From: ittat Date: Sun, 20 Mar 2022 11:33:58 +0800 Subject: [PATCH 090/141] Update build_without_gecko.sh --- onyx/build/build_without_gecko.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/onyx/build/build_without_gecko.sh b/onyx/build/build_without_gecko.sh index e7a8961..5f95d59 100755 --- a/onyx/build/build_without_gecko.sh +++ b/onyx/build/build_without_gecko.sh @@ -11,5 +11,6 @@ export DISABLE_SOURCES_XML=true #export OUT_DIR_COMMON_BASE=${out_work} export PREFERRED_B2G=${work}/b2g-dummy.tar.bz2 export USE_PREBUILT_B2G=1 +export ANDROID_NDK="${HOME}/.mozbuild/android-ndk-r21d" gtimeout 245m ./build.sh -j16 -df -h \ No newline at end of file +df -h From b3e0fff17901149863443f9c3c7694d1e8f29e19 Mon Sep 17 00:00:00 2001 From: ittat Date: Sun, 20 Mar 2022 16:21:57 +0800 Subject: [PATCH 091/141] Update build_without_gecko.sh --- onyx/build/build_without_gecko.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/onyx/build/build_without_gecko.sh b/onyx/build/build_without_gecko.sh index 5f95d59..90aa764 100755 --- a/onyx/build/build_without_gecko.sh +++ b/onyx/build/build_without_gecko.sh @@ -12,5 +12,6 @@ export DISABLE_SOURCES_XML=true export PREFERRED_B2G=${work}/b2g-dummy.tar.bz2 export USE_PREBUILT_B2G=1 export ANDROID_NDK="${HOME}/.mozbuild/android-ndk-r21d" +export SELINUX_IGNORE_NEVERALLOWS=true gtimeout 245m ./build.sh -j16 df -h From 304ed8ebeab8ed8c32da49b35f141f556c89a6e1 Mon Sep 17 00:00:00 2001 From: ittat Date: Sun, 20 Mar 2022 16:48:14 +0800 Subject: [PATCH 092/141] Update build_without_gecko.sh --- onyx/build/build_without_gecko.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/onyx/build/build_without_gecko.sh b/onyx/build/build_without_gecko.sh index 90aa764..9757d50 100755 --- a/onyx/build/build_without_gecko.sh +++ b/onyx/build/build_without_gecko.sh @@ -2,6 +2,10 @@ set -e df -h #### + + +sudo xcode-select --switch /Applications/Xcode_11.5.app/Contents/Developer + export CCACHE_DIR=~/.ccache /usr/local/bin/ccache -M 20G /usr/local/bin/ccache -s From 148650d0bf4291730511088a44d0dc127123a3ae Mon Sep 17 00:00:00 2001 From: ittat Date: Tue, 22 Mar 2022 09:58:51 +0800 Subject: [PATCH 093/141] test- add full version for darwin --- .../capyloon_gsi_arm64_ab_config.yml | 42 +++ .../capyloon_gsi_full_test_build.yml | 324 ++++++++++++++++++ gsi/full/build.sh | 17 + 3 files changed, 383 insertions(+) create mode 100644 .github/workflows/capyloon_gsi_arm64_ab_config.yml create mode 100644 .github/workflows/capyloon_gsi_full_test_build.yml create mode 100644 gsi/full/build.sh diff --git a/.github/workflows/capyloon_gsi_arm64_ab_config.yml b/.github/workflows/capyloon_gsi_arm64_ab_config.yml new file mode 100644 index 0000000..0748b8d --- /dev/null +++ b/.github/workflows/capyloon_gsi_arm64_ab_config.yml @@ -0,0 +1,42 @@ +name: b2g-gsi-arm64_ab-config +on: + workflow_dispatch: + +# NEED +# 1. secrets.GIT_ACCESS_TOKEN +# 2. secrets.RCLONE +# 3. device_name eg；onyx(oneplus x), bacon(oneplus one), phhgsi_arm64_a(phh's gsi) etc. +# out/device_name +# 4. build_device_tag: eg: full-onyx-eng, full-bacon-userdebug etc. +# gsi-build.sh build_device_tag +# 5. repo_dispatches: https://api.github.com/repos/(you id)/(you repo name)/dispatches +# 6. b2g_source: +# remote soucre address +# for example: +env: + GIT_ACCESS_TOKEN: ${{secrets.GIT_ACCESS_TOKEN}} + device_name: phhgsi_arm64_ab + repo_dispatches: "https://api.github.com/repos/b2g-gsi/build-actions/dispatches" + b2g_source: "https://github.com/capyloon/B2G" + b2g_branch: "master" + build_device_tag: gsi_arm64_ab + device_arch: aarch64-linux-android + actions_branch: b2g_gsi +#onyx +#phhgsi_arm64_a +#phhgsi_arm64_ab +#phhgsi_arm_a +#phhgsi_arm_ab +#RUST_TARGET := armv7-linux-androideabi + +jobs: + config: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v1 + + - name: Action + run: | + ./gsi/init/webhook.sh gsi_b2g_repack + #gsi_b2g_repack gsi_aosp_build gsi_gecko_build gsi_b2g_build gsi_api_daemon_build diff --git a/.github/workflows/capyloon_gsi_full_test_build.yml b/.github/workflows/capyloon_gsi_full_test_build.yml new file mode 100644 index 0000000..c7bc82e --- /dev/null +++ b/.github/workflows/capyloon_gsi_full_test_build.yml @@ -0,0 +1,324 @@ +name: capyloon-gsi-ci +on: + repository_dispatch: + types: + - gsi_b2g_repack + - gsi_aosp_build + # - gsi_gecko_build + - gsi_b2g_build + - gsi_api_daemon_build + +env: + RCLONE: ${{secrets.RCLONE}} + GIT_ACCESS_TOKEN: ${{secrets.GIT_ACCESS_TOKEN}} + gecko_version: ${{github.event.client_payload.gecko_version}} + device_name: ${{github.event.client_payload.device_name}} + device_arch: ${{github.event.client_payload.device_arch}} + build_device_tag: ${{github.event.client_payload.build_device_tag}} + repo_dispatches: ${{github.event.client_payload.repo_dispatches}} + b2g_source: ${{github.event.client_payload.b2g_source}} + b2g_branch: ${{github.event.client_payload.b2g_branch}} + + + systemimage: system.img.xz + outimage: out + out_path: /Volumes/out/B2G + + image: b2g_gsi + sourceimage: b2g_gsi + work: /Volumes/b2g_gsi + out_work: /Volumes/out + remotepath: b2g_gsi_${{github.event.client_payload.device_name}} + actions_branch: ${{github.event.client_payload.actions_branch}} + + +jobs: + repack_aosp: + if: github.event.action == 'gsi_b2g_repack' + runs-on: macos-10.15 + timeout-minutes: 360 + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + ref: ${{ env.actions_branch }} + + - name: Clean system environment + continue-on-error: true + run: | + ./common/init/all_unmount_darwin.sh + + - name: Initialization system environment + run: | + ./common/init/clean_space_darwin.sh + ./common/init/env_darwin.sh + ./common/source/create_sparseimage.sh + + - name: Fetch source + run: | + ./gsi/source/repo_source.sh + + - name: Fix source + continue-on-error: true + run: | + echo Fix source + ./common/source/fix_soucre.sh + ./gsi/source/fix_soucre.sh + + # upload sparseimage to gdrive + - name: Upload Source + run: | + ./common/init/all_unmount_darwin.sh + ./common/source/compress_sourceimage.sh + ./common/source/upload_image.sh + + - name: Start build job + run: | + ./gsi/init/webhook.sh gsi_aosp_build + + aosp_build: + if: github.event.action == 'gsi_aosp_build' || github.event.action == 'gsi_b2g_build' + runs-on: macos-10.15 + timeout-minutes: 360 + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + ref: ${{ env.actions_branch }} + + - name: Initialization system environment + run: | + ./common/init/all_unmount_darwin.sh + ./common/init/clean_space_darwin.sh + ./common/init/env_darwin.sh + ./common/source/download_source_from_gdrive.sh + df -h + + - name: Env + run: | + brew install cpanm + sudo cpan LWP::UserAgent + ./common/source/download_kaios_ndk.sh + + - name: Check The Previous “error.log” + run: | + if [ -d "${work}/B2G/out/error.log" ];then + ls ${work}/out + fi + if [ -d "${work}/B2G/out/error.log" ];then + ls -al ${work}/B2G/out/error* + echo "old error.log:" + cat ${work}/B2G/out/error.log + sudo rm ${work}/B2G/out/error.log + touch ${work}/B2G/out/error.log + fi + + - name: Build + if: github.event.action == 'gsi_aosp_build' + continue-on-error: true + id: build + run: | + df -h + ./gsi/full/build/build.sh + + + # - name: B2G Build - Build Source include Gecko + # if: github.event.action == 'gsi_b2g_build' + # run: | + # df -h + # ./common/build/add_pre_api_daemon.sh + # #### build + # ./gsi/build/build_with_gecko.sh + + + - name: Check Current ”error.log“ Status + id: check + run: | + if [ -s ${work}/B2G/out/error.log ]; then + echo Error! + cat ${work}/B2G/out/error.log + ./common/init/all_unmount_darwin.sh + exit 2 + else + exit 0 + fi + + # - name: Repack b2g-sysroot and api-sysroot + # id: sysroot + # if: github.event.action == 'gsi_aosp_build' && steps.check.conclusion == 'success' && steps.build.outcome == 'success' && steps.build.conclusion == 'success' + # run: | + # cp ./common/build/create-b2g-sysroot.sh ${work}/B2G + # cp ./common/build/create-api_sysroot.sh ${work}/B2G + # pip3 install zstandard + # pip install zstandard + + # echo repack_b2g-sysroot + # ./common/build/repack_b2g-sysroot.sh + # echo repack_api-sysroot + # ./common/build/repack_api-sysroot.sh + # echo Upload b2g-sysroot and api-sysroot + # ./common/source/upload_sysroot.sh + + - name: Updoal systemimage + if: github.event.action == 'gsi_b2g_build' + continue-on-error: true + run: | + ./common/source/upload_systemimage.sh + + - name: Clean system environment + continue-on-error: true + run: | + ./common/init/all_unmount_darwin.sh + + - name: Send "build_gecko" WebHook + if: github.event.action == 'gsi_aosp_build' && steps.check.conclusion == 'success' && steps.build.outcome == 'success' && steps.build.conclusion == 'success' + run: | + ./gsi/init/webhook.sh gsi_gecko_build + + - name: Update Build Source + if: steps.check.conclusion == 'success' && github.event.action == 'gsi_aosp_build' + run: | + ./common/source/upload_out_image.sh + + - name: Send "aosp_build" WebHook Again + if: github.event.action == 'gsi_aosp_build' && steps.build.outcome == 'failure' && steps.build.conclusion == 'success' && steps.check.conclusion == 'success' + run: | + ./gsi/init/webhook.sh gsi_aosp_build + +# gecko_build: +# if: github.event.action == 'gsi_gecko_build' || github.event_name == 'schedule' +# runs-on: ubuntu-18.04 +# timeout-minutes: 360 +# steps: +# - name: Checkout +# uses: actions/checkout@v2 +# with: +# ref: ${{ env.actions_branch }} + +# - name: Initialization system environment +# run: | +# ./common/init/env_linux.sh + +# - name: clean disk +# run: | +# ./common/init/clean_space_linux.sh + +# - uses: hecrj/setup-rust-action@v1 +# with: +# rust-version: stable +# - uses: actions/checkout@master +# - name: Install sccache +# run: cargo install sccache + +# - name: Fetch Source +# run: | +# df -h +# cd ~ +# git clone https://github.com/kaiostech/gecko-b2g -b gonk --depth=1 +# df -h + +# # - uses: actions/checkout@v2 +# # - name: Setup tmate session +# # uses: mxschmitt/action-tmate@v3 + +# - name: Bootstrap Gecko +# run: | +# df -h +# ./common/build/bootstrap_gecko.sh +# ./common/source/download_kaios_ndk.sh +# rustup target add aarch64-linux-android armv7-linux-androideabi thumbv7neon-linux-androideabi + +# - name: Build Gecko +# run: | +# cp ./common/build/build-gecko-srcipt.sh ~/gecko-b2g +# ./common/build/build_gecko.sh + +# - name: Get Gecko Version +# run: | +# cd ~/gecko-b2g +# echo `cat browser/config/version.txt` +# export version=`cat browser/config/version.txt` + +# if [ "$device_arch" == "aarch64-linux-android" ]; then +# TARGET_ARCH=aarch64 +# ARCH_ABI="android" +# else +# TARGET_ARCH=arm +# ARCH_ABI="androideabi" +# fi +# echo "gecko_version=b2g-${version}.en-US.linux-${ARCH_ABI}-${TARGET_ARCH}.tar.bz2" >> $GITHUB_ENV + + +# - name: Upload Artifact +# uses: actions/upload-artifact@master +# with: +# name: ${{ env.gecko_version }} +# path: ~/objdir-gecko/dist/${{ env.gecko_version }} + +# - name: Upload to Gdrive +# run: | +# df -h +# cd ~/objdir-gecko/dist +# rclone copy ${{ env.gecko_version }} itd:ci/${remotepath} +# df -h + +# - name: Send "b2g_api_daemon_build" WebHook +# run: | +# ./gsi/init/webhook.sh gsi_api_daemon_build + + # api-daemon_build: + # if: github.event.action == 'gsi_api_daemon_build' + # runs-on: ubuntu-18.04 + # timeout-minutes: 360 + # steps: + # - name: Checkout + # uses: actions/checkout@v2 + # with: + # ref: ${{ env.actions_branch }} + + # - name: Initialization system environment + # run: | + # df -h + # ./common/init/env_linux.sh + + # - name: Download Source + # run: | + # ./common/source/download_kaios_ndk.sh + # cd ~ + # #### + # rustup target add aarch64-linux-android armv7-linux-androideabi + # rclone copy itd:ci/${remotepath}/api-sysroot.tar.zst ./ + # mkdir ~/.mozbuild/api-sysroot + # tar -C "$HOME/.mozbuild/api-sysroot" -I zstd -x -a -f api-sysroot.tar.zst + # ls ~/.mozbuild/api-sysroot/out + # cd ~ + # git clone https://github.com/kaiostech/api-daemon + # ls -al + + # - name: build Source + # run: | + # #### + # export TARGET_ARCH=${device_arch} + # export BUILD_WITH_NDK_DIR=~/.mozbuild/android-ndk-r20b-canary + # export GONK_DIR=~/.mozbuild/api-sysroot + # export GONK_PRODUCT=${device_name} + # cd ~/api-daemon + # ./update-prebuilts.sh + + # - name: zip Artifact + # run: | + # cd ~ + # zip -r ~/prebuilts.zip ~/api-daemon/prebuilts + # rclone copy ~/prebuilts.zip itd:ci/${remotepath} + # ls -al -h + + # - name: Upload Artifact + # continue-on-error: true + # uses: actions/upload-artifact@master + # with: + # name: prebuilts.zip + # path: ~/prebuilts.zip + + # - name: Send Done Notify && Send "b2g_build" WebHook + # run: | + # ./gsi/init/webhook.sh gsi_b2g_build diff --git a/gsi/full/build.sh b/gsi/full/build.sh new file mode 100644 index 0000000..58883af --- /dev/null +++ b/gsi/full/build.sh @@ -0,0 +1,17 @@ +#!/bin/bash +set -e +df -h +#### +export CCACHE_DIR=~/.ccache +/usr/local/bin/ccache -M 20G +/usr/local/bin/ccache -s +export USE_CCACHE=1 +cd ${work}/B2G +export DISABLE_SOURCES_XML=true +# export PREFERRED_B2G=${work}/b2g-dummy.tar.bz2 +# export USE_PREBUILT_B2G=1 +export SKIP_ABI_CHECKS=true +export ANDROID_NDK="${HOME}/.mozbuild/android-ndk-r21d" +#gsi +gtimeout 245m ./build-gsi.sh ${build_device_tag} systemimage +df -h From c46f1cc651f99a8e92e9c52f3f6e0032fd26f916 Mon Sep 17 00:00:00 2001 From: ittat Date: Tue, 22 Mar 2022 10:03:26 +0800 Subject: [PATCH 094/141] Update capyloon_gsi_arm64_ab_config.yml --- .github/workflows/capyloon_gsi_arm64_ab_config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/capyloon_gsi_arm64_ab_config.yml b/.github/workflows/capyloon_gsi_arm64_ab_config.yml index 0748b8d..3350a58 100644 --- a/.github/workflows/capyloon_gsi_arm64_ab_config.yml +++ b/.github/workflows/capyloon_gsi_arm64_ab_config.yml @@ -1,4 +1,4 @@ -name: b2g-gsi-arm64_ab-config +name: capyloon_gsi_arm64_ab_config on: workflow_dispatch: From 4a12a4e1b8546891945b66f1684b6d60405ff7d6 Mon Sep 17 00:00:00 2001 From: ittat Date: Tue, 22 Mar 2022 12:37:46 +0800 Subject: [PATCH 095/141] Rename gsi/full/build.sh to gsi/full/build/build.sh --- gsi/full/{ => build}/build.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename gsi/full/{ => build}/build.sh (100%) diff --git a/gsi/full/build.sh b/gsi/full/build/build.sh similarity index 100% rename from gsi/full/build.sh rename to gsi/full/build/build.sh From f6f36eafb7b8eb01d0d91d7885f06f1f6be5641f Mon Sep 17 00:00:00 2001 From: ittat Date: Tue, 22 Mar 2022 14:52:36 +0800 Subject: [PATCH 096/141] update --- .../capyloon_gsi_arm64_ab_config.yml | 2 +- .../capyloon_gsi_full_test_build.yml | 37 ++++++++++--------- gsi/full/{build => }/build.sh | 0 3 files changed, 20 insertions(+), 19 deletions(-) rename gsi/full/{build => }/build.sh (100%) diff --git a/.github/workflows/capyloon_gsi_arm64_ab_config.yml b/.github/workflows/capyloon_gsi_arm64_ab_config.yml index 3350a58..462519e 100644 --- a/.github/workflows/capyloon_gsi_arm64_ab_config.yml +++ b/.github/workflows/capyloon_gsi_arm64_ab_config.yml @@ -38,5 +38,5 @@ jobs: - name: Action run: | - ./gsi/init/webhook.sh gsi_b2g_repack + ./gsi/init/webhook.sh capyloon_gsi_b2g_repack #gsi_b2g_repack gsi_aosp_build gsi_gecko_build gsi_b2g_build gsi_api_daemon_build diff --git a/.github/workflows/capyloon_gsi_full_test_build.yml b/.github/workflows/capyloon_gsi_full_test_build.yml index c7bc82e..ef20ccf 100644 --- a/.github/workflows/capyloon_gsi_full_test_build.yml +++ b/.github/workflows/capyloon_gsi_full_test_build.yml @@ -2,11 +2,11 @@ name: capyloon-gsi-ci on: repository_dispatch: types: - - gsi_b2g_repack - - gsi_aosp_build - # - gsi_gecko_build - - gsi_b2g_build - - gsi_api_daemon_build + - capyloon_gsi_b2g_repack + - capyloon_capyloon_gsi_aosp_build + # - capyloon_gsi_gecko_build + - capyloon_gsi_b2g_build + - capyloon_gsi_api_daemon_build env: RCLONE: ${{secrets.RCLONE}} @@ -34,7 +34,7 @@ env: jobs: repack_aosp: - if: github.event.action == 'gsi_b2g_repack' + if: github.event.action == 'capyloon_gsi_b2g_repack' runs-on: macos-10.15 timeout-minutes: 360 steps: @@ -74,10 +74,10 @@ jobs: - name: Start build job run: | - ./gsi/init/webhook.sh gsi_aosp_build + ./gsi/init/webhook.sh capyloon_gsi_aosp_build aosp_build: - if: github.event.action == 'gsi_aosp_build' || github.event.action == 'gsi_b2g_build' + if: github.event.action == 'capyloon_capyloon_gsi_aosp_build' || github.event.action == 'capyloon_gsi_b2g_build' runs-on: macos-10.15 timeout-minutes: 360 steps: @@ -114,12 +114,13 @@ jobs: fi - name: Build - if: github.event.action == 'gsi_aosp_build' + if: github.event.action == 'capyloon_capyloon_gsi_aosp_build' continue-on-error: true id: build run: | df -h - ./gsi/full/build/build.sh + chmod +x ./gsi/full/build.sh + ./gsi/full/build.sh # - name: B2G Build - Build Source include Gecko @@ -145,7 +146,7 @@ jobs: # - name: Repack b2g-sysroot and api-sysroot # id: sysroot - # if: github.event.action == 'gsi_aosp_build' && steps.check.conclusion == 'success' && steps.build.outcome == 'success' && steps.build.conclusion == 'success' + # if: github.event.action == 'capyloon_gsi_aosp_build' && steps.check.conclusion == 'success' && steps.build.outcome == 'success' && steps.build.conclusion == 'success' # run: | # cp ./common/build/create-b2g-sysroot.sh ${work}/B2G # cp ./common/build/create-api_sysroot.sh ${work}/B2G @@ -160,7 +161,7 @@ jobs: # ./common/source/upload_sysroot.sh - name: Updoal systemimage - if: github.event.action == 'gsi_b2g_build' + if: github.event.action == 'capyloon_gsi_b2g_build' continue-on-error: true run: | ./common/source/upload_systemimage.sh @@ -171,22 +172,22 @@ jobs: ./common/init/all_unmount_darwin.sh - name: Send "build_gecko" WebHook - if: github.event.action == 'gsi_aosp_build' && steps.check.conclusion == 'success' && steps.build.outcome == 'success' && steps.build.conclusion == 'success' + if: github.event.action == 'capyloon_gsi_aosp_build' && steps.check.conclusion == 'success' && steps.build.outcome == 'success' && steps.build.conclusion == 'success' run: | - ./gsi/init/webhook.sh gsi_gecko_build + ./gsi/init/webhook.sh capyloon_gsi_gecko_build - name: Update Build Source - if: steps.check.conclusion == 'success' && github.event.action == 'gsi_aosp_build' + if: steps.check.conclusion == 'success' && github.event.action == 'capyloon_gsi_aosp_build' run: | ./common/source/upload_out_image.sh - name: Send "aosp_build" WebHook Again - if: github.event.action == 'gsi_aosp_build' && steps.build.outcome == 'failure' && steps.build.conclusion == 'success' && steps.check.conclusion == 'success' + if: github.event.action == 'capyloon_gsi_aosp_build' && steps.build.outcome == 'failure' && steps.build.conclusion == 'success' && steps.check.conclusion == 'success' run: | - ./gsi/init/webhook.sh gsi_aosp_build + ./gsi/init/webhook.sh capyloon_gsi_aosp_build # gecko_build: -# if: github.event.action == 'gsi_gecko_build' || github.event_name == 'schedule' +# if: github.event.action == 'capyloon_gsi_gecko_build' || github.event_name == 'schedule' # runs-on: ubuntu-18.04 # timeout-minutes: 360 # steps: diff --git a/gsi/full/build/build.sh b/gsi/full/build.sh similarity index 100% rename from gsi/full/build/build.sh rename to gsi/full/build.sh From 6b67cb091bdaf7ac48ba53829fa30b81fc71ba18 Mon Sep 17 00:00:00 2001 From: ittat Date: Tue, 22 Mar 2022 16:05:37 +0800 Subject: [PATCH 097/141] u --- .github/workflows/capyloon_gsi_arm64_ab_config.yml | 2 +- .github/workflows/capyloon_gsi_full_test_build.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/capyloon_gsi_arm64_ab_config.yml b/.github/workflows/capyloon_gsi_arm64_ab_config.yml index 462519e..15f8d4e 100644 --- a/.github/workflows/capyloon_gsi_arm64_ab_config.yml +++ b/.github/workflows/capyloon_gsi_arm64_ab_config.yml @@ -38,5 +38,5 @@ jobs: - name: Action run: | - ./gsi/init/webhook.sh capyloon_gsi_b2g_repack + ./gsi/init/webhook.sh capyloon_gsi_aosp_build #gsi_b2g_repack gsi_aosp_build gsi_gecko_build gsi_b2g_build gsi_api_daemon_build diff --git a/.github/workflows/capyloon_gsi_full_test_build.yml b/.github/workflows/capyloon_gsi_full_test_build.yml index ef20ccf..53e6055 100644 --- a/.github/workflows/capyloon_gsi_full_test_build.yml +++ b/.github/workflows/capyloon_gsi_full_test_build.yml @@ -77,7 +77,7 @@ jobs: ./gsi/init/webhook.sh capyloon_gsi_aosp_build aosp_build: - if: github.event.action == 'capyloon_capyloon_gsi_aosp_build' || github.event.action == 'capyloon_gsi_b2g_build' + if: github.event.action == 'capyloon_gsi_aosp_build' || github.event.action == 'capyloon_gsi_b2g_build' runs-on: macos-10.15 timeout-minutes: 360 steps: @@ -114,7 +114,7 @@ jobs: fi - name: Build - if: github.event.action == 'capyloon_capyloon_gsi_aosp_build' + if: github.event.action == 'capyloon_gsi_aosp_build' continue-on-error: true id: build run: | From 84327b330eb79b96755a02b78de4a499e899e626 Mon Sep 17 00:00:00 2001 From: ittat Date: Tue, 22 Mar 2022 16:09:28 +0800 Subject: [PATCH 098/141] o --- .github/workflows/capyloon_gsi_full_test_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/capyloon_gsi_full_test_build.yml b/.github/workflows/capyloon_gsi_full_test_build.yml index 53e6055..4914756 100644 --- a/.github/workflows/capyloon_gsi_full_test_build.yml +++ b/.github/workflows/capyloon_gsi_full_test_build.yml @@ -3,7 +3,7 @@ on: repository_dispatch: types: - capyloon_gsi_b2g_repack - - capyloon_capyloon_gsi_aosp_build + - capyloon_gsi_aosp_build # - capyloon_gsi_gecko_build - capyloon_gsi_b2g_build - capyloon_gsi_api_daemon_build From d4e58643e7c0812e35539ce9bcbc0895929ced99 Mon Sep 17 00:00:00 2001 From: ittat Date: Wed, 23 Mar 2022 08:07:42 +0800 Subject: [PATCH 099/141] Update capyloon_gsi_full_test_build.yml --- .github/workflows/capyloon_gsi_full_test_build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/capyloon_gsi_full_test_build.yml b/.github/workflows/capyloon_gsi_full_test_build.yml index 4914756..8b56d73 100644 --- a/.github/workflows/capyloon_gsi_full_test_build.yml +++ b/.github/workflows/capyloon_gsi_full_test_build.yml @@ -89,6 +89,8 @@ jobs: - name: Initialization system environment run: | ./common/init/all_unmount_darwin.sh + ./common/build/bootstrap_gecko.sh + ./common/source/download_kaios_ndk.sh ./common/init/clean_space_darwin.sh ./common/init/env_darwin.sh ./common/source/download_source_from_gdrive.sh From 7c7b058d8166fed4046a6874c06488f7edee3dd5 Mon Sep 17 00:00:00 2001 From: ittat Date: Wed, 23 Mar 2022 08:43:18 +0800 Subject: [PATCH 100/141] Update capyloon_gsi_full_test_build.yml --- .github/workflows/capyloon_gsi_full_test_build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/capyloon_gsi_full_test_build.yml b/.github/workflows/capyloon_gsi_full_test_build.yml index 8b56d73..0c9f95c 100644 --- a/.github/workflows/capyloon_gsi_full_test_build.yml +++ b/.github/workflows/capyloon_gsi_full_test_build.yml @@ -89,6 +89,8 @@ jobs: - name: Initialization system environment run: | ./common/init/all_unmount_darwin.sh + brew install mercurial + ./common/build/bootstrap_gecko.sh ./common/source/download_kaios_ndk.sh ./common/init/clean_space_darwin.sh From f9e41c94700a444728582d94d544c69d19009078 Mon Sep 17 00:00:00 2001 From: ittat Date: Thu, 24 Mar 2022 09:41:53 +0800 Subject: [PATCH 101/141] Update capyloon_gsi_full_test_build.yml --- .github/workflows/capyloon_gsi_full_test_build.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/capyloon_gsi_full_test_build.yml b/.github/workflows/capyloon_gsi_full_test_build.yml index 0c9f95c..852cf29 100644 --- a/.github/workflows/capyloon_gsi_full_test_build.yml +++ b/.github/workflows/capyloon_gsi_full_test_build.yml @@ -85,11 +85,15 @@ jobs: uses: actions/checkout@v2 with: ref: ${{ env.actions_branch }} + + - uses: actions/checkout@v2 + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 - name: Initialization system environment run: | ./common/init/all_unmount_darwin.sh - brew install mercurial + #brew install mercurial ./common/build/bootstrap_gecko.sh ./common/source/download_kaios_ndk.sh From e1307693c47bd98ea5d4a6853fa343a2e7e8c01a Mon Sep 17 00:00:00 2001 From: ittat Date: Thu, 24 Mar 2022 10:19:44 +0800 Subject: [PATCH 102/141] Update capyloon_gsi_full_test_build.yml --- .github/workflows/capyloon_gsi_full_test_build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/capyloon_gsi_full_test_build.yml b/.github/workflows/capyloon_gsi_full_test_build.yml index 852cf29..5455344 100644 --- a/.github/workflows/capyloon_gsi_full_test_build.yml +++ b/.github/workflows/capyloon_gsi_full_test_build.yml @@ -86,14 +86,14 @@ jobs: with: ref: ${{ env.actions_branch }} - - uses: actions/checkout@v2 - - name: Setup tmate session - uses: mxschmitt/action-tmate@v3 +# - uses: actions/checkout@v2 +# - name: Setup tmate session +# uses: mxschmitt/action-tmate@v3 - name: Initialization system environment run: | ./common/init/all_unmount_darwin.sh - #brew install mercurial + brew install mercurial ./common/build/bootstrap_gecko.sh ./common/source/download_kaios_ndk.sh From c3fafa5bd2b176030ea9d33ca602cfc42c0caca5 Mon Sep 17 00:00:00 2001 From: ittat Date: Thu, 24 Mar 2022 12:27:45 +0800 Subject: [PATCH 103/141] u --- .github/workflows/capyloon_gsi_full_test_build.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/capyloon_gsi_full_test_build.yml b/.github/workflows/capyloon_gsi_full_test_build.yml index 5455344..4348595 100644 --- a/.github/workflows/capyloon_gsi_full_test_build.yml +++ b/.github/workflows/capyloon_gsi_full_test_build.yml @@ -89,14 +89,17 @@ jobs: # - uses: actions/checkout@v2 # - name: Setup tmate session # uses: mxschmitt/action-tmate@v3 - - - name: Initialization system environment + + + - name: bootstrap_gecko run: | - ./common/init/all_unmount_darwin.sh brew install mercurial - ./common/build/bootstrap_gecko.sh ./common/source/download_kaios_ndk.sh + + - name: Initialization system environment + run: | + ./common/init/all_unmount_darwin.sh ./common/init/clean_space_darwin.sh ./common/init/env_darwin.sh ./common/source/download_source_from_gdrive.sh From 396b028628140bb0412b82c274433599941c684b Mon Sep 17 00:00:00 2001 From: ittat Date: Thu, 24 Mar 2022 21:12:27 +0800 Subject: [PATCH 104/141] Update bootstrap_gecko.sh --- common/build/bootstrap_gecko.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/build/bootstrap_gecko.sh b/common/build/bootstrap_gecko.sh index 4a5c81c..137d969 100755 --- a/common/build/bootstrap_gecko.sh +++ b/common/build/bootstrap_gecko.sh @@ -7,4 +7,4 @@ set -e #export LOCAL_NDK_BASE_URL='ftp://ftp.kaiostech.com/ndk/android-ndk' # ./mach bootstrap --application-choice 'GeckoView/Firefox for Android' wget -q https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozboot/bin/bootstrap.py -O bootstrap.py -echo 4 | python3 bootstrap.py --no-interactive +python3 bootstrap.py --no-interactive --application-choice=mobile_android From b14c61ce4864967228c60c157660c245d83b0c9d Mon Sep 17 00:00:00 2001 From: ittat Date: Thu, 24 Mar 2022 21:55:03 +0800 Subject: [PATCH 105/141] Update capyloon_gsi_full_test_build.yml --- .../workflows/capyloon_gsi_full_test_build.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/capyloon_gsi_full_test_build.yml b/.github/workflows/capyloon_gsi_full_test_build.yml index 4348595..79992ae 100644 --- a/.github/workflows/capyloon_gsi_full_test_build.yml +++ b/.github/workflows/capyloon_gsi_full_test_build.yml @@ -86,16 +86,16 @@ jobs: with: ref: ${{ env.actions_branch }} -# - uses: actions/checkout@v2 -# - name: Setup tmate session -# uses: mxschmitt/action-tmate@v3 + - uses: actions/checkout@v2 + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 - - name: bootstrap_gecko - run: | - brew install mercurial - ./common/build/bootstrap_gecko.sh - ./common/source/download_kaios_ndk.sh +# - name: bootstrap_gecko +# run: | +# brew install mercurial +# ./common/build/bootstrap_gecko.sh +# ./common/source/download_kaios_ndk.sh - name: Initialization system environment run: | From 393cf757e62966893e28ae1323a82ff7e05bbdea Mon Sep 17 00:00:00 2001 From: ittat Date: Fri, 25 Mar 2022 13:06:42 +0800 Subject: [PATCH 106/141] Update capyloon_gsi_full_test_build.yml --- .github/workflows/capyloon_gsi_full_test_build.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/capyloon_gsi_full_test_build.yml b/.github/workflows/capyloon_gsi_full_test_build.yml index 79992ae..61ebd72 100644 --- a/.github/workflows/capyloon_gsi_full_test_build.yml +++ b/.github/workflows/capyloon_gsi_full_test_build.yml @@ -105,6 +105,13 @@ jobs: ./common/source/download_source_from_gdrive.sh df -h + - uses: hecrj/setup-rust-action@v1 + with: + rust-version: stable + - uses: actions/checkout@master + - name: Install sccache + run: cargo install sccache + - name: Env run: | brew install cpanm From 1da37cb6d355d59672b0d40ddaf2f55f53fd7bb8 Mon Sep 17 00:00:00 2001 From: ittat Date: Fri, 25 Mar 2022 21:28:54 +0800 Subject: [PATCH 107/141] u --- .github/workflows/capyloon_gsi_full_test_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/capyloon_gsi_full_test_build.yml b/.github/workflows/capyloon_gsi_full_test_build.yml index 61ebd72..74a9fca 100644 --- a/.github/workflows/capyloon_gsi_full_test_build.yml +++ b/.github/workflows/capyloon_gsi_full_test_build.yml @@ -116,7 +116,7 @@ jobs: run: | brew install cpanm sudo cpan LWP::UserAgent - ./common/source/download_kaios_ndk.sh + # ./common/source/download_kaios_ndk.sh - name: Check The Previous “error.log” run: | From 39627944f580bdfcfaaf2c31ff6b5f2065ec0558 Mon Sep 17 00:00:00 2001 From: ittat Date: Fri, 25 Mar 2022 21:44:19 +0800 Subject: [PATCH 108/141] u --- .../capyloon_gsi_full_test_build.yml | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/capyloon_gsi_full_test_build.yml b/.github/workflows/capyloon_gsi_full_test_build.yml index 74a9fca..5a61591 100644 --- a/.github/workflows/capyloon_gsi_full_test_build.yml +++ b/.github/workflows/capyloon_gsi_full_test_build.yml @@ -86,16 +86,20 @@ jobs: with: ref: ${{ env.actions_branch }} - - uses: actions/checkout@v2 - - name: Setup tmate session - uses: mxschmitt/action-tmate@v3 + # - uses: actions/checkout@v2 + # - name: Setup tmate session + # uses: mxschmitt/action-tmate@v3 -# - name: bootstrap_gecko -# run: | -# brew install mercurial -# ./common/build/bootstrap_gecko.sh -# ./common/source/download_kaios_ndk.sh + - name: bootstrap_gecko + run: | + # brew install mercurial + # ./common/build/bootstrap_gecko.sh + # ./common/source/download_kaios_ndk.sh + git clone https://github.com/mozilla/gecko-dev --depth=1 + cd ./gecko-dev + export MOZBUILD_STATE_PATH=~/.mozbuild + ./mach --no-interactive bootstrap --application-choice=mobile_android - name: Initialization system environment run: | From 489b36281ae11276f944d3ca8976358a5e328953 Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 26 Mar 2022 08:04:51 +0800 Subject: [PATCH 109/141] Update capyloon_gsi_full_test_build.yml --- .github/workflows/capyloon_gsi_full_test_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/capyloon_gsi_full_test_build.yml b/.github/workflows/capyloon_gsi_full_test_build.yml index 5a61591..e98bf08 100644 --- a/.github/workflows/capyloon_gsi_full_test_build.yml +++ b/.github/workflows/capyloon_gsi_full_test_build.yml @@ -99,7 +99,7 @@ jobs: git clone https://github.com/mozilla/gecko-dev --depth=1 cd ./gecko-dev export MOZBUILD_STATE_PATH=~/.mozbuild - ./mach --no-interactive bootstrap --application-choice=mobile_android + A A ｜ ./mach --no-interactive bootstrap --application-choice=mobile_android - name: Initialization system environment run: | From 321b6e6ebf296b6fd7f2429ad0475cb565a575c1 Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 26 Mar 2022 08:14:45 +0800 Subject: [PATCH 110/141] Update capyloon_gsi_full_test_build.yml --- .github/workflows/capyloon_gsi_full_test_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/capyloon_gsi_full_test_build.yml b/.github/workflows/capyloon_gsi_full_test_build.yml index e98bf08..72a9314 100644 --- a/.github/workflows/capyloon_gsi_full_test_build.yml +++ b/.github/workflows/capyloon_gsi_full_test_build.yml @@ -99,7 +99,7 @@ jobs: git clone https://github.com/mozilla/gecko-dev --depth=1 cd ./gecko-dev export MOZBUILD_STATE_PATH=~/.mozbuild - A A ｜ ./mach --no-interactive bootstrap --application-choice=mobile_android + echo A A ｜ ./mach --no-interactive bootstrap --application-choice=mobile_android - name: Initialization system environment run: | From 3f788f50014a98b8ce8804c7a9820b674f4e8d39 Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 26 Mar 2022 08:58:47 +0800 Subject: [PATCH 111/141] Update bootstrap_gecko.sh --- common/build/bootstrap_gecko.sh | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/common/build/bootstrap_gecko.sh b/common/build/bootstrap_gecko.sh index 137d969..c80f7db 100755 --- a/common/build/bootstrap_gecko.sh +++ b/common/build/bootstrap_gecko.sh @@ -6,5 +6,18 @@ set -e # sudo apt update #export LOCAL_NDK_BASE_URL='ftp://ftp.kaiostech.com/ndk/android-ndk' # ./mach bootstrap --application-choice 'GeckoView/Firefox for Android' -wget -q https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozboot/bin/bootstrap.py -O bootstrap.py -python3 bootstrap.py --no-interactive --application-choice=mobile_android +#wget -q https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozboot/bin/bootstrap.py -O bootstrap.py +#python3 bootstrap.py --no-interactive --application-choice=mobile_android +brew install expect +git clone https://github.com/mozilla/gecko-dev --depth=1 +cd ./gecko-dev +export MOZBUILD_STATE_PATH=~/.mozbuild + + +spawn ./mach --no-interactive bootstrap --application-choice=mobile_android + +expect { + "*[A]ll*" {exp_send "All\r";exp_continue} + } +expect eof + From 256300e16069f43a1bfe63c197d5415e19b1d801 Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 26 Mar 2022 08:59:40 +0800 Subject: [PATCH 112/141] Update capyloon_gsi_full_test_build.yml --- .github/workflows/capyloon_gsi_full_test_build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/capyloon_gsi_full_test_build.yml b/.github/workflows/capyloon_gsi_full_test_build.yml index 72a9314..136c600 100644 --- a/.github/workflows/capyloon_gsi_full_test_build.yml +++ b/.github/workflows/capyloon_gsi_full_test_build.yml @@ -94,12 +94,12 @@ jobs: - name: bootstrap_gecko run: | # brew install mercurial - # ./common/build/bootstrap_gecko.sh + ./common/build/bootstrap_gecko.sh # ./common/source/download_kaios_ndk.sh - git clone https://github.com/mozilla/gecko-dev --depth=1 - cd ./gecko-dev - export MOZBUILD_STATE_PATH=~/.mozbuild - echo A A ｜ ./mach --no-interactive bootstrap --application-choice=mobile_android + #git clone https://github.com/mozilla/gecko-dev --depth=1 + #cd ./gecko-dev + #export MOZBUILD_STATE_PATH=~/.mozbuild + #echo A A ｜ ./mach --no-interactive bootstrap --application-choice=mobile_android - name: Initialization system environment run: | From 30da6b47a032c5392b047089212fbf5823b531b3 Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 26 Mar 2022 10:03:39 +0800 Subject: [PATCH 113/141] u --- .github/workflows/capyloon_gsi_full_test_build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/capyloon_gsi_full_test_build.yml b/.github/workflows/capyloon_gsi_full_test_build.yml index 136c600..fa16871 100644 --- a/.github/workflows/capyloon_gsi_full_test_build.yml +++ b/.github/workflows/capyloon_gsi_full_test_build.yml @@ -94,12 +94,12 @@ jobs: - name: bootstrap_gecko run: | # brew install mercurial - ./common/build/bootstrap_gecko.sh + #./common/build/bootstrap_gecko.sh # ./common/source/download_kaios_ndk.sh - #git clone https://github.com/mozilla/gecko-dev --depth=1 - #cd ./gecko-dev - #export MOZBUILD_STATE_PATH=~/.mozbuild - #echo A A ｜ ./mach --no-interactive bootstrap --application-choice=mobile_android + git clone https://github.com/mozilla/gecko-dev --depth=1 + cd ./gecko-dev + export MOZBUILD_STATE_PATH=~/.mozbuild + echo A A | ./mach --no-interactive bootstrap --application-choice=mobile_android - name: Initialization system environment run: | From 8f5342c2a16288062bbfae569fbe0f17cc87cb01 Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 26 Mar 2022 10:17:06 +0800 Subject: [PATCH 114/141] u --- .github/workflows/capyloon_gsi_full_test_build.yml | 5 +++-- common/build/bootstrap_gecko.sh | 8 ++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/capyloon_gsi_full_test_build.yml b/.github/workflows/capyloon_gsi_full_test_build.yml index fa16871..3e9f680 100644 --- a/.github/workflows/capyloon_gsi_full_test_build.yml +++ b/.github/workflows/capyloon_gsi_full_test_build.yml @@ -94,12 +94,13 @@ jobs: - name: bootstrap_gecko run: | # brew install mercurial - #./common/build/bootstrap_gecko.sh # ./common/source/download_kaios_ndk.sh git clone https://github.com/mozilla/gecko-dev --depth=1 cd ./gecko-dev export MOZBUILD_STATE_PATH=~/.mozbuild - echo A A | ./mach --no-interactive bootstrap --application-choice=mobile_android + brew install expect spawn + ./common/build/bootstrap_gecko.sh + # echo A A | ./mach --no-interactive bootstrap --application-choice=mobile_android - name: Initialization system environment run: | diff --git a/common/build/bootstrap_gecko.sh b/common/build/bootstrap_gecko.sh index c80f7db..72971cd 100755 --- a/common/build/bootstrap_gecko.sh +++ b/common/build/bootstrap_gecko.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/expect -f set -e # cd ~/gecko-b2g @@ -8,16 +8,12 @@ set -e # ./mach bootstrap --application-choice 'GeckoView/Firefox for Android' #wget -q https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozboot/bin/bootstrap.py -O bootstrap.py #python3 bootstrap.py --no-interactive --application-choice=mobile_android -brew install expect -git clone https://github.com/mozilla/gecko-dev --depth=1 -cd ./gecko-dev -export MOZBUILD_STATE_PATH=~/.mozbuild spawn ./mach --no-interactive bootstrap --application-choice=mobile_android expect { - "*[A]ll*" {exp_send "All\r";exp_continue} + "*replace android-ndk-r21d/CHANGELOG.md? [y]es, [n]o, [A]ll, [N]one, [r]ename:" {exp_send "A\r";exp_continue} } expect eof From f1e3b7d3039627f66785956a82e858c4104ba504 Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 26 Mar 2022 10:32:20 +0800 Subject: [PATCH 115/141] u --- .github/workflows/capyloon_gsi_full_test_build.yml | 3 +-- common/build/bootstrap_gecko.sh | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/capyloon_gsi_full_test_build.yml b/.github/workflows/capyloon_gsi_full_test_build.yml index 3e9f680..d09d220 100644 --- a/.github/workflows/capyloon_gsi_full_test_build.yml +++ b/.github/workflows/capyloon_gsi_full_test_build.yml @@ -98,8 +98,7 @@ jobs: git clone https://github.com/mozilla/gecko-dev --depth=1 cd ./gecko-dev export MOZBUILD_STATE_PATH=~/.mozbuild - brew install expect spawn - ./common/build/bootstrap_gecko.sh + /usr/bin/expect ./common/build/bootstrap_gecko.sh # echo A A | ./mach --no-interactive bootstrap --application-choice=mobile_android - name: Initialization system environment diff --git a/common/build/bootstrap_gecko.sh b/common/build/bootstrap_gecko.sh index 72971cd..318e19a 100755 --- a/common/build/bootstrap_gecko.sh +++ b/common/build/bootstrap_gecko.sh @@ -1,4 +1,4 @@ -#!/usr/bin/expect -f +#!/usr/bin/expect set -e # cd ~/gecko-b2g @@ -9,7 +9,7 @@ set -e #wget -q https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozboot/bin/bootstrap.py -O bootstrap.py #python3 bootstrap.py --no-interactive --application-choice=mobile_android - +cd ~/gecko-b2g spawn ./mach --no-interactive bootstrap --application-choice=mobile_android expect { From 4698649f3f0fbbf51ffe5217090ca9ecb97e65a6 Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 26 Mar 2022 10:38:08 +0800 Subject: [PATCH 116/141] u --- .github/workflows/capyloon_gsi_full_test_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/capyloon_gsi_full_test_build.yml b/.github/workflows/capyloon_gsi_full_test_build.yml index d09d220..181c57d 100644 --- a/.github/workflows/capyloon_gsi_full_test_build.yml +++ b/.github/workflows/capyloon_gsi_full_test_build.yml @@ -98,7 +98,7 @@ jobs: git clone https://github.com/mozilla/gecko-dev --depth=1 cd ./gecko-dev export MOZBUILD_STATE_PATH=~/.mozbuild - /usr/bin/expect ./common/build/bootstrap_gecko.sh + ./common/build/bootstrap_gecko.sh # echo A A | ./mach --no-interactive bootstrap --application-choice=mobile_android - name: Initialization system environment From cdf01dac0fab3bdb2d6b777eb8588e8fcf1664c1 Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 26 Mar 2022 10:44:26 +0800 Subject: [PATCH 117/141] u --- .github/workflows/capyloon_gsi_full_test_build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/capyloon_gsi_full_test_build.yml b/.github/workflows/capyloon_gsi_full_test_build.yml index 181c57d..2f6a698 100644 --- a/.github/workflows/capyloon_gsi_full_test_build.yml +++ b/.github/workflows/capyloon_gsi_full_test_build.yml @@ -95,10 +95,12 @@ jobs: run: | # brew install mercurial # ./common/source/download_kaios_ndk.sh + cd ~ + cp ./common/build/bootstrap_gecko.sh ./ git clone https://github.com/mozilla/gecko-dev --depth=1 cd ./gecko-dev export MOZBUILD_STATE_PATH=~/.mozbuild - ./common/build/bootstrap_gecko.sh + ~/bootstrap_gecko.sh # echo A A | ./mach --no-interactive bootstrap --application-choice=mobile_android - name: Initialization system environment From 1944c91eb4e63d7c89940733db2d2eb35164f55c Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 26 Mar 2022 10:48:43 +0800 Subject: [PATCH 118/141] u --- .github/workflows/capyloon_gsi_full_test_build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/capyloon_gsi_full_test_build.yml b/.github/workflows/capyloon_gsi_full_test_build.yml index 2f6a698..36343dc 100644 --- a/.github/workflows/capyloon_gsi_full_test_build.yml +++ b/.github/workflows/capyloon_gsi_full_test_build.yml @@ -95,8 +95,7 @@ jobs: run: | # brew install mercurial # ./common/source/download_kaios_ndk.sh - cd ~ - cp ./common/build/bootstrap_gecko.sh ./ + cp ./common/build/bootstrap_gecko.sh ~/ git clone https://github.com/mozilla/gecko-dev --depth=1 cd ./gecko-dev export MOZBUILD_STATE_PATH=~/.mozbuild From 605bdd915cdaee8f3f5bc9011504fcb122decc6b Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 26 Mar 2022 10:53:12 +0800 Subject: [PATCH 119/141] u --- common/build/bootstrap_gecko.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/build/bootstrap_gecko.sh b/common/build/bootstrap_gecko.sh index 318e19a..cdd23eb 100755 --- a/common/build/bootstrap_gecko.sh +++ b/common/build/bootstrap_gecko.sh @@ -1,5 +1,5 @@ #!/usr/bin/expect -set -e + # cd ~/gecko-b2g # export SHELL=/bin/bash From 948f9768b91896ada32cb44d1bbaee1209a95ecd Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 26 Mar 2022 10:58:58 +0800 Subject: [PATCH 120/141] u --- .github/workflows/capyloon_gsi_full_test_build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/capyloon_gsi_full_test_build.yml b/.github/workflows/capyloon_gsi_full_test_build.yml index 36343dc..9233f75 100644 --- a/.github/workflows/capyloon_gsi_full_test_build.yml +++ b/.github/workflows/capyloon_gsi_full_test_build.yml @@ -96,6 +96,7 @@ jobs: # brew install mercurial # ./common/source/download_kaios_ndk.sh cp ./common/build/bootstrap_gecko.sh ~/ + cd ~ git clone https://github.com/mozilla/gecko-dev --depth=1 cd ./gecko-dev export MOZBUILD_STATE_PATH=~/.mozbuild From 8bbea8c8b2fae6ec7388bb8cc98dbf61edc59faf Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 26 Mar 2022 11:05:03 +0800 Subject: [PATCH 121/141] u --- common/build/bootstrap_gecko.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/build/bootstrap_gecko.sh b/common/build/bootstrap_gecko.sh index cdd23eb..0e0a740 100755 --- a/common/build/bootstrap_gecko.sh +++ b/common/build/bootstrap_gecko.sh @@ -9,7 +9,7 @@ #wget -q https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozboot/bin/bootstrap.py -O bootstrap.py #python3 bootstrap.py --no-interactive --application-choice=mobile_android -cd ~/gecko-b2g +cd ~/gecko-dev spawn ./mach --no-interactive bootstrap --application-choice=mobile_android expect { From a01e62864b28f7ddefbc6a39817e6e5343d7b3aa Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 26 Mar 2022 11:11:05 +0800 Subject: [PATCH 122/141] u --- common/build/bootstrap_gecko.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/build/bootstrap_gecko.sh b/common/build/bootstrap_gecko.sh index 0e0a740..4bc6234 100755 --- a/common/build/bootstrap_gecko.sh +++ b/common/build/bootstrap_gecko.sh @@ -13,7 +13,7 @@ cd ~/gecko-dev spawn ./mach --no-interactive bootstrap --application-choice=mobile_android expect { - "*replace android-ndk-r21d/CHANGELOG.md? [y]es, [n]o, [A]ll, [N]one, [r]ename:" {exp_send "A\r";exp_continue} + "*replace android-ndk-r21*" {exp_send "A\r";exp_continue} } expect eof From 1bfaf0f5c1b3591eeeec4b0dda5395f70487715b Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 26 Mar 2022 11:17:57 +0800 Subject: [PATCH 123/141] u --- .../capyloon_gsi_full_test_build.yml | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/capyloon_gsi_full_test_build.yml b/.github/workflows/capyloon_gsi_full_test_build.yml index 9233f75..adec006 100644 --- a/.github/workflows/capyloon_gsi_full_test_build.yml +++ b/.github/workflows/capyloon_gsi_full_test_build.yml @@ -86,22 +86,22 @@ jobs: with: ref: ${{ env.actions_branch }} - # - uses: actions/checkout@v2 - # - name: Setup tmate session - # uses: mxschmitt/action-tmate@v3 + - uses: actions/checkout@v2 + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 - - name: bootstrap_gecko - run: | - # brew install mercurial - # ./common/source/download_kaios_ndk.sh - cp ./common/build/bootstrap_gecko.sh ~/ - cd ~ - git clone https://github.com/mozilla/gecko-dev --depth=1 - cd ./gecko-dev - export MOZBUILD_STATE_PATH=~/.mozbuild - ~/bootstrap_gecko.sh - # echo A A | ./mach --no-interactive bootstrap --application-choice=mobile_android + # - name: bootstrap_gecko + # run: | + # # brew install mercurial + # # ./common/source/download_kaios_ndk.sh + # cp ./common/build/bootstrap_gecko.sh ~/ + # cd ~ + # git clone https://github.com/mozilla/gecko-dev --depth=1 + # cd ./gecko-dev + # export MOZBUILD_STATE_PATH=~/.mozbuild + # ~/bootstrap_gecko.sh + # # echo A A | ./mach --no-interactive bootstrap --application-choice=mobile_android - name: Initialization system environment run: | From ecea80a1b23b26fb3e9991b4ec9d514b6c79f0a4 Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 26 Mar 2022 14:47:59 +0800 Subject: [PATCH 124/141] u --- .../capyloon_gsi_full_test_build.yml | 22 +++++++++---------- common/build/bootstrap_gecko.sh | 9 ++++---- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.github/workflows/capyloon_gsi_full_test_build.yml b/.github/workflows/capyloon_gsi_full_test_build.yml index adec006..f3b8bdf 100644 --- a/.github/workflows/capyloon_gsi_full_test_build.yml +++ b/.github/workflows/capyloon_gsi_full_test_build.yml @@ -91,17 +91,17 @@ jobs: uses: mxschmitt/action-tmate@v3 - # - name: bootstrap_gecko - # run: | - # # brew install mercurial - # # ./common/source/download_kaios_ndk.sh - # cp ./common/build/bootstrap_gecko.sh ~/ - # cd ~ - # git clone https://github.com/mozilla/gecko-dev --depth=1 - # cd ./gecko-dev - # export MOZBUILD_STATE_PATH=~/.mozbuild - # ~/bootstrap_gecko.sh - # # echo A A | ./mach --no-interactive bootstrap --application-choice=mobile_android + - name: bootstrap_gecko + run: | + # brew install mercurial + # ./common/source/download_kaios_ndk.sh + cp ./common/build/bootstrap_gecko.sh ~/ + cd ~ + git clone https://github.com/mozilla/gecko-dev --depth=1 + cd ./gecko-dev + export MOZBUILD_STATE_PATH=~/.mozbuild + ~/bootstrap_gecko.sh + # echo A A | ./mach --no-interactive bootstrap --application-choice=mobile_android - name: Initialization system environment run: | diff --git a/common/build/bootstrap_gecko.sh b/common/build/bootstrap_gecko.sh index 4bc6234..a4bea0b 100755 --- a/common/build/bootstrap_gecko.sh +++ b/common/build/bootstrap_gecko.sh @@ -12,8 +12,9 @@ cd ~/gecko-dev spawn ./mach --no-interactive bootstrap --application-choice=mobile_android -expect { - "*replace android-ndk-r21*" {exp_send "A\r";exp_continue} - } -expect eof + expect "*replace android-ndk-r21*" +send "A\r" + expect "*replace android-ndk-r21*" +send "A\r" +interact From 7c75378eb7197dc9583da6b7724b38d6290b8f07 Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 26 Mar 2022 23:05:14 +0800 Subject: [PATCH 125/141] u --- .../capyloon_gsi_full_test_build.yml | 21 ++++++++++++------- gsi/full/download_kaios_ndk.sh | 12 +++++++++++ 2 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 gsi/full/download_kaios_ndk.sh diff --git a/.github/workflows/capyloon_gsi_full_test_build.yml b/.github/workflows/capyloon_gsi_full_test_build.yml index f3b8bdf..235047c 100644 --- a/.github/workflows/capyloon_gsi_full_test_build.yml +++ b/.github/workflows/capyloon_gsi_full_test_build.yml @@ -85,10 +85,6 @@ jobs: uses: actions/checkout@v2 with: ref: ${{ env.actions_branch }} - - - uses: actions/checkout@v2 - - name: Setup tmate session - uses: mxschmitt/action-tmate@v3 - name: bootstrap_gecko @@ -97,14 +93,25 @@ jobs: # ./common/source/download_kaios_ndk.sh cp ./common/build/bootstrap_gecko.sh ~/ cd ~ - git clone https://github.com/mozilla/gecko-dev --depth=1 + git clone https://github.com/mozilla/gecko-dev --depth=1 -b master cd ./gecko-dev export MOZBUILD_STATE_PATH=~/.mozbuild - ~/bootstrap_gecko.sh - # echo A A | ./mach --no-interactive bootstrap --application-choice=mobile_android + #~/bootstrap_gecko.sh + + + #./mach --no-interactive bootstrap --application-choice=mobile_android + + + + - uses: actions/checkout@v2 + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 + + - name: Initialization system environment run: | + ./gsi/full/download_kaios_ndk.sh ./common/init/all_unmount_darwin.sh ./common/init/clean_space_darwin.sh ./common/init/env_darwin.sh diff --git a/gsi/full/download_kaios_ndk.sh b/gsi/full/download_kaios_ndk.sh new file mode 100644 index 0000000..5d8c86d --- /dev/null +++ b/gsi/full/download_kaios_ndk.sh @@ -0,0 +1,12 @@ +#!/bin/bash +set -e + +cd ~ +# git clone https://github.com/mozilla/gecko-dev -b master --depth=1 +# cd ~/gecko-dev +# ./mach --no-interactive bootstrap --application-choice 'GeckoView/Firefox for Android' +# cd ~ +mkdir ~/old +curl https://packages.preprod.kaiostech.com/ndk/v7/mozbuild.tar.bz2 | tar -C ${HOME}/old -xj +cp -r ~/old/.mozbuild/android-ndk-r21d/toolchains/llvm/prebuilt/linux-x86_64 ~/.mozbuild/android-ndk-r21d/toolchains/llvm/prebuilt + From 668edfa4f4a2b564b85b295fa2e1a5709fe7e6fa Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 26 Mar 2022 23:21:46 +0800 Subject: [PATCH 126/141] u --- .github/workflows/capyloon_gsi_full_test_build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/capyloon_gsi_full_test_build.yml b/.github/workflows/capyloon_gsi_full_test_build.yml index 235047c..b71abe2 100644 --- a/.github/workflows/capyloon_gsi_full_test_build.yml +++ b/.github/workflows/capyloon_gsi_full_test_build.yml @@ -111,6 +111,7 @@ jobs: - name: Initialization system environment run: | + chmod +x ./gsi/full/download_kaios_ndk.sh ./gsi/full/download_kaios_ndk.sh ./common/init/all_unmount_darwin.sh ./common/init/clean_space_darwin.sh From 340e0ecfd98c9709711cdf2f65a45eacfc2907c1 Mon Sep 17 00:00:00 2001 From: ittat Date: Sun, 27 Mar 2022 17:36:52 +0800 Subject: [PATCH 127/141] up --- common/build/build-gecko-srcipt.sh | 39 +++++++++++++----------------- common/build/create-b2g-sysroot.sh | 14 +++++++++++ 2 files changed, 31 insertions(+), 22 deletions(-) diff --git a/common/build/build-gecko-srcipt.sh b/common/build/build-gecko-srcipt.sh index 09aa371..4d3bfc2 100755 --- a/common/build/build-gecko-srcipt.sh +++ b/common/build/build-gecko-srcipt.sh @@ -41,13 +41,6 @@ fi export ANDROID_PLATFORM=android-${PLATFORM_VERSION} -if [ -z ${GET_FRAMEBUFFER_FORMAT_FROM_HWC+x} ]; then - echo "GET_FRAMEBUFFER_FORMAT_FROM_HWC is not set" -else - HWC_DEFINE="-DGET_FRAMEBUFFER_FORMAT_FROM_HWC" - echo "Setting -DGET_FRAMEBUFFER_FORMAT_FROM_HWC" -fi - # When user build, check if the JS shell is available. If not, download it # to make sure we can minify JS code when packaging. if [[ "$VARIANT" == "user" ]];then @@ -121,8 +114,6 @@ export CROSS_TOOLCHAIN_LINKER_PATH=${CROSS_TOOLCHAIN_LINKER_PATH=:-$GONK_PATH/pr export PATH=$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin:$GONK_PATH/prebuilts/linux-x86_64/bin/:$CLANG_PATH:$PYTHON_PATH:$CROSS_TOOLCHAIN_LINKER_PATH:$PATH -SYSROOT=$ANDROID_NDK/platforms/$ANDROID_PLATFORM/$ARCH_DIR/ - export GONK_PRODUCT=$GONK_PRODUCT_NAME # Create the sysroot @@ -136,21 +127,25 @@ if [ -d "koost" ]; then export BUILD_KOOST=1 fi -#rm -rf "${SYSROOT_DEST}/b2g-sysroot" -#taskcluster/scripts/misc/create-b2g-sysroot.sh "${GONK_PATH}" "${SYSROOT_DEST}" - -rustc --version +# Export OEM hook flag since it's used by create-b2g-sysroot.sh for HIDL +if [ "$PRODUCT_MANUFACTURER" == "QUALCOMM" ]; then + export DISABLE_OEMHOOK +else + # OEM hook is only supported on Qualcomm platform + export DISABLE_OEMHOOK=1 +fi -export CFLAGS="-Wno-nullability-completeness" +if [ -z ${B2G_STANDALONE_BUILD+x} ]; then + rm -rf "${SYSROOT_DEST}/b2g-sysroot" + taskcluster/scripts/misc/create-b2g-sysroot.sh "${GONK_PATH}" "${SYSROOT_DEST}" +fi -export CPPFLAGS="-DANDROID -DTARGET_OS_GONK \ --DJE_FORCE_SYNC_COMPARE_AND_SWAP_4=1 \ --D_USING_LIBCXX \ --DGR_GL_USE_NEW_SHADER_SOURCE_SIGNATURE=1 \ --isystem $ANDROID_NDK/platforms/$ANDROID_PLATFORM/$ARCH_DIR/usr/include" +rustc --version export ANDROID_PLATFORM=$ANDROID_PLATFORM +export PRODUCTION_OS_NAME=$PRODUCTION_OS_NAME +# force mach to use system python installation +export MACH_USE_SYSTEM_PYTHON=${MACH_USE_SYSTEM_PYTHON-1} +export MOZ_LINKER= -export LDFLAGS="--sysroot=${SYSROOT}" - -./mach build $@ +./mach build $@ \ No newline at end of file diff --git a/common/build/create-b2g-sysroot.sh b/common/build/create-b2g-sysroot.sh index 3d03116..84414d8 100755 --- a/common/build/create-b2g-sysroot.sh +++ b/common/build/create-b2g-sysroot.sh @@ -113,6 +113,7 @@ out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/libhwbinder.so out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/libmedia_helper.so out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/libmedia_omx.so out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/libmedia.so +out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/libmediadrm.so out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/libmtp.so out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/libnetdbpf.so out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/libstagefright_foundation.so @@ -230,6 +231,19 @@ out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manag copy_to_sysroot "${GENERATED_HIDL_HEADERS}" "include" + +if test -z "$DISABLE_OEMHOOK"; then + # Put HIDL headers and libraries of OEM hook into sysroot + rsync --times --no-relative --copy-links \ + "${src}/out/target/product/${GONK_PRODUCT_NAME}/system/product/lib${BINSUFFIX}/vendor.qti.hardware.radio.qcrilhook@1.0.so" \ + "${dest}/b2g-sysroot/libs/" + rsync --times --no-relative --copy-links -r \ + "${src}/out/soong/.intermediates/vendor/qcom/proprietary/commonsys-intf/telephony/interfaces/hal/qcrilhook/1.0/vendor.qti.hardware.radio.qcrilhook@1.0_genc++_headers/gen/" \ + "${dest}/b2g-sysroot/include/" +else + echo "OEM hook is disabled by DISABLE_OEMHOOK" +fi + if [ ! -z ${BUILD_KOOST+x} ]; then KOOST_FILES="out/soong/.intermediates/gonk-misc/gonk-binder/binder_b2g_connectivity_interface-cpp-source/gen/include From e7889349bada937193142354bf98341daafcae55 Mon Sep 17 00:00:00 2001 From: ittat Date: Sun, 27 Mar 2022 18:47:55 +0800 Subject: [PATCH 128/141] u --- .github/workflows/onyx_b2g_build.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/onyx_b2g_build.yml b/.github/workflows/onyx_b2g_build.yml index e9afaa5..e043a38 100644 --- a/.github/workflows/onyx_b2g_build.yml +++ b/.github/workflows/onyx_b2g_build.yml @@ -98,10 +98,7 @@ jobs: brew install cpanm sudo cpan LWP::UserAgent - cd ~ - curl https://packages.preprod.kaiostech.com/ndk/v4/mozbuild.tar.bz2 -o mozbuild.tar.bz2 - tar -xvf mozbuild.tar.bz2 - sudo rm mozbuild.tar.bz2 + ./common/source/download_kaios_ndk.sh - name: Check The Previous “error.log” run: | From 4d92564e39b7516af8b2171e769cbde19093cc8a Mon Sep 17 00:00:00 2001 From: ittat Date: Sun, 27 Mar 2022 20:29:54 +0800 Subject: [PATCH 129/141] u --- common/build/create-b2g-sysroot.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/common/build/create-b2g-sysroot.sh b/common/build/create-b2g-sysroot.sh index 84414d8..c2ed13f 100755 --- a/common/build/create-b2g-sysroot.sh +++ b/common/build/create-b2g-sysroot.sh @@ -232,17 +232,17 @@ out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manag copy_to_sysroot "${GENERATED_HIDL_HEADERS}" "include" -if test -z "$DISABLE_OEMHOOK"; then - # Put HIDL headers and libraries of OEM hook into sysroot - rsync --times --no-relative --copy-links \ - "${src}/out/target/product/${GONK_PRODUCT_NAME}/system/product/lib${BINSUFFIX}/vendor.qti.hardware.radio.qcrilhook@1.0.so" \ - "${dest}/b2g-sysroot/libs/" - rsync --times --no-relative --copy-links -r \ - "${src}/out/soong/.intermediates/vendor/qcom/proprietary/commonsys-intf/telephony/interfaces/hal/qcrilhook/1.0/vendor.qti.hardware.radio.qcrilhook@1.0_genc++_headers/gen/" \ - "${dest}/b2g-sysroot/include/" -else - echo "OEM hook is disabled by DISABLE_OEMHOOK" -fi +# if test -z "$DISABLE_OEMHOOK"; then +# # Put HIDL headers and libraries of OEM hook into sysroot +# rsync --times --no-relative --copy-links \ +# "${src}/out/target/product/${GONK_PRODUCT_NAME}/system/product/lib${BINSUFFIX}/vendor.qti.hardware.radio.qcrilhook@1.0.so" \ +# "${dest}/b2g-sysroot/libs/" +# rsync --times --no-relative --copy-links -r \ +# "${src}/out/soong/.intermediates/vendor/qcom/proprietary/commonsys-intf/telephony/interfaces/hal/qcrilhook/1.0/vendor.qti.hardware.radio.qcrilhook@1.0_genc++_headers/gen/" \ +# "${dest}/b2g-sysroot/include/" +# else +# echo "OEM hook is disabled by DISABLE_OEMHOOK" +# fi if [ ! -z ${BUILD_KOOST+x} ]; then From d6f04e8c682b3e1ea5c8f39a9584b353b5443e47 Mon Sep 17 00:00:00 2001 From: ittat Date: Mon, 28 Mar 2022 12:56:29 +0800 Subject: [PATCH 130/141] u --- .github/workflows/onyx_b2g_build.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/onyx_b2g_build.yml b/.github/workflows/onyx_b2g_build.yml index e043a38..ef6dc91 100644 --- a/.github/workflows/onyx_b2g_build.yml +++ b/.github/workflows/onyx_b2g_build.yml @@ -223,9 +223,11 @@ jobs: cd ~ git clone https://github.com/kaiostech/gecko-b2g -b gonk #for onyx - cd gecko-b2g - git am ~/44fd8680baef9b9b4538dff707eb1f7328756222.patch - git am ~/cff33e0d3ee242a68f0484cc00cda6ed8c02c5f2.patch + # cd gecko-b2g + # git am ~/44fd8680baef9b9b4538dff707eb1f7328756222.patch + # git am ~/cff33e0d3ee242a68f0484cc00cda6ed8c02c5f2.patch + + #git clone https://github.com/OnePlus-onyx/gecko-b2g-onyx -b onyx --depth=1 df -h From f685ef3adefcf430f7408945b6001365df63327c Mon Sep 17 00:00:00 2001 From: ittat Date: Mon, 28 Mar 2022 12:56:51 +0800 Subject: [PATCH 131/141] u --- .github/workflows/onyx_b2g_config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/onyx_b2g_config.yml b/.github/workflows/onyx_b2g_config.yml index 5a15977..0568c33 100644 --- a/.github/workflows/onyx_b2g_config.yml +++ b/.github/workflows/onyx_b2g_config.yml @@ -32,5 +32,5 @@ jobs: - name: Action run: | - ./onyx/init/webhook.sh onyx_aosp_build + ./onyx/init/webhook.sh onyx_gecko_build #onyx_b2g_repack onyx_aosp_build onyx_gecko_build onyx_b2g_build onyx_api_daemon_build From a7e35289a40d7f184606c59023a9d51d1cd42eec Mon Sep 17 00:00:00 2001 From: ittat Date: Mon, 28 Mar 2022 19:33:07 +0800 Subject: [PATCH 132/141] Update b2g_gsi_arm_ab_config.yml --- .github/workflows/b2g_gsi_arm_ab_config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/b2g_gsi_arm_ab_config.yml b/.github/workflows/b2g_gsi_arm_ab_config.yml index a828dc2..50e078b 100644 --- a/.github/workflows/b2g_gsi_arm_ab_config.yml +++ b/.github/workflows/b2g_gsi_arm_ab_config.yml @@ -38,5 +38,5 @@ jobs: - name: Action run: | - ./gsi/init/webhook.sh gsi_aosp_build + ./gsi/init/webhook.sh gsi_gecko_build #gsi_b2g_repack gsi_aosp_build gsi_gecko_build gsi_b2g_build gsi_api_daemon_build From 469d6a4ffb48795623699af81ab9538ab740fb00 Mon Sep 17 00:00:00 2001 From: ittat Date: Mon, 28 Mar 2022 22:04:28 +0800 Subject: [PATCH 133/141] Update bootstrap_gecko.sh --- common/build/bootstrap_gecko.sh | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/common/build/bootstrap_gecko.sh b/common/build/bootstrap_gecko.sh index a4bea0b..9b752bc 100755 --- a/common/build/bootstrap_gecko.sh +++ b/common/build/bootstrap_gecko.sh @@ -1,20 +1,12 @@ -#!/usr/bin/expect +#!/usr/bin/bash - -# cd ~/gecko-b2g -# export SHELL=/bin/bash -# sudo apt update -#export LOCAL_NDK_BASE_URL='ftp://ftp.kaiostech.com/ndk/android-ndk' +cd ~/gecko-b2g +export SHELL=/bin/bash +sudo apt update +# export LOCAL_NDK_BASE_URL='ftp://ftp.kaiostech.com/ndk/android-ndk' # ./mach bootstrap --application-choice 'GeckoView/Firefox for Android' -#wget -q https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozboot/bin/bootstrap.py -O bootstrap.py -#python3 bootstrap.py --no-interactive --application-choice=mobile_android +wget -q https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozboot/bin/bootstrap.py -O bootstrap.py +python3 bootstrap.py --no-interactive --application-choice=mobile_android -cd ~/gecko-dev -spawn ./mach --no-interactive bootstrap --application-choice=mobile_android - expect "*replace android-ndk-r21*" -send "A\r" - expect "*replace android-ndk-r21*" -send "A\r" -interact From 177e877d83710f462b10dbe06ac640b8c632cb78 Mon Sep 17 00:00:00 2001 From: ittat Date: Mon, 28 Mar 2022 22:20:20 +0800 Subject: [PATCH 134/141] Update bootstrap_gecko.sh --- common/build/bootstrap_gecko.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/build/bootstrap_gecko.sh b/common/build/bootstrap_gecko.sh index 9b752bc..e03715a 100755 --- a/common/build/bootstrap_gecko.sh +++ b/common/build/bootstrap_gecko.sh @@ -1,4 +1,4 @@ -#!/usr/bin/bash +#!/usr/bin/sh cd ~/gecko-b2g export SHELL=/bin/bash From 16b5d6a27c11c97751725c30aa60a8c0d339cef7 Mon Sep 17 00:00:00 2001 From: ittat Date: Mon, 28 Mar 2022 22:58:09 +0800 Subject: [PATCH 135/141] Update bootstrap_gecko.sh --- common/build/bootstrap_gecko.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/build/bootstrap_gecko.sh b/common/build/bootstrap_gecko.sh index e03715a..cdf51c2 100755 --- a/common/build/bootstrap_gecko.sh +++ b/common/build/bootstrap_gecko.sh @@ -1,4 +1,5 @@ -#!/usr/bin/sh +#!/bin/bash +set -e cd ~/gecko-b2g export SHELL=/bin/bash From 80b24c9b041f6fc283c6b61f6f2b7b2957e10c6e Mon Sep 17 00:00:00 2001 From: ittat Date: Mon, 11 Apr 2022 22:37:11 +0800 Subject: [PATCH 136/141] Update download_kaios_ndk.sh --- gsi/full/download_kaios_ndk.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gsi/full/download_kaios_ndk.sh b/gsi/full/download_kaios_ndk.sh index 5d8c86d..bdf8c26 100644 --- a/gsi/full/download_kaios_ndk.sh +++ b/gsi/full/download_kaios_ndk.sh @@ -6,7 +6,14 @@ cd ~ # cd ~/gecko-dev # ./mach --no-interactive bootstrap --application-choice 'GeckoView/Firefox for Android' # cd ~ + + +cd ~/mozbuild +curl https://github.com/b2g-gsi/build-actions/releases/download/ndk-macos/android-ndk-0-darwin-x86_64.tar.bz2 | tar -C ./ -xj + mkdir ~/old curl https://packages.preprod.kaiostech.com/ndk/v7/mozbuild.tar.bz2 | tar -C ${HOME}/old -xj + +https://github.com/b2g-gsi/build-actions/releases/download/ndk-macos/android-ndk-0-darwin-x86_64.tar.bz2 cp -r ~/old/.mozbuild/android-ndk-r21d/toolchains/llvm/prebuilt/linux-x86_64 ~/.mozbuild/android-ndk-r21d/toolchains/llvm/prebuilt From ef2b3a8971bf7cc1d33511f1dc8c3fef8b8a23c8 Mon Sep 17 00:00:00 2001 From: ittat Date: Mon, 11 Apr 2022 23:02:06 +0800 Subject: [PATCH 137/141] Update download_kaios_ndk.sh --- gsi/full/download_kaios_ndk.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gsi/full/download_kaios_ndk.sh b/gsi/full/download_kaios_ndk.sh index bdf8c26..97277ed 100644 --- a/gsi/full/download_kaios_ndk.sh +++ b/gsi/full/download_kaios_ndk.sh @@ -8,7 +8,7 @@ cd ~ # cd ~ -cd ~/mozbuild +cd ~/.mozbuild curl https://github.com/b2g-gsi/build-actions/releases/download/ndk-macos/android-ndk-0-darwin-x86_64.tar.bz2 | tar -C ./ -xj mkdir ~/old From 98c6dbfe590333710ec84a1d8a1e3d7e4e493ed7 Mon Sep 17 00:00:00 2001 From: ittat Date: Mon, 11 Apr 2022 23:23:15 +0800 Subject: [PATCH 138/141] Update download_kaios_ndk.sh --- gsi/full/download_kaios_ndk.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gsi/full/download_kaios_ndk.sh b/gsi/full/download_kaios_ndk.sh index 97277ed..a32416f 100644 --- a/gsi/full/download_kaios_ndk.sh +++ b/gsi/full/download_kaios_ndk.sh @@ -8,8 +8,8 @@ cd ~ # cd ~ -cd ~/.mozbuild -curl https://github.com/b2g-gsi/build-actions/releases/download/ndk-macos/android-ndk-0-darwin-x86_64.tar.bz2 | tar -C ./ -xj +#cd ~/.mozbuild +#curl https://github.com/b2g-gsi/build-actions/releases/download/ndk-macos/android-ndk-0-darwin-x86_64.tar.bz2 | tar -C ./ -xj mkdir ~/old curl https://packages.preprod.kaiostech.com/ndk/v7/mozbuild.tar.bz2 | tar -C ${HOME}/old -xj From 948213729e88f154bf0b5ec968e5f7a299691aec Mon Sep 17 00:00:00 2001 From: ittat Date: Mon, 11 Apr 2022 23:47:26 +0800 Subject: [PATCH 139/141] Update download_kaios_ndk.sh --- gsi/full/download_kaios_ndk.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gsi/full/download_kaios_ndk.sh b/gsi/full/download_kaios_ndk.sh index a32416f..b077adf 100644 --- a/gsi/full/download_kaios_ndk.sh +++ b/gsi/full/download_kaios_ndk.sh @@ -8,8 +8,8 @@ cd ~ # cd ~ -#cd ~/.mozbuild -#curl https://github.com/b2g-gsi/build-actions/releases/download/ndk-macos/android-ndk-0-darwin-x86_64.tar.bz2 | tar -C ./ -xj +cd ~/.mozbuild +wget https://github.com/b2g-gsi/build-actions/releases/download/ndk-macos/android-ndk-0-darwin-x86_64.tar.bz2 | tar -C ./ -xj mkdir ~/old curl https://packages.preprod.kaiostech.com/ndk/v7/mozbuild.tar.bz2 | tar -C ${HOME}/old -xj From add28018e6d811b045676861b8084f63e292261d Mon Sep 17 00:00:00 2001 From: ittat Date: Mon, 11 Apr 2022 23:57:45 +0800 Subject: [PATCH 140/141] Update download_kaios_ndk.sh --- gsi/full/download_kaios_ndk.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gsi/full/download_kaios_ndk.sh b/gsi/full/download_kaios_ndk.sh index b077adf..d247fdc 100644 --- a/gsi/full/download_kaios_ndk.sh +++ b/gsi/full/download_kaios_ndk.sh @@ -9,7 +9,8 @@ cd ~ cd ~/.mozbuild -wget https://github.com/b2g-gsi/build-actions/releases/download/ndk-macos/android-ndk-0-darwin-x86_64.tar.bz2 | tar -C ./ -xj +wget https://github.com/b2g-gsi/build-actions/releases/download/ndk-macos/android-ndk-0-darwin-x86_64.tar.bz2 +tar -zxvf ./android-ndk-0-darwin-x86_64.tar.bz2 mkdir ~/old curl https://packages.preprod.kaiostech.com/ndk/v7/mozbuild.tar.bz2 | tar -C ${HOME}/old -xj From 839c80c327d038c0e4cbc8a726a4f5fcb3ac9f16 Mon Sep 17 00:00:00 2001 From: ittat Date: Tue, 12 Apr 2022 08:09:43 +0800 Subject: [PATCH 141/141] Update download_kaios_ndk.sh --- gsi/full/download_kaios_ndk.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gsi/full/download_kaios_ndk.sh b/gsi/full/download_kaios_ndk.sh index d247fdc..4318b25 100644 --- a/gsi/full/download_kaios_ndk.sh +++ b/gsi/full/download_kaios_ndk.sh @@ -15,6 +15,6 @@ tar -zxvf ./android-ndk-0-darwin-x86_64.tar.bz2 mkdir ~/old curl https://packages.preprod.kaiostech.com/ndk/v7/mozbuild.tar.bz2 | tar -C ${HOME}/old -xj -https://github.com/b2g-gsi/build-actions/releases/download/ndk-macos/android-ndk-0-darwin-x86_64.tar.bz2 +#https://github.com/b2g-gsi/build-actions/releases/download/ndk-macos/android-ndk-0-darwin-x86_64.tar.bz2 cp -r ~/old/.mozbuild/android-ndk-r21d/toolchains/llvm/prebuilt/linux-x86_64 ~/.mozbuild/android-ndk-r21d/toolchains/llvm/prebuilt