Compare commits
37 Commits
v108.0.535
...
master
Author | SHA1 | Date | |
---|---|---|---|
|
813cea7bd5 | ||
|
0c4f152b89 | ||
|
2493688ed2 | ||
|
2e590285d4 | ||
|
248956d7ab | ||
|
7d8f0cc0d5 | ||
|
789763aa43 | ||
|
bfc4344c08 | ||
|
3f88c4057b | ||
|
af699d0a79 | ||
|
e4d8215edc | ||
|
14d985bb11 | ||
|
ec5f36abea | ||
|
d440dfaf35 | ||
|
00ea75681d | ||
|
9d7d84d78f | ||
|
7e8fa5f370 | ||
|
23701f3eb8 | ||
|
9bfaadc2f6 | ||
|
873b33fe1b | ||
|
42a26fd1db | ||
|
b0e084df8e | ||
|
b438ab71d9 | ||
|
6b6e64d2a8 | ||
|
3ed76fc160 | ||
|
eb0447a0b5 | ||
|
dda7cece8f | ||
|
d26cceccdf | ||
|
5c005551b8 | ||
|
4ca3d33584 | ||
|
775ca2f448 | ||
|
1dd51fda9b | ||
|
45836ce3ae | ||
|
e7381936fe | ||
|
c3b8d405e1 | ||
|
5d0b72827e | ||
|
31dd53a306 |
100
.github/workflows/build_bromite_dev.yaml
vendored
100
.github/workflows/build_bromite_dev.yaml
vendored
@ -23,17 +23,17 @@ on:
|
|||||||
required: true
|
required: true
|
||||||
default: 'all'
|
default: 'all'
|
||||||
build:
|
build:
|
||||||
description: 'android arch [arm64/x64]'
|
description: 'android arch [arm64/x64/all]'
|
||||||
required: true
|
required: true
|
||||||
default: 'x64'
|
default: 'all'
|
||||||
type:
|
type:
|
||||||
description: 'runner? [dev/ci]'
|
description: 'runner? [dev/ci]'
|
||||||
required: true
|
required: true
|
||||||
default: 'dev'
|
default: 'ci'
|
||||||
debug:
|
debug:
|
||||||
description: 'debug? [true/false]'
|
description: 'debug? [true/false]'
|
||||||
required: true
|
required: true
|
||||||
default: 'true'
|
default: 'false'
|
||||||
clangd:
|
clangd:
|
||||||
description: 'clangd? [true/false]'
|
description: 'clangd? [true/false]'
|
||||||
required: true
|
required: true
|
||||||
@ -114,14 +114,14 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Building bromite container ${{ env.BROMITE_SHA }}
|
- name: Building bromite container ${{ env.VERSION }}-${{ env.BROMITE_SHA }}
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
IS_PRESENT=$(docker inspect --type=image uazo/bromite:$BROMITE_SHA > /dev/null ; echo $?)
|
IS_PRESENT=$(docker inspect --type=image uazo/bromite:$VERSION-$BROMITE_SHA > /dev/null ; echo $?)
|
||||||
if [ $IS_PRESENT -ne "0" ]; then
|
if [ $IS_PRESENT -ne "0" ]; then
|
||||||
IS_PRESENT=$(docker manifest inspect uazo/bromite:$BROMITE_SHA > /dev/null ; echo $?)
|
IS_PRESENT=$(docker manifest inspect uazo/bromite:$VERSION-$BROMITE_SHA > /dev/null ; echo $?)
|
||||||
if [ $IS_PRESENT -ne "0" ]; then
|
if [ $IS_PRESENT -ne "0" ]; then
|
||||||
DOCKER_BUILDKIT=1 docker build -t uazo/bromite:$BROMITE_SHA --progress plain \
|
DOCKER_BUILDKIT=1 docker build -t uazo/bromite:$VERSION-$BROMITE_SHA --progress plain \
|
||||||
--build-arg BROMITE_SHA=$BROMITE_SHA \
|
--build-arg BROMITE_SHA=$BROMITE_SHA \
|
||||||
--build-arg VERSION=$VERSION \
|
--build-arg VERSION=$VERSION \
|
||||||
--build-arg HTTP_PROXY="$PROXY_ADDR" \
|
--build-arg HTTP_PROXY="$PROXY_ADDR" \
|
||||||
@ -129,15 +129,16 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Building bromite-build container ${{ env.BROMITE_SHA }}
|
- name: Building bromite-build container ${{ env.VERSION }}-${{ env.BROMITE_SHA }}
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
IS_PRESENT=$(docker inspect --type=image uazo/bromite-build:$BROMITE_SHA > /dev/null ; echo $?)
|
IS_PRESENT=$(docker inspect --type=image uazo/bromite-build:$VERSION-$BROMITE_SHA > /dev/null ; echo $?)
|
||||||
if [ $IS_PRESENT -ne "0" ]; then
|
if [ $IS_PRESENT -ne "0" ]; then
|
||||||
IS_PRESENT=$(docker manifest inspect uazo/bromite-build:$BROMITE_SHA > /dev/null ; echo $?)
|
IS_PRESENT=$(docker manifest inspect uazo/bromite-build:$VERSION-$BROMITE_SHA > /dev/null ; echo $?)
|
||||||
if [ $IS_PRESENT -ne "0" ]; then
|
if [ $IS_PRESENT -ne "0" ]; then
|
||||||
DOCKER_BUILDKIT=1 docker build -t uazo/bromite-build:$BROMITE_SHA --progress plain \
|
DOCKER_BUILDKIT=1 docker build -t uazo/bromite-build:$VERSION-$BROMITE_SHA --progress plain \
|
||||||
--build-arg BROMITE_SHA=$BROMITE_SHA \
|
--build-arg BROMITE_SHA=$BROMITE_SHA \
|
||||||
|
--build-arg VERSION=$VERSION \
|
||||||
--build-arg HTTP_PROXY="$PROXY_ADDR" \
|
--build-arg HTTP_PROXY="$PROXY_ADDR" \
|
||||||
--no-cache \
|
--no-cache \
|
||||||
bromite-buildtools/images/bromite-build/.
|
bromite-buildtools/images/bromite-build/.
|
||||||
@ -151,13 +152,13 @@ jobs:
|
|||||||
if [ $IS_PRESENT -eq "0" ]; then
|
if [ $IS_PRESENT -eq "0" ]; then
|
||||||
docker rmi uazo/bromite-build:build
|
docker rmi uazo/bromite-build:build
|
||||||
fi
|
fi
|
||||||
docker tag uazo/bromite-build:$BROMITE_SHA uazo/bromite-build:build
|
docker tag uazo/bromite-build:$VERSION-$BROMITE_SHA uazo/bromite-build:build
|
||||||
|
|
||||||
build:
|
build:
|
||||||
runs-on: ${{ github.event.inputs.type }}
|
runs-on: ${{ github.event.inputs.type }}
|
||||||
needs: check_images
|
needs: check_images
|
||||||
if: success()
|
if: success()
|
||||||
timeout-minutes: 720
|
timeout-minutes: 1200
|
||||||
|
|
||||||
container:
|
container:
|
||||||
image: uazo/bromite-build:build
|
image: uazo/bromite-build:build
|
||||||
@ -171,15 +172,15 @@ jobs:
|
|||||||
KYTHE_ROOT_DIRECTORY: /home/lg/working_dir/chromium/src
|
KYTHE_ROOT_DIRECTORY: /home/lg/working_dir/chromium/src
|
||||||
KYTHE_OUTPUT_DIRECTORY: /home/lg/working_dir/chromium/src/out/bromite/kythe
|
KYTHE_OUTPUT_DIRECTORY: /home/lg/working_dir/chromium/src/out/bromite/kythe
|
||||||
# cross build
|
# cross build
|
||||||
DEPOT_TOOLS_WIN_TOOLCHAIN_BASE_URL: /win_sdk/10.0.20348.0/
|
DEPOT_TOOLS_WIN_TOOLCHAIN_BASE_URL: /win_sdk/10.0.22621.0/
|
||||||
WINDOWSSDKDIR: "/win_sdk/10.0.20348.0/Windows Kits/10/"
|
WINDOWSSDKDIR: "/win_sdk/10.0.22621.0/Windows Kits/10/"
|
||||||
GYP_MSVS_OVERRIDE_PATH: /win_sdk/10.0.20348.0/
|
GYP_MSVS_OVERRIDE_PATH: /win_sdk/10.0.22621.0/
|
||||||
# compile in debug mode
|
# compile in debug mode
|
||||||
TARGET_ISDEBUG: ${{ github.event.inputs.debug }}
|
TARGET_ISDEBUG: ${{ github.event.inputs.debug }}
|
||||||
TARGET_CPU: ${{ github.event.inputs.build }}
|
|
||||||
TARGET_OS: ${{ github.event.inputs.target_os }}
|
TARGET_OS: ${{ github.event.inputs.target_os }}
|
||||||
volumes:
|
volumes:
|
||||||
- /storage/images/android/${{ github.event.inputs.build }}/${{ github.event.inputs.sha }}:/home/lg/working_dir/chromium/src/out/bromite
|
- /storage/images/android/${{ github.event.inputs.sha }}/${{ github.event.inputs.debug }}/arm64:/home/lg/working_dir/chromium/src/out/bromite
|
||||||
|
- /storage/images/android/${{ github.event.inputs.sha }}/${{ github.event.inputs.debug }}/x64:/home/lg/working_dir/chromium/src/out/bromite_x64
|
||||||
- /storage/images/win/x64/${{ github.event.inputs.sha }}:/home/lg/working_dir/chromium/src/out/bromite_win
|
- /storage/images/win/x64/${{ github.event.inputs.sha }}:/home/lg/working_dir/chromium/src/out/bromite_win
|
||||||
- /tmp/proxy:/tmp/proxy
|
- /tmp/proxy:/tmp/proxy
|
||||||
- /win_sdk:/win_sdk
|
- /win_sdk:/win_sdk
|
||||||
@ -206,7 +207,11 @@ jobs:
|
|||||||
test -d chromium/src/out/bromite_win || sudo mkdir -p chromium/src/out/bromite_win && \
|
test -d chromium/src/out/bromite_win || sudo mkdir -p chromium/src/out/bromite_win && \
|
||||||
sudo chown lg chromium/src/out &&
|
sudo chown lg chromium/src/out &&
|
||||||
sudo chown lg chromium/src/out/bromite_win
|
sudo chown lg chromium/src/out/bromite_win
|
||||||
|
|
||||||
|
test -d chromium/src/out/bromite_x64 || sudo mkdir -p chromium/src/out/bromite_x64 && \
|
||||||
|
sudo chown lg chromium/src/out &&
|
||||||
|
sudo chown lg chromium/src/out/bromite_x64
|
||||||
|
|
||||||
# make kythe output directory
|
# make kythe output directory
|
||||||
test -d $KYTHE_OUTPUT_DIRECTORY || mkdir -p $KYTHE_OUTPUT_DIRECTORY
|
test -d $KYTHE_OUTPUT_DIRECTORY || mkdir -p $KYTHE_OUTPUT_DIRECTORY
|
||||||
|
|
||||||
@ -215,15 +220,15 @@ jobs:
|
|||||||
sudo chmod g-rxw /run/user/1000/
|
sudo chmod g-rxw /run/user/1000/
|
||||||
sudo chmod o-rxw /run/user/1000/
|
sudo chmod o-rxw /run/user/1000/
|
||||||
|
|
||||||
- name: Build Bromite Android
|
- name: Build Bromite Android arm64
|
||||||
if: ${{ github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all' }}
|
if: ${{ (github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all') && (github.event.inputs.build == 'arm64' || github.event.inputs.build == 'all') }}
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPACE/depot_tools/:/usr/local/go/bin:$WORKSPACE/mtool/bin:$PATH
|
PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPACE/depot_tools/:/usr/local/go/bin:$WORKSPACE/mtool/bin:$PATH
|
||||||
cd $WORKSPACE/chromium/src
|
cd $WORKSPACE/chromium/src
|
||||||
|
|
||||||
echo "::group::-------- gn gen"
|
echo "::group::-------- gn gen"
|
||||||
gn gen --args="import(\"/home/lg/working_dir/bromite/build/bromite.gn_args\") $(cat ../../build_args.gni) " out/bromite
|
gn gen --args="import(\"/home/lg/working_dir/bromite/build/bromite.gn_args\") $(cat ../../build_args.gni) target_cpu = \"arm64\" " out/bromite
|
||||||
echo "::endgroup::"
|
echo "::endgroup::"
|
||||||
|
|
||||||
echo "::group::-------- gn args"
|
echo "::group::-------- gn args"
|
||||||
@ -235,14 +240,14 @@ jobs:
|
|||||||
|
|
||||||
cp ../../bromite/build/RELEASE out/bromite
|
cp ../../bromite/build/RELEASE out/bromite
|
||||||
|
|
||||||
- name: Get ninja logs Android
|
- name: Get ninja logs Android arm64
|
||||||
if: ${{ github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all' }}
|
if: ${{ (github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all') && (github.event.inputs.build == 'arm64' || github.event.inputs.build == 'all') }}
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
cd $WORKSPACE
|
cd $WORKSPACE
|
||||||
$WORKSPACE/ninjatracing/ninjatracing $WORKSPACE/chromium/src/out/bromite/.ninja_log >$WORKSPACE/chromium/src/out/bromite/ninja_log_trace.json
|
$WORKSPACE/ninjatracing/ninjatracing $WORKSPACE/chromium/src/out/bromite/.ninja_log >$WORKSPACE/chromium/src/out/bromite/ninja_log_trace.json
|
||||||
$WORKSPACE/chromium/src/third_party/catapult/tracing/bin/trace2html $WORKSPACE/chromium/src/out/bromite/ninja_log_trace.json
|
python3 $WORKSPACE/chromium/src/third_party/catapult/tracing/bin/trace2html $WORKSPACE/chromium/src/out/bromite/ninja_log_trace.json
|
||||||
|
|
||||||
- name: Build Bromite Windows
|
- name: Build Bromite Windows
|
||||||
if: ${{ github.event.inputs.target_os == 'win' || github.event.inputs.target_os == 'all' }}
|
if: ${{ github.event.inputs.target_os == 'win' || github.event.inputs.target_os == 'all' }}
|
||||||
shell: bash
|
shell: bash
|
||||||
@ -269,10 +274,39 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
cd $WORKSPACE
|
cd $WORKSPACE
|
||||||
$WORKSPACE/ninjatracing/ninjatracing $WORKSPACE/chromium/src/out/bromite_win/.ninja_log >$WORKSPACE/chromium/src/out/bromite_win/ninja_log_trace.json
|
$WORKSPACE/ninjatracing/ninjatracing $WORKSPACE/chromium/src/out/bromite_win/.ninja_log >$WORKSPACE/chromium/src/out/bromite_win/ninja_log_trace.json
|
||||||
$WORKSPACE/chromium/src/third_party/catapult/tracing/bin/trace2html $WORKSPACE/chromium/src/out/bromite_win/ninja_log_trace.json
|
python3 $WORKSPACE/chromium/src/third_party/catapult/tracing/bin/trace2html $WORKSPACE/chromium/src/out/bromite_win/ninja_log_trace.json
|
||||||
|
|
||||||
- name: Generate breakpad symbols
|
- name: Build Bromite Android x64
|
||||||
if: ${{ github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all' }}
|
if: ${{ (github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all') && (github.event.inputs.build == 'x64' || github.event.inputs.build == 'all') }}
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPACE/depot_tools/:/usr/local/go/bin:$WORKSPACE/mtool/bin:$PATH
|
||||||
|
cd $WORKSPACE/chromium/src
|
||||||
|
|
||||||
|
echo "::group::-------- gn gen"
|
||||||
|
gn gen --args="import(\"/home/lg/working_dir/bromite/build/bromite.gn_args\") $(cat ../../build_args.gni) target_cpu = \"x64\" " out/bromite_x64
|
||||||
|
echo "::endgroup::"
|
||||||
|
|
||||||
|
echo "::group::-------- gn args"
|
||||||
|
gn args out/bromite_x64/ --list --short
|
||||||
|
gn args out/bromite_x64/ --list >out/bromite_x64/gn_list
|
||||||
|
echo "::endgroup::"
|
||||||
|
|
||||||
|
autoninja -C out/bromite_x64 chrome_public_apk
|
||||||
|
|
||||||
|
cp ../../bromite/build/RELEASE out/bromite_x64
|
||||||
|
|
||||||
|
- name: Get ninja logs Android x64
|
||||||
|
if: ${{ (github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all') && (github.event.inputs.build == 'x64' || github.event.inputs.build == 'all') }}
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
cd $WORKSPACE
|
||||||
|
$WORKSPACE/ninjatracing/ninjatracing $WORKSPACE/chromium/src/out/bromite_x64/.ninja_log >$WORKSPACE/chromium/src/out/bromite_x64/ninja_log_trace.json
|
||||||
|
python3 $WORKSPACE/chromium/src/third_party/catapult/tracing/bin/trace2html $WORKSPACE/chromium/src/out/bromite_x64/ninja_log_trace.json
|
||||||
|
|
||||||
|
|
||||||
|
- name: Generate breakpad symbols arm64
|
||||||
|
if: ${{ (github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all') && (github.event.inputs.build == 'arm64' || github.event.inputs.build == 'all') }}
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPACE/depot_tools/:/usr/local/go/bin:$WORKSPACE/mtool/bin:$PATH
|
PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPACE/depot_tools/:/usr/local/go/bin:$WORKSPACE/mtool/bin:$PATH
|
||||||
@ -289,7 +323,7 @@ jobs:
|
|||||||
echo "::endgroup::"
|
echo "::endgroup::"
|
||||||
|
|
||||||
- name: Generate Supersize data
|
- name: Generate Supersize data
|
||||||
if: ${{ github.event.inputs.debug == 'false' && (github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all') }}
|
if: ${{ github.event.inputs.debug == 'false' && (github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all') && (github.event.inputs.build == 'arm64' || github.event.inputs.build == 'all') }}
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPACE/depot_tools/:/usr/local/go/bin:$WORKSPACE/mtool/bin:$PATH
|
PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPACE/depot_tools/:/usr/local/go/bin:$WORKSPACE/mtool/bin:$PATH
|
||||||
@ -298,7 +332,7 @@ jobs:
|
|||||||
tools/binary_size/supersize archive out/bromite/chrome.size --apk-file out/bromite/apks/ChromePublic.apk -v
|
tools/binary_size/supersize archive out/bromite/chrome.size --apk-file out/bromite/apks/ChromePublic.apk -v
|
||||||
|
|
||||||
- name: Generate clangd index
|
- name: Generate clangd index
|
||||||
if: ${{ github.event.inputs.debug == 'true' && github.event.inputs.clangd == 'true' }}
|
if: ${{ github.event.inputs.clangd == 'true' }}
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPACE/depot_tools/:/usr/local/go/bin:$WORKSPACE/mtool/bin:$PATH
|
PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPACE/depot_tools/:/usr/local/go/bin:$WORKSPACE/mtool/bin:$PATH
|
||||||
@ -311,5 +345,3 @@ jobs:
|
|||||||
-t compdb cc cxx objc objcxx >$WORKSPACE/chromium/src/out/clangd/compile_commands.json && \
|
-t compdb cc cxx objc objcxx >$WORKSPACE/chromium/src/out/clangd/compile_commands.json && \
|
||||||
/home/lg/working_dir/clangd_snapshot_20211205/bin/clangd-indexer --executor=all-TUs out/clangd/compile_commands.json >out/bromite/bromite.idx && \
|
/home/lg/working_dir/clangd_snapshot_20211205/bin/clangd-indexer --executor=all-TUs out/clangd/compile_commands.json >out/bromite/bromite.idx && \
|
||||||
rm -rf out/clangd
|
rm -rf out/clangd
|
||||||
|
|
||||||
|
|
||||||
|
49
.github/workflows/release.yaml
vendored
49
.github/workflows/release.yaml
vendored
@ -9,10 +9,6 @@ on:
|
|||||||
description: 'uazo/bromite SHA'
|
description: 'uazo/bromite SHA'
|
||||||
required: true
|
required: true
|
||||||
default: '0a8ff322d6e9d738f7b2fa52618b178081bd100d'
|
default: '0a8ff322d6e9d738f7b2fa52618b178081bd100d'
|
||||||
build:
|
|
||||||
description: 'arch [arm64/x64]'
|
|
||||||
required: true
|
|
||||||
default: 'arm64'
|
|
||||||
type:
|
type:
|
||||||
description: 'runner? [dev/ci]'
|
description: 'runner? [dev/ci]'
|
||||||
required: true
|
required: true
|
||||||
@ -22,14 +18,13 @@ env:
|
|||||||
BROMITE_SHA: ${{ github.event.inputs.sha }}
|
BROMITE_SHA: ${{ github.event.inputs.sha }}
|
||||||
REMOVEDOCKERSUPPORT: true
|
REMOVEDOCKERSUPPORT: true
|
||||||
USELOCALIMAGE: true
|
USELOCALIMAGE: true
|
||||||
GOMAJOBS: 60
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
release:
|
release:
|
||||||
runs-on: ${{ github.event.inputs.type }}
|
runs-on: ${{ github.event.inputs.type }}
|
||||||
env:
|
env:
|
||||||
OUTPUTFILE: /storage/images/android/${{ github.event.inputs.build }}/${{ github.event.inputs.sha }}
|
OUTPUTFILE_ARM64: /storage/images/android/${{ github.event.inputs.sha }}/false/arm64/
|
||||||
APK: ${{ github.event.inputs.build }}_ChromePublic.apk
|
OUTPUTFILE_X64: /storage/images/android/${{ github.event.inputs.sha }}/false/x64/
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Prepare container
|
- name: Prepare container
|
||||||
@ -54,13 +49,13 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
GH=gh_2.18.1_linux_amd64/bin/gh
|
GH=gh_2.18.1_linux_amd64/bin/gh
|
||||||
WINOUT=/storage/images/win/x64/$BROMITE_SHA/
|
WINOUT=/storage/images/win/x64/$BROMITE_SHA/
|
||||||
VERSION=v$(cat ${{ env.OUTPUTFILE }}/RELEASE)-${{ github.event.inputs.build }}
|
VERSION=v$(cat ${{ env.OUTPUTFILE_ARM64 }}/RELEASE)
|
||||||
|
|
||||||
cd bromite
|
cd bromite
|
||||||
|
|
||||||
GH=gh_2.18.1_linux_amd64/bin/gh
|
GH=gh_2.21.1_linux_amd64/bin/gh
|
||||||
wget https://github.com/cli/cli/releases/download/v2.18.1/gh_2.18.1_linux_amd64.tar.gz
|
wget https://github.com/cli/cli/releases/download/v2.21.1/gh_2.21.1_linux_amd64.tar.gz
|
||||||
tar xfz gh_2.18.1_linux_amd64.tar.gz
|
tar xfz gh_2.21.1_linux_amd64.tar.gz
|
||||||
|
|
||||||
echo ${{ secrets.GITHUB_TOKEN }} | $GH auth login --with-token
|
echo ${{ secrets.GITHUB_TOKEN }} | $GH auth login --with-token
|
||||||
|
|
||||||
@ -71,20 +66,25 @@ jobs:
|
|||||||
|
|
||||||
$GH release create $VERSION-$BROMITE_SHA --notes-file note -d
|
$GH release create $VERSION-$BROMITE_SHA --notes-file note -d
|
||||||
|
|
||||||
# android
|
# android arm64
|
||||||
sudo cp ${{ env.OUTPUTFILE }}/apks/ChromePublic.apk ChromePublic.apk
|
sudo cp ${{ env.OUTPUTFILE_ARM64 }}/apks/ChromePublic.apk arm64_ChromePublic.apk
|
||||||
sudo chown runner ChromePublic.apk
|
sudo chown runner arm64_ChromePublic.apk
|
||||||
mv ChromePublic.apk $APK
|
echo Uploading arm64_ChromePublic
|
||||||
echo Uploading $APK
|
$GH release upload $VERSION-$BROMITE_SHA arm64_ChromePublic.apk
|
||||||
$GH release upload $VERSION-$BROMITE_SHA $APK
|
|
||||||
|
# android x64
|
||||||
|
sudo cp ${{ env.OUTPUTFILE_X64 }}/apks/ChromePublic.apk x64_ChromePublic.apk
|
||||||
|
sudo chown runner x64_ChromePublic.apk
|
||||||
|
echo Uploading x64_ChromePublic
|
||||||
|
$GH release upload $VERSION-$BROMITE_SHA x64_ChromePublic.apk
|
||||||
|
|
||||||
echo Uploading chrome.size
|
echo Uploading chrome.size
|
||||||
test $VERSION-$BROMITE_SHA $OUTPUTFILE/chrome.size && \
|
test $VERSION-$BROMITE_SHA $OUTPUTFILE_ARM64/chrome.size && \
|
||||||
$GH release upload $VERSION-$BROMITE_SHA $OUTPUTFILE/chrome.size
|
$GH release upload $VERSION-$BROMITE_SHA $OUTPUTFILE_ARM64/chrome.size
|
||||||
|
|
||||||
echo Uploading arm64_ninja_log_trace.html
|
echo Uploading arm64_ninja_log_trace.html
|
||||||
test $OUTPUTFILE/ninja_log_trace.html && \
|
test $OUTPUTFILE_ARM64/ninja_log_trace.html && \
|
||||||
cp $OUTPUTFILE/ninja_log_trace.html arm64_ninja_log_trace.html && \
|
cp $OUTPUTFILE_ARM64/ninja_log_trace.html arm64_ninja_log_trace.html && \
|
||||||
$GH release upload $VERSION-$BROMITE_SHA arm64_ninja_log_trace.html
|
$GH release upload $VERSION-$BROMITE_SHA arm64_ninja_log_trace.html
|
||||||
|
|
||||||
# windows
|
# windows
|
||||||
@ -98,7 +98,7 @@ jobs:
|
|||||||
cp $WINOUT/chrome_proxy.exe chrome-win/
|
cp $WINOUT/chrome_proxy.exe chrome-win/
|
||||||
cp $WINOUT/chrome_pwa_launcher.exe chrome-win/
|
cp $WINOUT/chrome_pwa_launcher.exe chrome-win/
|
||||||
cp $WINOUT/chrome_wer.dll chrome-win/
|
cp $WINOUT/chrome_wer.dll chrome-win/
|
||||||
cp "/win_sdk/10.0.20348.0/Windows Kits/10/Redist/D3D/x64/d3dcompiler_47.dll" chrome-win/
|
cp "/win_sdk/10.0.22621.0/Windows Kits/10/Redist/D3D/x64/d3dcompiler_47.dll" chrome-win/
|
||||||
cp $WINOUT/elevation_service.exe chrome-win/
|
cp $WINOUT/elevation_service.exe chrome-win/
|
||||||
cp "$WINOUT/First Run" chrome-win/
|
cp "$WINOUT/First Run" chrome-win/
|
||||||
cp $WINOUT/headless_lib_data.pak chrome-win/
|
cp $WINOUT/headless_lib_data.pak chrome-win/
|
||||||
@ -117,6 +117,7 @@ jobs:
|
|||||||
cp $WINOUT/vulkan-1.dll chrome-win/
|
cp $WINOUT/vulkan-1.dll chrome-win/
|
||||||
cp -r $WINOUT/locales chrome-win/locales
|
cp -r $WINOUT/locales chrome-win/locales
|
||||||
|
|
||||||
|
#test chrome-win.zip && rm chrome-win.zip
|
||||||
zip -r chrome-win.zip chrome-win/
|
zip -r chrome-win.zip chrome-win/
|
||||||
|
|
||||||
echo Uploading chrome-win.zip
|
echo Uploading chrome-win.zip
|
||||||
@ -131,4 +132,4 @@ jobs:
|
|||||||
|
|
||||||
$GH release edit $VERSION-$BROMITE_SHA -t $VERSION-$BROMITE_SHA
|
$GH release edit $VERSION-$BROMITE_SHA -t $VERSION-$BROMITE_SHA
|
||||||
$GH release edit $VERSION-$BROMITE_SHA --draft=false
|
$GH release edit $VERSION-$BROMITE_SHA --draft=false
|
||||||
|
|
||||||
|
27
README.md
27
README.md
@ -64,3 +64,30 @@ drwxr-xr-x 3 root root 4096 Oct 5 13:20 'Windows Kits'
|
|||||||
cd bromite-buildtools/images/github-runner/
|
cd bromite-buildtools/images/github-runner/
|
||||||
./start-runner.sh
|
./start-runner.sh
|
||||||
```
|
```
|
||||||
|
|
||||||
|
### Test Android Version
|
||||||
|
|
||||||
|
Simply download latest build on https://github.com/uazo/bromite-buildtools/releases/latest
|
||||||
|
|
||||||
|
### Test Windows Version
|
||||||
|
|
||||||
|
1. Download https://github.com/henrypp/chrlauncher/releases
|
||||||
|
2. Create a `chrlauncher.ini`
|
||||||
|
|
||||||
|
```
|
||||||
|
[chrlauncher]
|
||||||
|
|
||||||
|
# Custom Chromium update URL (string):
|
||||||
|
ChromiumUpdateUrl=https://github.com/uazo/bromite-buildtools/releases/latest/download/updateurl.txt
|
||||||
|
|
||||||
|
# Command line for Chromium (string):
|
||||||
|
# See here: http://peter.sh/experiments/chromium-command-line-switches/
|
||||||
|
ChromiumCommandLine=--user-data-dir=".\User Data" --no-default-browser-check
|
||||||
|
|
||||||
|
# Chromium executable file name (string):
|
||||||
|
ChromiumBinary=chrome.exe
|
||||||
|
|
||||||
|
# Chromium binaries directory (string):
|
||||||
|
# Relative (to chrlauncher directory) or full path (env. variables supported).
|
||||||
|
ChromiumDirectory=.\bin
|
||||||
|
```
|
||||||
|
@ -16,6 +16,11 @@ for patch in $ALLPATCHS_E; do
|
|||||||
if [[ "$PATCH_FILE" == *"Automated-domain-substitution"* ]]; then
|
if [[ "$PATCH_FILE" == *"Automated-domain-substitution"* ]]; then
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
|
PATCH_MESSAGE=$(git -C ~/chromium/src/ show -s $patch)
|
||||||
|
if [[ $PATCH_MESSAGE == *NOEXPORT:* ]] ;
|
||||||
|
then
|
||||||
|
continue
|
||||||
|
fi
|
||||||
if [[ -z "$PATCH_FILE" ]]; then
|
if [[ -z "$PATCH_FILE" ]]; then
|
||||||
PATCH_FILE=00$(git -C ~/chromium/src/ show -s $patch | head -n 5 | tail -n 1 | xargs | tr " " - | tr [:punct:] -).patch
|
PATCH_FILE=00$(git -C ~/chromium/src/ show -s $patch | head -n 5 | tail -n 1 | xargs | tr " " - | tr [:punct:] -).patch
|
||||||
fi
|
fi
|
||||||
|
@ -13,6 +13,13 @@ else
|
|||||||
echo Exporting new $patch ~/bromite/build/patches-new/$PATCH_FILE
|
echo Exporting new $patch ~/bromite/build/patches-new/$PATCH_FILE
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
PATCH_MESSAGE=$(git -C ~/chromium/src/ show -s $patch)
|
||||||
|
if [[ $PATCH_MESSAGE == *NOEXPORT:* ]] ;
|
||||||
|
then
|
||||||
|
echo Request NO export
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
git -C ~/chromium/src/ format-patch -1 --keep-subject --stdout --full-index --zero-commit --no-signature $patch >~/bromite/build/patches-new/$PATCH_FILE
|
git -C ~/chromium/src/ format-patch -1 --keep-subject --stdout --full-index --zero-commit --no-signature $patch >~/bromite/build/patches-new/$PATCH_FILE
|
||||||
echo " exported"
|
echo " exported"
|
||||||
|
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
ARG BROMITE_SHA
|
ARG BROMITE_SHA
|
||||||
|
ARG VERSION
|
||||||
|
|
||||||
FROM uazo/bromite:$BROMITE_SHA
|
FROM uazo/bromite:$VERSION-$BROMITE_SHA
|
||||||
|
|
||||||
ARG HTTP_PROXY
|
ARG HTTP_PROXY
|
||||||
ENV HTTP_PROXY=$HTTP_PROXY
|
ENV HTTP_PROXY=$HTTP_PROXY
|
||||||
|
@ -10,7 +10,8 @@ if(getenv("TARGET_CPU") != "") {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (target_os == "android") {
|
if (target_os == "android") {
|
||||||
enable_kythe_annotations = true
|
target_os = "android" # fix traffic annotation auditor
|
||||||
|
#enable_kythe_annotations = true
|
||||||
chrome_public_manifest_package = "org.bromite.bromite.dev"
|
chrome_public_manifest_package = "org.bromite.bromite.dev"
|
||||||
|
|
||||||
_is_debug_build = getenv("TARGET_ISDEBUG")
|
_is_debug_build = getenv("TARGET_ISDEBUG")
|
||||||
@ -29,13 +30,20 @@ if (target_os == "android") {
|
|||||||
use_cfi_cast = false # disable it
|
use_cfi_cast = false # disable it
|
||||||
} else {
|
} else {
|
||||||
generate_linker_map = true
|
generate_linker_map = true
|
||||||
|
use_relative_vtables_abi = false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (target_os == "win") {
|
if (target_os == "win") {
|
||||||
|
target_os = "win" # fix traffic annotation auditor
|
||||||
target_cpu = "x64"
|
target_cpu = "x64"
|
||||||
symbol_level = 0
|
symbol_level = 0
|
||||||
use_large_pdbs = true
|
use_large_pdbs = true
|
||||||
|
|
||||||
|
enable_pdf = true
|
||||||
|
pdf_is_complete_lib = true
|
||||||
|
enable_plugins = true
|
||||||
|
enable_ppapi = false
|
||||||
|
|
||||||
is_cfi = false # disable it
|
is_cfi = false # disable it
|
||||||
use_cfi_cast = false # disable it
|
use_cfi_cast = false # disable it
|
||||||
|
@ -59,7 +59,7 @@ cd $WORKSPACE/
|
|||||||
git clone https://github.com/ninja-build/ninja.git -b v1.8.2
|
git clone https://github.com/ninja-build/ninja.git -b v1.8.2
|
||||||
cd ninja
|
cd ninja
|
||||||
git apply $WORKSPACE/bromite-buildtools/ninja-one-target-for-compdb.patch
|
git apply $WORKSPACE/bromite-buildtools/ninja-one-target-for-compdb.patch
|
||||||
./configure.py --bootstrap
|
CXX=clang++ ./configure.py --bootstrap
|
||||||
|
|
||||||
echo -e ${RED} -------- download clang indexer ${NC}
|
echo -e ${RED} -------- download clang indexer ${NC}
|
||||||
cd $WORKSPACE/
|
cd $WORKSPACE/
|
||||||
|
@ -33,14 +33,11 @@ USER ${user}
|
|||||||
WORKDIR /home/${user}
|
WORKDIR /home/${user}
|
||||||
|
|
||||||
RUN wget https://raw.githubusercontent.com/chromium/chromium/$VERSION/build/install-build-deps.sh \
|
RUN wget https://raw.githubusercontent.com/chromium/chromium/$VERSION/build/install-build-deps.sh \
|
||||||
&& \
|
|
||||||
wget https://raw.githubusercontent.com/chromium/chromium/$VERSION/build/install-build-deps-android.sh \
|
|
||||||
&& \
|
&& \
|
||||||
sed -i 's/snapcraft/wget/' install-build-deps.sh && \
|
sed -i 's/snapcraft/wget/' install-build-deps.sh && \
|
||||||
chmod +x ./install-build-deps.sh && \
|
chmod +x ./install-build-deps.sh && \
|
||||||
chmod +x ./install-build-deps-android.sh && \
|
|
||||||
sudo ./install-build-deps.sh --no-prompt --lib32 --no-chromeos-fonts && \
|
sudo ./install-build-deps.sh --no-prompt --lib32 --no-chromeos-fonts && \
|
||||||
sudo ./install-build-deps-android.sh --no-prompt && \
|
sudo ./install-build-deps.sh --android --no-prompt --no-chromeos-fonts && \
|
||||||
sudo mkdir -p /github/home/.vscode-server && \
|
sudo mkdir -p /github/home/.vscode-server && \
|
||||||
sudo chown lg /github/home/.vscode-server
|
sudo chown lg /github/home/.vscode-server
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@ RUN apt-get update && \
|
|||||||
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && \
|
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && \
|
||||||
apt-key fingerprint 0EBFCD88 && \
|
apt-key fingerprint 0EBFCD88 && \
|
||||||
add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" && \
|
add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" && \
|
||||||
apt-get update && apt-get install --no-install-recommends -y docker-ce docker-ce-cli containerd.io=1.4.4-1 && \
|
apt-get update && apt-get install --no-install-recommends -y docker-ce docker-ce-cli && \
|
||||||
apt-get clean -y && \
|
apt-get clean -y && \
|
||||||
rm -rf /var/cache/debconf/* /var/lib/apt/lists/* /var/log/* /tmp/* /var/tmp/* \
|
rm -rf /var/cache/debconf/* /var/lib/apt/lists/* /var/log/* /tmp/* /var/tmp/* \
|
||||||
/usr/share/doc/* /usr/share/man/* /usr/share/local/* && \
|
/usr/share/doc/* /usr/share/man/* /usr/share/local/* && \
|
||||||
@ -77,7 +77,7 @@ RUN useradd -m runner \
|
|||||||
|
|
||||||
# Build args
|
# Build args
|
||||||
ARG TARGETPLATFORM=amd64
|
ARG TARGETPLATFORM=amd64
|
||||||
ARG RUNNER_VERSION=2.302.5
|
ARG RUNNER_VERSION=2.303.1
|
||||||
WORKDIR /runner
|
WORKDIR /runner
|
||||||
|
|
||||||
# Runner download supports amd64 as x64
|
# Runner download supports amd64 as x64
|
||||||
@ -109,10 +109,15 @@ RUN chmod +x ./patched/runsvc.sh /usr/local/bin/startup.sh
|
|||||||
|
|
||||||
USER runner
|
USER runner
|
||||||
|
|
||||||
ENV HTTP_PROXY="http://172.18.0.1:8118"
|
RUN wget https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-amd64 && \
|
||||||
ENV HTTPS_PROXY="http://172.18.0.1:8118"
|
mkdir -p /home/runner/.docker/cli-plugins && \
|
||||||
ENV http_proxy="http://172.18.0.1:8118"
|
mv buildx-v0.10.4.linux-amd64 /home/runner/.docker/cli-plugins/docker-buildx && \
|
||||||
ENV https_proxy="http://172.18.0.1:8118"
|
chmod +x /home/runner/.docker/cli-plugins/docker-buildx
|
||||||
|
|
||||||
|
ENV HTTP_PROXY="http://127.0.0.1:8118"
|
||||||
|
ENV HTTPS_PROXY="http://127.0.0.1:8118"
|
||||||
|
ENV http_proxy="http://127.0.0.1:8118"
|
||||||
|
ENV https_proxy="http://127.0.0.1:8118"
|
||||||
COPY docker.default /etc/default/docker
|
COPY docker.default /etc/default/docker
|
||||||
COPY proxy.conf /etc/apt/apt.conf.d/proxy.conf
|
COPY proxy.conf /etc/apt/apt.conf.d/proxy.conf
|
||||||
|
|
||||||
|
@ -1 +1 @@
|
|||||||
Acquire::http::Proxy "http://172.18.0.1:8118";
|
Acquire::http::Proxy "http://127.0.0.1:8118";
|
||||||
|
@ -40,7 +40,7 @@ do
|
|||||||
-v /casefold:/win_sdk \
|
-v /casefold:/win_sdk \
|
||||||
--network none \
|
--network none \
|
||||||
--device=/dev/kvm \
|
--device=/dev/kvm \
|
||||||
uazo/github-runner
|
uazo/github-runner:2.303.2
|
||||||
|
|
||||||
echo "You can stop now"
|
echo "You can stop now"
|
||||||
sleep 5s
|
sleep 5s
|
||||||
|
@ -1,19 +1,13 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
if [[ -z "${DOCKER_SOCK}" ]]; then
|
if [[ -z "${INDEX_VERSION}" ]]; then
|
||||||
echo "Please set DOCKER_SOCK env variable"
|
echo "Please set INDEX_VERSION env variable"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -z "${DEV_CONTAINER}" ]]; then
|
cp /storage/images/android/x64/$INDEX_VERSION/bromite.idx .
|
||||||
echo "Please set DEV_CONTAINER env variable"
|
cp /storage/images/android/x64/$INDEX_VERSION/RELEASE .
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
sudo docker -H $DOCKER_SOCK cp $DEV_CONTAINER:/home/lg/working_dir/chromium/src/out/bromite/bromite.idx .
|
|
||||||
sudo docker -H $DOCKER_SOCK cp $DEV_CONTAINER:/home/lg/working_dir/bromite/build/RELEASE .
|
|
||||||
|
|
||||||
#INDEX_VERSION=$(cat RELEASE)
|
|
||||||
DOCKER_BUILDKIT=1 docker build -t uazo/bromite-remote-index:$INDEX_VERSION \
|
DOCKER_BUILDKIT=1 docker build -t uazo/bromite-remote-index:$INDEX_VERSION \
|
||||||
--progress plain \
|
--progress plain \
|
||||||
--no-cache \
|
--no-cache \
|
||||||
|
@ -73,6 +73,7 @@ index ed004ac8f1fe1a5107db8b1f5c02c4ba957daef4..bbb79da561ddec497863230cd99ffbe9
|
|||||||
+
|
+
|
||||||
int NinjaMain::ToolCompilationDatabase(const Options* options, int argc, char* argv[]) {
|
int NinjaMain::ToolCompilationDatabase(const Options* options, int argc, char* argv[]) {
|
||||||
+ std::vector<Edge*>* edges_to_process = &(state_.edges_);
|
+ std::vector<Edge*>* edges_to_process = &(state_.edges_);
|
||||||
|
+ std::vector<Edge*> user_interested_edges;
|
||||||
+
|
+
|
||||||
+ if (options->user_given_target) {
|
+ if (options->user_given_target) {
|
||||||
+ string err;
|
+ string err;
|
||||||
@ -83,7 +84,6 @@ index ed004ac8f1fe1a5107db8b1f5c02c4ba957daef4..bbb79da561ddec497863230cd99ffbe9
|
|||||||
+ return 1;
|
+ return 1;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ std::vector<Edge*> user_interested_edges;
|
|
||||||
+ if (!GetAllDependentEdges(user_given_target, &user_interested_edges))
|
+ if (!GetAllDependentEdges(user_given_target, &user_interested_edges))
|
||||||
+ return 1;
|
+ return 1;
|
||||||
+ edges_to_process = &user_interested_edges;
|
+ edges_to_process = &user_interested_edges;
|
||||||
|
Loading…
Reference in New Issue
Block a user