Compare commits
113 Commits
v106.0.524
...
master
Author | SHA1 | Date |
---|---|---|
uazo | 813cea7bd5 | |
uazo | 0c4f152b89 | |
uazo | 2493688ed2 | |
uazo | 2e590285d4 | |
uazo | 248956d7ab | |
Carmelo Messina | 7d8f0cc0d5 | |
uazo | 789763aa43 | |
uazo | bfc4344c08 | |
uazo | 3f88c4057b | |
uazo | af699d0a79 | |
uazo | e4d8215edc | |
uazo | 14d985bb11 | |
uazo | ec5f36abea | |
uazo | d440dfaf35 | |
Carmelo Messina | 00ea75681d | |
Carmelo Messina | 9d7d84d78f | |
uazo | 7e8fa5f370 | |
uazo | 23701f3eb8 | |
uazo | 9bfaadc2f6 | |
Carmelo Messina | 873b33fe1b | |
uazo | 42a26fd1db | |
uazo | b0e084df8e | |
uazo | b438ab71d9 | |
uazo | 6b6e64d2a8 | |
uazo | 3ed76fc160 | |
uazo | eb0447a0b5 | |
uazo | dda7cece8f | |
uazo | d26cceccdf | |
uazo | 5c005551b8 | |
uazo | 4ca3d33584 | |
uazo | 775ca2f448 | |
uazo | 1dd51fda9b | |
uazo | 45836ce3ae | |
uazo | e7381936fe | |
uazo | c3b8d405e1 | |
uazo | 5d0b72827e | |
uazo | 31dd53a306 | |
uazo | 0f16965303 | |
uazo | ae23aa6a50 | |
uazo | f8ca8ac409 | |
uazo | e67921d3be | |
uazo | 2ed940ac6b | |
uazo | 8d94379ee0 | |
uazo | 880500e350 | |
uazo | c2d9bd63c6 | |
uazo | 704b14ac14 | |
uazo | 99970aa83e | |
uazo | 2be587466f | |
uazo | e6d5e6dbb0 | |
uazo | 6322e96a90 | |
uazo | c7cfc1326e | |
uazo | 1e70336bec | |
uazo | 652a8977a1 | |
uazo | 7d8ef4250e | |
uazo | 7708decfcc | |
uazo | 46966bdcef | |
uazo | 4ff08df321 | |
uazo | 967b46c94f | |
uazo | 73d719f6db | |
uazo | bf5dbce4be | |
uazo | f3d1b4cc04 | |
uazo | 3d61c83219 | |
uazo | 99fc6289da | |
uazo | 946df3e35d | |
uazo | c4f7fedb9a | |
uazo | 259d916fd8 | |
uazo | a8ed4b9dd2 | |
uazo | 7a79901e2a | |
uazo | d9d39e238b | |
uazo | 312a3dd9cc | |
uazo | 99c7eed766 | |
uazo | 6bf80440e1 | |
uazo | 7686c97268 | |
uazo | a4abb945ef | |
uazo | 5258713cc6 | |
uazo | 8e00d11fc9 | |
uazo | 04c2891f63 | |
uazo | 4923c1bd3d | |
uazo | ce6a6a21bd | |
uazo | 1a36777b32 | |
uazo | dfe7692d80 | |
uazo | e0ae9cdad0 | |
uazo | a713e49b62 | |
uazo | 911e10dec7 | |
uazo | 9b0002223d | |
uazo | b6c627c29f | |
uazo | 405be869fd | |
uazo | aa646fed5d | |
uazo | 960c195a73 | |
uazo | 0622111b34 | |
uazo | ed3fb656cb | |
uazo | 7b14f5ba33 | |
uazo | 4432e3bc3b | |
uazo | 400575271c | |
uazo | eed67c45b1 | |
uazo | f6ceaa75a8 | |
uazo | 2976fd07ff | |
uazo | a880652f08 | |
uazo | ac45d8cb17 | |
uazo | e22b3b9512 | |
uazo | e73b4e3c55 | |
uazo | fd8a710847 | |
uazo | 5bfbb668f4 | |
uazo | 8bccbc8d51 | |
uazo | 6a33b40dc0 | |
uazo | 0500a3879c | |
uazo | c515d1a4dc | |
uazo | a872a2dee8 | |
uazo | fdff032db3 | |
uazo | cf67ee0fea | |
uazo | 60ee49376e | |
uazo | a2f4b53004 | |
uazo | 6ab623651a |
|
@ -3,7 +3,7 @@ permissions:
|
|||
checks: none
|
||||
contents: none
|
||||
deployments: none
|
||||
issues: none
|
||||
issues: write
|
||||
packages: none
|
||||
pull-requests: none
|
||||
repository-projects: none
|
||||
|
@ -18,10 +18,11 @@ on:
|
|||
required: false
|
||||
default: ''
|
||||
schedule:
|
||||
- cron: '0 5 * * *'
|
||||
- cron: '0 1 * * *'
|
||||
|
||||
env:
|
||||
VERSION: ${{ github.event.inputs.version }}
|
||||
NEW_VERSION: ${{ null }}
|
||||
|
||||
name: Builds and pushes tagged image to DockerHub
|
||||
jobs:
|
||||
|
@ -34,9 +35,9 @@ jobs:
|
|||
sudo rm -rf /usr/share/dotnet
|
||||
sudo rm -rf /usr/local/lib/android
|
||||
sudo rm -rf /opt/ghc
|
||||
sudo apt-get remove google-cloud-sdk azure-cli hhvm google-chrome-stable \
|
||||
firefox mysql-server-core-8.0 mono-devel mongodb-org-server podman mongodb-org-mongos \
|
||||
powershell dotnet-runtime-3.1 dotnet-runtime-5.0 dotnet-sdk-3.1 dotnet-sdk-5.0
|
||||
sudo apt-get remove google-cloud-sdk azure-cli google-chrome-stable \
|
||||
firefox mysql-server-core-8.0 mono-devel podman \
|
||||
powershell
|
||||
sudo apt-get autoremove
|
||||
|
||||
- name: Checkout repo
|
||||
|
@ -74,6 +75,7 @@ jobs:
|
|||
bromite-buildtools/images/build-deps/.
|
||||
|
||||
docker push uazo/build-deps:$VERSION
|
||||
echo "NEW_VERSION=$VERSION" >> $GITHUB_ENV
|
||||
fi
|
||||
fi
|
||||
|
||||
|
@ -91,6 +93,21 @@ jobs:
|
|||
bromite-buildtools/images/chr-source/.
|
||||
|
||||
docker push uazo/chromium:$VERSION
|
||||
echo "NEW_VERSION=$VERSION" >> $GITHUB_ENV
|
||||
fi
|
||||
fi
|
||||
|
||||
- name: Create issue ${{ env.VERSION }}
|
||||
if: "${{ env.NEW_VERSION != '' }}"
|
||||
shell: bash
|
||||
run: |
|
||||
GH=../gh_2.18.1_linux_amd64/bin/gh
|
||||
wget https://github.com/cli/cli/releases/download/v2.18.1/gh_2.18.1_linux_amd64.tar.gz
|
||||
tar xfz gh_2.18.1_linux_amd64.tar.gz
|
||||
|
||||
cd bromite-buildtools
|
||||
echo ${{ secrets.GITHUB_TOKEN }} | $GH auth login --with-token
|
||||
$GH issue create -t "$VERSION: new stable chromium version" -b ""
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -23,17 +23,17 @@ on:
|
|||
required: true
|
||||
default: 'all'
|
||||
build:
|
||||
description: 'android arch [arm64/x64]'
|
||||
description: 'android arch [arm64/x64/all]'
|
||||
required: true
|
||||
default: 'x64'
|
||||
default: 'all'
|
||||
type:
|
||||
description: 'runner? [dev/ci]'
|
||||
required: true
|
||||
default: 'dev'
|
||||
default: 'ci'
|
||||
debug:
|
||||
description: 'debug? [true/false]'
|
||||
required: true
|
||||
default: 'true'
|
||||
default: 'false'
|
||||
clangd:
|
||||
description: 'clangd? [true/false]'
|
||||
required: true
|
||||
|
@ -114,14 +114,14 @@ jobs:
|
|||
fi
|
||||
fi
|
||||
|
||||
- name: Building bromite container ${{ env.BROMITE_SHA }}
|
||||
- name: Building bromite container ${{ env.VERSION }}-${{ env.BROMITE_SHA }}
|
||||
shell: bash
|
||||
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
|
||||
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
|
||||
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 VERSION=$VERSION \
|
||||
--build-arg HTTP_PROXY="$PROXY_ADDR" \
|
||||
|
@ -129,15 +129,16 @@ jobs:
|
|||
fi
|
||||
fi
|
||||
|
||||
- name: Building bromite-build container ${{ env.BROMITE_SHA }}
|
||||
- name: Building bromite-build container ${{ env.VERSION }}-${{ env.BROMITE_SHA }}
|
||||
shell: bash
|
||||
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
|
||||
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
|
||||
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 VERSION=$VERSION \
|
||||
--build-arg HTTP_PROXY="$PROXY_ADDR" \
|
||||
--no-cache \
|
||||
bromite-buildtools/images/bromite-build/.
|
||||
|
@ -151,13 +152,13 @@ jobs:
|
|||
if [ $IS_PRESENT -eq "0" ]; then
|
||||
docker rmi uazo/bromite-build:build
|
||||
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:
|
||||
runs-on: ${{ github.event.inputs.type }}
|
||||
needs: check_images
|
||||
if: success()
|
||||
timeout-minutes: 720
|
||||
timeout-minutes: 1200
|
||||
|
||||
container:
|
||||
image: uazo/bromite-build:build
|
||||
|
@ -171,15 +172,15 @@ jobs:
|
|||
KYTHE_ROOT_DIRECTORY: /home/lg/working_dir/chromium/src
|
||||
KYTHE_OUTPUT_DIRECTORY: /home/lg/working_dir/chromium/src/out/bromite/kythe
|
||||
# cross build
|
||||
DEPOT_TOOLS_WIN_TOOLCHAIN_BASE_URL: /win_sdk/10.0.20348.0/
|
||||
WINDOWSSDKDIR: "/win_sdk/10.0.20348.0/Windows Kits/10/"
|
||||
GYP_MSVS_OVERRIDE_PATH: /win_sdk/10.0.20348.0/
|
||||
DEPOT_TOOLS_WIN_TOOLCHAIN_BASE_URL: /win_sdk/10.0.22621.0/
|
||||
WINDOWSSDKDIR: "/win_sdk/10.0.22621.0/Windows Kits/10/"
|
||||
GYP_MSVS_OVERRIDE_PATH: /win_sdk/10.0.22621.0/
|
||||
# compile in debug mode
|
||||
TARGET_ISDEBUG: ${{ github.event.inputs.debug }}
|
||||
TARGET_CPU: ${{ github.event.inputs.build }}
|
||||
TARGET_OS: ${{ github.event.inputs.target_os }}
|
||||
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
|
||||
- /tmp/proxy:/tmp/proxy
|
||||
- /win_sdk:/win_sdk
|
||||
|
@ -206,7 +207,11 @@ jobs:
|
|||
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/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
|
||||
test -d $KYTHE_OUTPUT_DIRECTORY || mkdir -p $KYTHE_OUTPUT_DIRECTORY
|
||||
|
||||
|
@ -215,15 +220,15 @@ jobs:
|
|||
sudo chmod g-rxw /run/user/1000/
|
||||
sudo chmod o-rxw /run/user/1000/
|
||||
|
||||
- name: Build Bromite Android
|
||||
if: ${{ github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all' }}
|
||||
- name: Build Bromite Android 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
|
||||
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) " 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 "::group::-------- gn args"
|
||||
|
@ -235,14 +240,14 @@ jobs:
|
|||
|
||||
cp ../../bromite/build/RELEASE out/bromite
|
||||
|
||||
- name: Get ninja logs Android
|
||||
if: ${{ github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all' }}
|
||||
- name: Get ninja logs Android 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
|
||||
run: |
|
||||
cd $WORKSPACE
|
||||
$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
|
||||
if: ${{ github.event.inputs.target_os == 'win' || github.event.inputs.target_os == 'all' }}
|
||||
shell: bash
|
||||
|
@ -251,7 +256,7 @@ jobs:
|
|||
cd $WORKSPACE/chromium/src
|
||||
|
||||
echo "::group::-------- gn gen"
|
||||
gn gen --args="import(\"/home/lg/working_dir/bromite/build/bromite.gn_args\") target_cpu = \"x64\" target_os = \"win\" $(cat ../../build_args.gni) " out/bromite_win
|
||||
gn gen --args="import(\"/home/lg/working_dir/bromite/build/bromite.gn_args\") target_os = \"win\" $(cat ../../build_args.gni) target_cpu = \"x64\" " out/bromite_win
|
||||
echo "::endgroup::"
|
||||
|
||||
echo "::group::-------- gn args"
|
||||
|
@ -269,10 +274,39 @@ jobs:
|
|||
run: |
|
||||
cd $WORKSPACE
|
||||
$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
|
||||
if: ${{ github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all' }}
|
||||
- name: Build Bromite 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: |
|
||||
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
|
||||
run: |
|
||||
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::"
|
||||
|
||||
- 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
|
||||
run: |
|
||||
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
|
||||
|
||||
- name: Generate clangd index
|
||||
if: ${{ github.event.inputs.debug == 'true' && github.event.inputs.clangd == 'true' }}
|
||||
if: ${{ github.event.inputs.clangd == 'true' }}
|
||||
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
|
||||
|
@ -311,5 +345,3 @@ jobs:
|
|||
-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 && \
|
||||
rm -rf out/clangd
|
||||
|
||||
|
||||
|
|
|
@ -0,0 +1,138 @@
|
|||
name: Check git apply
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
rtag:
|
||||
description: 'uazo/bromite TAG or COMMIT'
|
||||
required: true
|
||||
default: ''
|
||||
branch:
|
||||
description: 'uazo/bromite BRANCH'
|
||||
required: true
|
||||
default: ''
|
||||
|
||||
env:
|
||||
GITHUB_SHA: ${{ github.event.inputs.rtag }}
|
||||
BROMITE_SHA: ${{ github.event.inputs.rtag }}
|
||||
USEINTERNALNETWORK: false # CUSTOM RUNNER: create the docker network as internal
|
||||
REMOVEDOCKERSUPPORT: false # CUSTOM RUNNER: remove sharing of docker socket
|
||||
https_proxy: http://172.18.0.1:8118
|
||||
http_proxy: http://172.18.0.1:8118
|
||||
jobs:
|
||||
get-git-apply:
|
||||
runs-on: ci
|
||||
container:
|
||||
image: uazo/build-deps:latest
|
||||
env:
|
||||
GITHUB_SHA: ${{ github.event.inputs.rtag }}
|
||||
USELOCALIMAGE: true # CUSTOM RUNNER: permit use of local images
|
||||
REMOVEDOCKERSUPPORT: false # CUSTOM RUNNER: remove sharing of docker socket
|
||||
volumes:
|
||||
- /tmp/proxy:/tmp/proxy
|
||||
|
||||
steps:
|
||||
|
||||
- name: Prepare container
|
||||
run: |
|
||||
sudo chown lg /etc/apt/apt.conf.d/proxy.conf
|
||||
sudo chown lg .
|
||||
sudo echo Acquire::http::Proxy \"http://172.18.0.1:8118\"\; >/etc/apt/apt.conf.d/proxy.conf
|
||||
#export HTTPS_PROXY=http://172.18.0.1:8118
|
||||
#export HTTP_PROXY=http://172.18.0.1:8118
|
||||
#export http_proxy=http://172.18.0.1:8118
|
||||
#export https_proxy=http://172.18.0.1:8118
|
||||
|
||||
sudo chmod 777 /__w/_temp
|
||||
|
||||
wget https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
|
||||
sudo dpkg -i packages-microsoft-prod.deb
|
||||
rm packages-microsoft-prod.deb
|
||||
|
||||
sudo apt update
|
||||
sudo apt install -y wget unzip tar sed dos2unix patchutils wiggle curl nano aspnetcore-runtime-6.0
|
||||
|
||||
wget https://github.com/uazo/superpatch/releases/latest/download/SuperPatchUtils.tar.gz
|
||||
tar xfz SuperPatchUtils.tar.gz
|
||||
rm SuperPatchUtils.tar.gz
|
||||
|
||||
git clone https://github.com/uazo/bromite-buildtools
|
||||
|
||||
#wget https://github.com/ericchiang/pup/releases/download/v0.4.0/pup_v0.4.0_linux_amd64.zip
|
||||
#unzip pup_v0.4.0_linux_amd64.zip
|
||||
#rm pup_v0.4.0_linux_amd64.zip
|
||||
#BRANCH=$(curl https://github.com/uazo/bromite/branch_commits/$GITHUB_SHA | ./pup -p li.branch:last-child a text{})
|
||||
|
||||
test -d /github/home/.vscode-server || sudo mkdir /github/home/.vscode-server
|
||||
sudo chown lg /github/home/.vscode-server
|
||||
|
||||
- name: Checkout 'uazo/bromite'
|
||||
uses: actions/checkout@v2
|
||||
with:
|
||||
repository: 'uazo/bromite'
|
||||
ref: ${{ github.event.inputs.rtag }}
|
||||
path: 'bromite'
|
||||
fetch-depth: 1
|
||||
|
||||
- name: Create chromium sources
|
||||
run: |
|
||||
#sleep 2h
|
||||
VERSION=$(cat bromite/build/RELEASE)
|
||||
./bin/SuperPatchUtils bromite $BROMITE_SHA chromium/src
|
||||
|
||||
cd chromium/src
|
||||
git init
|
||||
git config user.email "you@example.com"
|
||||
git config user.name "Your Name"
|
||||
git add .
|
||||
git commit -m $VERSION
|
||||
git tag -a $VERSION -m $VERSION
|
||||
|
||||
- name: Apply patches ${{ github.event.inputs.rtag }}
|
||||
run: |
|
||||
export HOME=$(pwd)
|
||||
cd ~/chromium/src
|
||||
|
||||
export SILENT=true
|
||||
export CGA_REMOTE=true
|
||||
export SKIPAUTOGENERATED=true
|
||||
bash ~/bromite-buildtools/apply-all-patch.sh || sleep 23h || true
|
||||
|
||||
rm -rf ~/bromite/build/patches-new/
|
||||
rm ~/bromite/build/bromite_patches_list_new.txt
|
||||
|
||||
- name: Export patches
|
||||
run: |
|
||||
export HOME=$(pwd)
|
||||
|
||||
cd ~/chromium/src
|
||||
bash ~/bromite-buildtools/export-all-patch.sh
|
||||
|
||||
cd ~/bromite
|
||||
rm -rf build/patches/*
|
||||
mv build/patches-new/* build/patches
|
||||
rm -rf build/patches-new/
|
||||
|
||||
- name: Check differences CHANGES=${{ env.CHANGES }}
|
||||
run: |
|
||||
cd bromite
|
||||
CHANGES=0 && git diff --quiet || CHANGES=1
|
||||
|
||||
if [[ CHANGES -eq 1 ]]; then
|
||||
git add build/patches/*.patch
|
||||
git diff --name-only --staged
|
||||
fi
|
||||
|
||||
- name: Create Pull Request
|
||||
uses: peter-evans/create-pull-request@dcd5fd746d53dd8de555c0f10bca6c35628be47a #v3.12.0
|
||||
with:
|
||||
token: ${{ secrets.BROMITE_PULLS_PAT }}
|
||||
path: bromite
|
||||
base: ${{ github.event.inputs.branch }}
|
||||
add-paths: |
|
||||
build/patches/*.patch
|
||||
commit-message: 'AUTOMATED - git apply results'
|
||||
title: Git apply result for ${{ github.event.inputs.branch }} branch
|
||||
body: ${{ env.MESSAGE }}
|
||||
delete-branch: true
|
||||
branch-suffix: short-commit-hash
|
|
@ -9,10 +9,6 @@ on:
|
|||
description: 'uazo/bromite SHA'
|
||||
required: true
|
||||
default: '0a8ff322d6e9d738f7b2fa52618b178081bd100d'
|
||||
build:
|
||||
description: 'arch [arm64/x64]'
|
||||
required: true
|
||||
default: 'arm64'
|
||||
type:
|
||||
description: 'runner? [dev/ci]'
|
||||
required: true
|
||||
|
@ -22,14 +18,13 @@ env:
|
|||
BROMITE_SHA: ${{ github.event.inputs.sha }}
|
||||
REMOVEDOCKERSUPPORT: true
|
||||
USELOCALIMAGE: true
|
||||
GOMAJOBS: 60
|
||||
|
||||
jobs:
|
||||
release:
|
||||
runs-on: ${{ github.event.inputs.type }}
|
||||
env:
|
||||
OUTPUTFILE: /storage/images/android/${{ github.event.inputs.build }}/${{ github.event.inputs.sha }}
|
||||
APK: ${{ github.event.inputs.build }}_ChromePublic.apk
|
||||
OUTPUTFILE_ARM64: /storage/images/android/${{ github.event.inputs.sha }}/false/arm64/
|
||||
OUTPUTFILE_X64: /storage/images/android/${{ github.event.inputs.sha }}/false/x64/
|
||||
|
||||
steps:
|
||||
- name: Prepare container
|
||||
|
@ -39,8 +34,8 @@ jobs:
|
|||
BRANCH=$(curl https://github.com/uazo/bromite/branch_commits/$BROMITE_SHA | ./pup -p li.branch:last-child a text{} | xargs)
|
||||
echo "BRANCH=$BRANCH" >> $GITHUB_ENV
|
||||
|
||||
wget https://github.com/cli/cli/releases/download/v2.4.0/gh_2.4.0_linux_amd64.tar.gz
|
||||
tar xfz gh_2.4.0_linux_amd64.tar.gz
|
||||
wget https://github.com/cli/cli/releases/download/v2.18.1/gh_2.18.1_linux_amd64.tar.gz
|
||||
tar xfz gh_2.18.1_linux_amd64.tar.gz
|
||||
|
||||
- name: Checkout 'uazo/buildtools'
|
||||
uses: actions/checkout@v2
|
||||
|
@ -49,19 +44,92 @@ jobs:
|
|||
path: 'bromite'
|
||||
fetch-depth: 1
|
||||
|
||||
- name: Copy artifacts
|
||||
shell: bash
|
||||
run: |
|
||||
sudo cp ${{ env.OUTPUTFILE }}/apks/ChromePublic.apk ChromePublic.apk
|
||||
sudo chown runner ChromePublic.apk
|
||||
mv ChromePublic.apk $APK
|
||||
|
||||
- name: Create release
|
||||
shell: bash
|
||||
run: |
|
||||
echo ${{ secrets.GITHUB_TOKEN }} | gh_2.4.0_linux_amd64/bin/gh auth login --with-token
|
||||
|
||||
GH=gh_2.18.1_linux_amd64/bin/gh
|
||||
WINOUT=/storage/images/win/x64/$BROMITE_SHA/
|
||||
VERSION=v$(cat ${{ env.OUTPUTFILE_ARM64 }}/RELEASE)
|
||||
|
||||
cd bromite
|
||||
VERSION=v$(cat ${{ env.OUTPUTFILE }}/RELEASE)-${{ github.event.inputs.build }}
|
||||
../gh_2.4.0_linux_amd64/bin/gh release create $VERSION-$BROMITE_SHA \
|
||||
../$APK --notes "" -p
|
||||
|
||||
GH=gh_2.21.1_linux_amd64/bin/gh
|
||||
wget https://github.com/cli/cli/releases/download/v2.21.1/gh_2.21.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 "\`\`\`" >note
|
||||
echo "this is not the official release of bromite but a test version." >>note
|
||||
echo "you can try it at your own risk." >>note
|
||||
echo "\`\`\`" >>note
|
||||
|
||||
$GH release create $VERSION-$BROMITE_SHA --notes-file note -d
|
||||
|
||||
# android arm64
|
||||
sudo cp ${{ env.OUTPUTFILE_ARM64 }}/apks/ChromePublic.apk arm64_ChromePublic.apk
|
||||
sudo chown runner arm64_ChromePublic.apk
|
||||
echo Uploading arm64_ChromePublic
|
||||
$GH release upload $VERSION-$BROMITE_SHA arm64_ChromePublic.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
|
||||
test $VERSION-$BROMITE_SHA $OUTPUTFILE_ARM64/chrome.size && \
|
||||
$GH release upload $VERSION-$BROMITE_SHA $OUTPUTFILE_ARM64/chrome.size
|
||||
|
||||
echo Uploading arm64_ninja_log_trace.html
|
||||
test $OUTPUTFILE_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
|
||||
|
||||
# windows
|
||||
mkdir chrome-win/
|
||||
cp $WINOUT/*.manifest chrome-win/
|
||||
cp $WINOUT/chrome.dll chrome-win/
|
||||
cp $WINOUT/chrome.exe chrome-win/
|
||||
cp $WINOUT/chrome_100_percent.pak chrome-win/
|
||||
cp $WINOUT/chrome_200_percent.pak chrome-win/
|
||||
cp $WINOUT/chrome_elf.dll chrome-win/
|
||||
cp $WINOUT/chrome_proxy.exe chrome-win/
|
||||
cp $WINOUT/chrome_pwa_launcher.exe chrome-win/
|
||||
cp $WINOUT/chrome_wer.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/First Run" chrome-win/
|
||||
cp $WINOUT/headless_lib_data.pak chrome-win/
|
||||
cp $WINOUT/icudtl.dat chrome-win/
|
||||
cp $WINOUT/libEGL.dll chrome-win/
|
||||
cp $WINOUT/libGLESv2.dll chrome-win/
|
||||
cp $WINOUT/Logo.png chrome-win/
|
||||
cp $WINOUT/mojo_core.dll chrome-win/
|
||||
cp $WINOUT/notification_helper.exe chrome-win/
|
||||
cp $WINOUT/resources.pak chrome-win/
|
||||
cp $WINOUT/SmallLogo.png chrome-win/
|
||||
cp $WINOUT/snapshot_blob.bin chrome-win/
|
||||
cp $WINOUT/VkICD_mock_icd.dll chrome-win/
|
||||
cp $WINOUT/VkLayer_khronos_validation.dll chrome-win/
|
||||
cp $WINOUT/vk_swiftshader.dll chrome-win/
|
||||
cp $WINOUT/vulkan-1.dll chrome-win/
|
||||
cp -r $WINOUT/locales chrome-win/locales
|
||||
|
||||
#test chrome-win.zip && rm chrome-win.zip
|
||||
zip -r chrome-win.zip chrome-win/
|
||||
|
||||
echo Uploading chrome-win.zip
|
||||
$GH release upload $VERSION-$BROMITE_SHA chrome-win.zip
|
||||
|
||||
# workaround for https://github.com/cli/cli/issues/6599
|
||||
sleep 30s
|
||||
|
||||
TIMESTAMP=$(date +%s -r chrome-win.zip)
|
||||
echo >updateurl.txt "browser=chromium;os=windows;architecture=64-bit;timestamp=$TIMESTAMP;editor=uazo;channel=stable;repository=https://github.com/uazo/bromite-buildtools/releases;download=https://github.com/uazo/bromite-buildtools/releases/latest/download/chrome-win.zip;version=$(cat $WINOUT/RELEASE);revision=1;commit=$BROMITE_SHA"
|
||||
$GH release upload $VERSION-$BROMITE_SHA updateurl.txt
|
||||
|
||||
$GH release edit $VERSION-$BROMITE_SHA -t $VERSION-$BROMITE_SHA
|
||||
$GH release edit $VERSION-$BROMITE_SHA --draft=false
|
||||
|
||||
|
|
53
README.md
53
README.md
|
@ -35,8 +35,59 @@ RUNNER_LABELS=dev
|
|||
ALLOWEDAUTHORSLIST=uazo
|
||||
```
|
||||
|
||||
5. Start the runner
|
||||
5. Prepare for windows cross build
|
||||
Follow the [instructions](https://chromium.googlesource.com/chromium/src.git/+/HEAD/docs/win_cross.md#if-you_re-not-at-google) to create the zip with the toolchain
|
||||
|
||||
example:
|
||||
```
|
||||
cd path\to\depot_tools\win_toolchain
|
||||
D:\Downloads\depot_tools\win_toolchain> package_from_installed.py --allow_multiple_vs_installs -w 10.0.20348.0 2019
|
||||
```
|
||||
|
||||
create the `/casefold` in the unix host with [casefold attribute](https://unix.stackexchange.com/questions/558977/how-to-enable-new-in-kernel-5-2-case-insensitivity-for-ext4-on-a-given-directory) and unzip the contents into.
|
||||
```
|
||||
~$ ls /casefold/10.0.20348.0/ -la
|
||||
total 36
|
||||
drwxr-xr-x 8 root root 4096 Oct 5 13:20 .
|
||||
drwxr-xr-x 5 root root 4096 Oct 5 13:17 ..
|
||||
drwxr-xr-x 6 root root 4096 Oct 5 13:19 'DIA SDK'
|
||||
drwxr-xr-x 2 root root 4096 Oct 5 13:20 sys32
|
||||
drwxr-xr-x 2 root root 4096 Oct 5 13:20 sys64
|
||||
drwxr-xr-x 2 root root 4096 Oct 5 13:20 sysarm64
|
||||
drwxr-xr-x 5 root root 4096 Oct 5 13:20 VC
|
||||
-rw-rw-rw- 1 root root 5 Sep 26 17:05 VS_VERSION
|
||||
drwxr-xr-x 3 root root 4096 Oct 5 13:20 'Windows Kits'
|
||||
```
|
||||
|
||||
6. Start the runner
|
||||
```
|
||||
cd bromite-buildtools/images/github-runner/
|
||||
./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
|
||||
continue
|
||||
fi
|
||||
PATCH_MESSAGE=$(git -C ~/chromium/src/ show -s $patch)
|
||||
if [[ $PATCH_MESSAGE == *NOEXPORT:* ]] ;
|
||||
then
|
||||
continue
|
||||
fi
|
||||
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
|
||||
fi
|
||||
|
|
|
@ -13,6 +13,13 @@ else
|
|||
echo Exporting new $patch ~/bromite/build/patches-new/$PATCH_FILE
|
||||
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
|
||||
echo " exported"
|
||||
|
||||
|
|
|
@ -1,6 +1,12 @@
|
|||
ARG BROMITE_SHA
|
||||
ARG VERSION
|
||||
|
||||
FROM uazo/bromite:$BROMITE_SHA
|
||||
FROM uazo/bromite:$VERSION-$BROMITE_SHA
|
||||
|
||||
ARG HTTP_PROXY
|
||||
ENV HTTP_PROXY=$HTTP_PROXY
|
||||
ENV HTTPS_PROXY=$HTTP_PROXY
|
||||
ENV https_proxy=$HTTP_PROXY
|
||||
|
||||
USER lg
|
||||
WORKDIR /home/lg/working_dir
|
||||
|
|
|
@ -3,46 +3,48 @@ declare_args() {
|
|||
_is_debug_build = ""
|
||||
}
|
||||
|
||||
_is_debug_build = getenv("TARGET_ISDEBUG")
|
||||
|
||||
not_needed(["_target_build", "_is_debug_build"])
|
||||
|
||||
if(getenv("TARGET_CPU") != "") {
|
||||
target_cpu = getenv("TARGET_CPU")
|
||||
}
|
||||
# print("Target " + target_cpu)
|
||||
|
||||
enable_kythe_annotations = true
|
||||
# clang_use_chrome_plugins = false
|
||||
if (target_os == "android") {
|
||||
target_os = "android" # fix traffic annotation auditor
|
||||
#enable_kythe_annotations = true
|
||||
chrome_public_manifest_package = "org.bromite.bromite.dev"
|
||||
}
|
||||
|
||||
if(_is_debug_build == "true") {
|
||||
# print("Debug build on")
|
||||
is_debug = true
|
||||
is_official_build = false
|
||||
dcheck_always_on = true
|
||||
if (target_os == "win") {
|
||||
symbol_level = 0
|
||||
use_large_pdbs = true
|
||||
} else {
|
||||
_is_debug_build = getenv("TARGET_ISDEBUG")
|
||||
if(_is_debug_build == "true") {
|
||||
# print("Debug build on")
|
||||
is_debug = true
|
||||
is_official_build = false
|
||||
dcheck_always_on = true
|
||||
symbol_level = 1
|
||||
}
|
||||
strip_debug_info = false
|
||||
generate_linker_map = false
|
||||
strip_debug_info = false
|
||||
generate_linker_map = false
|
||||
|
||||
# since is_cfi require use_thin_lto
|
||||
# but not work in debug mode
|
||||
is_cfi = false # disable it
|
||||
use_cfi_cast = false # disable it
|
||||
} else {
|
||||
if (target_os == "android") {
|
||||
generate_linker_map = true
|
||||
}
|
||||
|
||||
if (target_os == "win") {
|
||||
# since is_cfi require use_thin_lto
|
||||
# but not work in debug mode
|
||||
is_cfi = false # disable it
|
||||
use_cfi_cast = false # disable it
|
||||
}
|
||||
} else {
|
||||
generate_linker_map = true
|
||||
use_relative_vtables_abi = false
|
||||
}
|
||||
}
|
||||
|
||||
if (target_os == "win") {
|
||||
target_os = "win" # fix traffic annotation auditor
|
||||
target_cpu = "x64"
|
||||
symbol_level = 0
|
||||
use_large_pdbs = true
|
||||
|
||||
enable_pdf = true
|
||||
pdf_is_complete_lib = true
|
||||
enable_plugins = true
|
||||
enable_ppapi = false
|
||||
|
||||
is_cfi = 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
|
||||
cd ninja
|
||||
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}
|
||||
cd $WORKSPACE/
|
||||
|
|
|
@ -5,9 +5,18 @@ FROM uazo/chromium:$VERSION
|
|||
ARG BROMITE_SHA
|
||||
ENV BROMITE_SHA=$BROMITE_SHA
|
||||
|
||||
ARG HTTP_PROXY
|
||||
ENV HTTP_PROXY=$HTTP_PROXY
|
||||
ENV HTTPS_PROXY=$HTTP_PROXY
|
||||
ENV https_proxy=$HTTP_PROXY
|
||||
|
||||
#USER lg
|
||||
WORKDIR /home/lg/working_dir
|
||||
|
||||
RUN sudo chown lg /etc/apt/apt.conf.d/proxy.conf
|
||||
RUN sudo echo "Acquire::http::Proxy \"$HTTP_PROXY\";" >/etc/apt/apt.conf.d/proxy.conf
|
||||
RUN sudo apt-get update
|
||||
|
||||
COPY apply-bromite-patches.sh .
|
||||
|
||||
RUN sudo chmod +x ./apply-bromite-patches.sh && \
|
||||
|
|
|
@ -16,7 +16,7 @@ RUN dpkg --add-architecture i386
|
|||
|
||||
RUN apt-get update &&\
|
||||
DEBIAN_FRONTEND=noninteractive \
|
||||
apt-get -f -y install sudo lsb-release cl-base64 bash wget apt-utils python sed tzdata build-essential lib32gcc-9-dev g++-multilib
|
||||
apt-get -f -y install sudo lsb-release cl-base64 bash wget apt-utils python sed tzdata build-essential lib32gcc-9-dev g++-multilib dos2unix wiggle
|
||||
|
||||
ENV user lg
|
||||
|
||||
|
@ -33,12 +33,11 @@ USER ${user}
|
|||
WORKDIR /home/${user}
|
||||
|
||||
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 && \
|
||||
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-android.sh --no-prompt
|
||||
sudo ./install-build-deps.sh --android --no-prompt --no-chromeos-fonts && \
|
||||
sudo mkdir -p /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 - && \
|
||||
apt-key fingerprint 0EBFCD88 && \
|
||||
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 && \
|
||||
rm -rf /var/cache/debconf/* /var/lib/apt/lists/* /var/log/* /tmp/* /var/tmp/* \
|
||||
/usr/share/doc/* /usr/share/man/* /usr/share/local/* && \
|
||||
|
@ -77,7 +77,7 @@ RUN useradd -m runner \
|
|||
|
||||
# Build args
|
||||
ARG TARGETPLATFORM=amd64
|
||||
ARG RUNNER_VERSION=2.302.5
|
||||
ARG RUNNER_VERSION=2.303.1
|
||||
WORKDIR /runner
|
||||
|
||||
# Runner download supports amd64 as x64
|
||||
|
@ -109,6 +109,11 @@ RUN chmod +x ./patched/runsvc.sh /usr/local/bin/startup.sh
|
|||
|
||||
USER runner
|
||||
|
||||
RUN wget https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-amd64 && \
|
||||
mkdir -p /home/runner/.docker/cli-plugins && \
|
||||
mv buildx-v0.10.4.linux-amd64 /home/runner/.docker/cli-plugins/docker-buildx && \
|
||||
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"
|
||||
|
|
|
@ -40,7 +40,7 @@ do
|
|||
-v /casefold:/win_sdk \
|
||||
--network none \
|
||||
--device=/dev/kvm \
|
||||
uazo/github-runner
|
||||
uazo/github-runner:2.303.2
|
||||
|
||||
echo "You can stop now"
|
||||
sleep 5s
|
||||
|
|
|
@ -0,0 +1,17 @@
|
|||
#!/bin/bash
|
||||
|
||||
while true
|
||||
do
|
||||
|
||||
VERSION=$(curl -s https://omahaproxy.appspot.com/all.json | jq '.[] | select(.os | contains("win64")) | .versions[] | select(.channel | contains("stable")) | .current_version' | xargs)
|
||||
echo Check for $VERSION
|
||||
|
||||
docker -H unix:///home/$USER/gh-runner-ci/var/run/docker.sock pull uazo/build-deps:$VERSION
|
||||
docker -H unix:///home/$USER/gh-runner-ci/var/run/docker.sock pull uazo/chromium:$VERSION
|
||||
|
||||
docker -H unix:///home/$USER/gh-runner/var/run/docker.sock pull uazo/build-deps:$VERSION
|
||||
docker -H unix:///home/$USER/gh-runner/var/run/docker.sock pull uazo/chromium:$VERSION
|
||||
|
||||
sleep 1h
|
||||
|
||||
done
|
|
@ -1,19 +1,13 @@
|
|||
#!/bin/bash
|
||||
|
||||
if [[ -z "${DOCKER_SOCK}" ]]; then
|
||||
echo "Please set DOCKER_SOCK env variable"
|
||||
if [[ -z "${INDEX_VERSION}" ]]; then
|
||||
echo "Please set INDEX_VERSION env variable"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -z "${DEV_CONTAINER}" ]]; then
|
||||
echo "Please set DEV_CONTAINER env variable"
|
||||
exit 1
|
||||
fi
|
||||
cp /storage/images/android/x64/$INDEX_VERSION/bromite.idx .
|
||||
cp /storage/images/android/x64/$INDEX_VERSION/RELEASE .
|
||||
|
||||
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 \
|
||||
--progress plain \
|
||||
--no-cache \
|
||||
|
|
|
@ -73,6 +73,7 @@ index ed004ac8f1fe1a5107db8b1f5c02c4ba957daef4..bbb79da561ddec497863230cd99ffbe9
|
|||
+
|
||||
int NinjaMain::ToolCompilationDatabase(const Options* options, int argc, char* argv[]) {
|
||||
+ std::vector<Edge*>* edges_to_process = &(state_.edges_);
|
||||
+ std::vector<Edge*> user_interested_edges;
|
||||
+
|
||||
+ if (options->user_given_target) {
|
||||
+ string err;
|
||||
|
@ -83,7 +84,6 @@ index ed004ac8f1fe1a5107db8b1f5c02c4ba957daef4..bbb79da561ddec497863230cd99ffbe9
|
|||
+ return 1;
|
||||
+ }
|
||||
+
|
||||
+ std::vector<Edge*> user_interested_edges;
|
||||
+ if (!GetAllDependentEdges(user_given_target, &user_interested_edges))
|
||||
+ return 1;
|
||||
+ edges_to_process = &user_interested_edges;
|
||||
|
|
Loading…
Reference in New Issue