Compare commits

..

8 Commits

Author SHA1 Message Date
uazo
7d83b64cc9 Create export-patch-list.sh 2022-02-25 14:27:13 +01:00
uazo
45dff72f43 fix argument 2022-02-23 15:28:48 +01:00
uazo
cfabccd77f remove last empty line like upstream 2022-02-22 15:42:20 +01:00
uazo
d6bbb56bc3 remove space after "-- " like upstream 2022-02-22 15:41:54 +01:00
uazo
d184899841 fix is_cfi build error in debug 2022-02-22 14:34:51 +01:00
uazo
cc085e6ebb change upstream gnargs file 2022-02-22 10:04:33 +01:00
uazo
0978237d5c add ephemeral to runner config 2022-02-18 16:08:27 +01:00
uazo
94ad7d9a1d Update to runner v2.302.5 2022-02-18 12:52:34 +00:00
7 changed files with 40 additions and 7 deletions

View File

@@ -250,9 +250,9 @@ jobs:
echo "::group::-------- gn gen"
[[ "$USEGOMA" = "true" ]] && \
gn gen --args="import(\"/home/lg/working_dir/bromite/build/GN_ARGS\") use_goma=true goma_dir=\"$WORKSPACE/goma\" $(cat ../../build_args.gni) " out/bromite \
gn gen --args="import(\"/home/lg/working_dir/bromite/build/bromite.gn_args\") use_goma=true goma_dir=\"$WORKSPACE/goma\" $(cat ../../build_args.gni) " out/bromite \
|| \
gn gen --args="import(\"/home/lg/working_dir/bromite/build/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) " out/bromite
echo "::endgroup::"
echo "::group::-------- gn args"

View File

@@ -10,7 +10,7 @@ fi
if [ -z "$2" ]
then
PATCH_NEW_PATH="~/bromite/build/patches-new"
PATCH_NEW_PATH=~/bromite/build/patches-new
else
PATCH_NEW_PATH=$2
fi

25
export-patch-list.sh Normal file
View File

@@ -0,0 +1,25 @@
#!/bin/bash
VERSION=$(cat ~/bromite/build/RELEASE)
CURRENT_RELEASE=$(git -C ~/chromium/src/ rev-parse --verify refs/tags/$VERSION)
ALLPATCHS_E=$(git -C ~/chromium/src/ rev-list HEAD...$CURRENT_RELEASE)
mkdir ~/bromite/build/patches-new
rm ~/bromite/build/patches-new/patch-list
NO_NAME=1
for patch in $ALLPATCHS_E; do
PATCH_FILE=$(git -C ~/chromium/src/ show -s $patch | grep FILE: | sed 's/FILE://g' | sed 's/^[ \t]*//;s/[ \t]*$//')
if [[ "$PATCH_FILE" == *"Automated-domain-substitution"* ]]; then
continue
fi
echo $PATCH_FILE >>~/bromite/build/patches-new/patch-list
done
tac ~/bromite/build/patches-new/patch-list >~/bromite/build/patches-new/zz-patch-list.txt
rm ~/bromite/build/patches-new/patch-list

View File

@@ -32,9 +32,9 @@ sed -i '/^ mode change/d' ~/bromite/build/patches-new/$PATCH_FILE
sed -i '/^old mode /d' ~/bromite/build/patches-new/$PATCH_FILE
sed -i '/^new mode /d' ~/bromite/build/patches-new/$PATCH_FILE
echo "-- " >> ~/bromite/build/patches-new/$PATCH_FILE
echo "--" >> ~/bromite/build/patches-new/$PATCH_FILE
echo "2.25.1" >> ~/bromite/build/patches-new/$PATCH_FILE
echo "" >> ~/bromite/build/patches-new/$PATCH_FILE
#echo "" >> ~/bromite/build/patches-new/$PATCH_FILE
echo " done."
echo ""

View File

@@ -15,6 +15,7 @@ if(getenv("TARGET_CPU") != "") {
enable_kythe_annotations = true
clang_use_chrome_plugins = false
chrome_public_manifest_package = "org.bromite.bromite.dev"
if(_is_debug_build == "true") {
# print("Debug build on")
@@ -24,6 +25,11 @@ if(_is_debug_build == "true") {
symbol_level = 1
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 {
generate_linker_map = true
}

View File

@@ -77,7 +77,7 @@ RUN useradd -m runner \
# Build args
ARG TARGETPLATFORM=amd64
ARG RUNNER_VERSION=2.302.4
ARG RUNNER_VERSION=2.302.5
WORKDIR /runner
# Runner download supports amd64 as x64

View File

@@ -48,7 +48,9 @@ echo "Registering runner ${runner_id}"
--url "${registration_url}" \
--allowedauthorslist "${ALLOWEDAUTHORSLIST}" \
--unattended \
--replace
--replace \
--disableupdate \
--ephemeral
trap 'remove_runner; exit 130' SIGINT
trap 'remove_runner; exit 143' SIGTERM