Compare commits
43 Commits
v98.0.4758
...
v105.0.519
Author | SHA1 | Date | |
---|---|---|---|
|
daca99c6c5 | ||
|
e826c60239 | ||
|
50441d00bc | ||
|
dc0253788a | ||
|
ddc84733e9 | ||
|
3d2a3fb5fd | ||
|
6e62f4a85d | ||
|
406a5d83c2 | ||
|
963ab065f9 | ||
|
e15c9f918b | ||
|
aa33b64d6c | ||
|
4893074e00 | ||
|
abf39d8c09 | ||
|
fd177a7772 | ||
|
2de67fd5af | ||
|
a284b224fb | ||
|
d5b30106a5 | ||
|
729ad9b695 | ||
|
ffc028a0e9 | ||
|
20f617fd4a | ||
|
dce1324300 | ||
|
dacc20b60d | ||
|
fe2587d942 | ||
|
bafaa5f167 | ||
|
64df7a0a73 | ||
|
aede203911 | ||
|
7dc817d819 | ||
|
81f793ed34 | ||
|
a716f182be | ||
|
cfbb923b0d | ||
|
f12c3e78b4 | ||
|
854b6356d5 | ||
|
89497b252b | ||
|
58fe440996 | ||
|
7d83b64cc9 | ||
|
45dff72f43 | ||
|
cfabccd77f | ||
|
d6bbb56bc3 | ||
|
d184899841 | ||
|
cc085e6ebb | ||
|
0978237d5c | ||
|
94ad7d9a1d | ||
|
f16bbde3d2 |
14
.github/workflows/build_bromite_dev.yaml
vendored
14
.github/workflows/build_bromite_dev.yaml
vendored
@@ -250,9 +250,9 @@ jobs:
|
|||||||
|
|
||||||
echo "::group::-------- gn gen"
|
echo "::group::-------- gn gen"
|
||||||
[[ "$USEGOMA" = "true" ]] && \
|
[[ "$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 "::endgroup::"
|
||||||
|
|
||||||
echo "::group::-------- gn args"
|
echo "::group::-------- gn args"
|
||||||
@@ -363,12 +363,14 @@ jobs:
|
|||||||
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
|
||||||
|
|
||||||
$WORKSPACE/ninja/ninja -C $WORKSPACE/chromium/src/out/bromite -a chrome_public_apk \
|
|
||||||
-t compdb cc cxx objc objcxx >$WORKSPACE/chromium/src/out/bromite/compile_commands.json
|
|
||||||
|
|
||||||
test -f out/bromite/bromite.idx || \
|
test -f out/bromite/bromite.idx || \
|
||||||
/home/lg/working_dir/clangd_snapshot_20211205/bin/clangd-indexer --executor=all-TUs out/bromite/compile_commands.json >out/bromite/bromite.idx
|
cp -r out/bromite out/clangd && \
|
||||||
|
gn gen --args="import(\"/home/lg/working_dir/bromite/build/bromite.gn_args\") $(cat ../../build_args.gni) skip_clangd_unsupported_options = true" out/clangd && \
|
||||||
|
$WORKSPACE/ninja/ninja -C $WORKSPACE/chromium/src/out/clangd -a chrome_public_apk \
|
||||||
|
-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
|
||||||
|
|
||||||
- name: Generate Supersize data
|
- name: Generate Supersize data
|
||||||
if: ${{ github.event.inputs.debug == 'false' }}
|
if: ${{ github.event.inputs.debug == 'false' }}
|
||||||
|
4
.github/workflows/release.yaml
vendored
4
.github/workflows/release.yaml
vendored
@@ -45,7 +45,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
wget https://github.com/ericchiang/pup/releases/download/v0.4.0/pup_v0.4.0_linux_amd64.zip
|
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
|
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/$BROMITE_SHA | ./pup -p li.branch a text{})
|
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
|
echo "BRANCH=$BRANCH" >> $GITHUB_ENV
|
||||||
|
|
||||||
wget https://github.com/cli/cli/releases/download/v2.4.0/gh_2.4.0_linux_amd64.tar.gz
|
wget https://github.com/cli/cli/releases/download/v2.4.0/gh_2.4.0_linux_amd64.tar.gz
|
||||||
@@ -74,7 +74,7 @@ jobs:
|
|||||||
cd bromite
|
cd bromite
|
||||||
VERSION=v$(cat ${{ env.OUTPUTFILE }}/RELEASE)-${{ github.event.inputs.build }}
|
VERSION=v$(cat ${{ env.OUTPUTFILE }}/RELEASE)-${{ github.event.inputs.build }}
|
||||||
../gh_2.4.0_linux_amd64/bin/gh release create $VERSION-$BROMITE_SHA \
|
../gh_2.4.0_linux_amd64/bin/gh release create $VERSION-$BROMITE_SHA \
|
||||||
../$APK --notes ""
|
../$APK --notes "" -p
|
||||||
|
|
||||||
# - name: Enable proxy on container
|
# - name: Enable proxy on container
|
||||||
# shell: bash
|
# shell: bash
|
||||||
|
@@ -10,7 +10,7 @@ fi
|
|||||||
|
|
||||||
if [ -z "$2" ]
|
if [ -z "$2" ]
|
||||||
then
|
then
|
||||||
PATCH_NEW_PATH="~/bromite/build/patches-new"
|
PATCH_NEW_PATH=~/bromite/build/patches-new
|
||||||
else
|
else
|
||||||
PATCH_NEW_PATH=$2
|
PATCH_NEW_PATH=$2
|
||||||
fi
|
fi
|
||||||
|
@@ -18,17 +18,26 @@ for patch in $ALLPATCHS_E; do
|
|||||||
|
|
||||||
if [ -z "$PATCH_FILE" ]
|
if [ -z "$PATCH_FILE" ]
|
||||||
then
|
then
|
||||||
#git -C ~/chromium/src/ show -s $patch
|
|
||||||
PATCH_FILE=$(git -C ~/chromium/src/ show -s $patch | tail -n 1)
|
PATCH_FILE=$(git -C ~/chromium/src/ show -s $patch | tail -n 1)
|
||||||
if [[ "$PATCH_FILE" != *".patch" ]]; then
|
if [[ "$PATCH_FILE" != *".patch" ]]; then
|
||||||
PATCH_FILE=$NO_NAME.patch
|
PATCH_FILE=00$(git -C ~/chromium/src/ show -s $patch | head -n 5 | tail -n 1 | xargs | tr " " - | tr [:punct:] -).patch
|
||||||
NO_NAME=$NO_NAME.1
|
echo New Patch: ${PATCH_FILE}
|
||||||
echo No Name ${NO_NAME}, press return
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
read -n 1
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
bash ~/bromite-buildtools/export-single-patch.sh $patch $PATCH_FILE
|
bash ~/bromite-buildtools/export-single-patch.sh $patch $PATCH_FILE
|
||||||
|
|
||||||
done
|
done
|
||||||
|
|
||||||
|
PATCH_LIST=~/bromite/build/bromite_patches_list.txt
|
||||||
|
mkdir ~/bromite/build/patches-new/changed
|
||||||
|
mkdir ~/bromite/build/patches-new/contrib
|
||||||
|
for current_file in $(cat $PATCH_LIST); do
|
||||||
|
if [[ "$current_file" == *".patch" ]]; then
|
||||||
|
if [[ $current_file =~ ^changed/.* ]]; then
|
||||||
|
mv ~/bromite/build/patches-new/$(basename $current_file) ~/bromite/build/patches-new/changed
|
||||||
|
elif [[ $current_file =~ ^contrib/.* ]]; then
|
||||||
|
mv ~/bromite/build/patches-new/$(basename $current_file) ~/bromite/build/patches-new/contrib || true
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
28
export-patch-list.sh
Normal file
28
export-patch-list.sh
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
#!/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
|
||||||
|
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
|
||||||
|
|
||||||
|
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
|
@@ -16,25 +16,38 @@ 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"
|
||||||
|
|
||||||
|
CHANGE_REF=""
|
||||||
while read line; do
|
while read line; do
|
||||||
#echo $line
|
for i in {1..5}
|
||||||
if [[ "$line" == index* ]]; then
|
do
|
||||||
next_line=$(grep -A1 "${line}" ~/bromite/build/patches-new/$PATCH_FILE | tail -n 1 )
|
if [[ "$line" == index* ]]; then
|
||||||
if [[ "$next_line" != "GIT binary patch" ]]; then
|
read next_line
|
||||||
sed -i "/^$line/d" ~/bromite/build/patches-new/$PATCH_FILE
|
if [[ "$next_line" != "GIT binary patch" ]]; then
|
||||||
|
CHANGE_REF=${CHANGE_REF}"/^${line}/d;"
|
||||||
|
break
|
||||||
|
else
|
||||||
|
line=$next_line
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
break
|
||||||
fi
|
fi
|
||||||
fi
|
done
|
||||||
done <~/bromite/build/patches-new/$PATCH_FILE
|
done <~/bromite/build/patches-new/$PATCH_FILE
|
||||||
|
|
||||||
|
if [ "$CHANGE_REF" ]
|
||||||
|
then
|
||||||
|
sed -i "$CHANGE_REF" ~/bromite/build/patches-new/$PATCH_FILE
|
||||||
|
fi
|
||||||
sed -i '/^From 0000000000000000000000000000000000000000/d' ~/bromite/build/patches-new/$PATCH_FILE
|
sed -i '/^From 0000000000000000000000000000000000000000/d' ~/bromite/build/patches-new/$PATCH_FILE
|
||||||
sed -i '/^FILE:/d' ~/bromite/build/patches-new/$PATCH_FILE
|
sed -i '/^FILE:/d' ~/bromite/build/patches-new/$PATCH_FILE
|
||||||
sed -i '/^ mode change/d' ~/bromite/build/patches-new/$PATCH_FILE
|
sed -i '/^ mode change/d' ~/bromite/build/patches-new/$PATCH_FILE
|
||||||
sed -i '/^old mode /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
|
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.20.1" >> ~/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 " done."
|
||||||
echo ""
|
echo ""
|
||||||
|
@@ -14,7 +14,8 @@ if(getenv("TARGET_CPU") != "") {
|
|||||||
# print("Target " + target_cpu)
|
# print("Target " + target_cpu)
|
||||||
|
|
||||||
enable_kythe_annotations = true
|
enable_kythe_annotations = true
|
||||||
clang_use_chrome_plugins = false
|
# clang_use_chrome_plugins = false
|
||||||
|
chrome_public_manifest_package = "org.bromite.bromite.dev"
|
||||||
|
|
||||||
if(_is_debug_build == "true") {
|
if(_is_debug_build == "true") {
|
||||||
# print("Debug build on")
|
# print("Debug build on")
|
||||||
@@ -24,6 +25,11 @@ if(_is_debug_build == "true") {
|
|||||||
symbol_level = 1
|
symbol_level = 1
|
||||||
strip_debug_info = false
|
strip_debug_info = false
|
||||||
generate_linker_map = 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 {
|
} else {
|
||||||
generate_linker_map = true
|
generate_linker_map = true
|
||||||
}
|
}
|
||||||
|
@@ -10,6 +10,7 @@ cd chromium/src
|
|||||||
echo -e ${RED} ------- apply patchs ${NC}
|
echo -e ${RED} ------- apply patchs ${NC}
|
||||||
for file in $(cat ../../bromite/build/bromite_patches_list.txt) ; do
|
for file in $(cat ../../bromite/build/bromite_patches_list.txt) ; do
|
||||||
|
|
||||||
|
if [[ "$file" == *".patch" ]]; then
|
||||||
#if [[ "$file" == *"Automated-domain-substitution"* ]]; then
|
#if [[ "$file" == *"Automated-domain-substitution"* ]]; then
|
||||||
# echo -e ${RED} " -> Excluding $file" ${NC}
|
# echo -e ${RED} " -> Excluding $file" ${NC}
|
||||||
# continue
|
# continue
|
||||||
@@ -17,7 +18,7 @@ for file in $(cat ../../bromite/build/bromite_patches_list.txt) ; do
|
|||||||
|
|
||||||
echo -e ${RED} " -> Apply $file" ${NC}
|
echo -e ${RED} " -> Apply $file" ${NC}
|
||||||
|
|
||||||
REPL="0,/^---/s//FILE:"$file"\n---/"
|
REPL="0,/^---/s//FILE:"$(basename $file)"\n---/"
|
||||||
cat ../../bromite/build/patches/$file | sed $REPL | git am
|
cat ../../bromite/build/patches/$file | sed $REPL | git am
|
||||||
|
|
||||||
if [ $? -ne 0 ]
|
if [ $? -ne 0 ]
|
||||||
@@ -27,4 +28,6 @@ for file in $(cat ../../bromite/build/bromite_patches_list.txt) ; do
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
echo " "
|
echo " "
|
||||||
|
fi
|
||||||
|
|
||||||
done
|
done
|
||||||
|
@@ -16,13 +16,14 @@ RUN dpkg --add-architecture i386
|
|||||||
|
|
||||||
RUN apt-get update &&\
|
RUN apt-get update &&\
|
||||||
DEBIAN_FRONTEND=noninteractive \
|
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
|
apt-get -f -y install sudo lsb-release cl-base64 bash wget apt-utils python sed tzdata build-essential lib32gcc-9-dev g++-multilib
|
||||||
|
|
||||||
ENV user lg
|
ENV user lg
|
||||||
|
|
||||||
RUN useradd -m -d /home/${user} ${user} && \
|
RUN useradd -m -d /home/${user} ${user} && \
|
||||||
chown -R ${user} /home/${user} && \
|
chown -R ${user} /home/${user} && \
|
||||||
adduser ${user} sudo && \
|
adduser ${user} sudo && \
|
||||||
|
chmod 4755 /usr/bin/sudo && \
|
||||||
echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
|
echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
|
||||||
USER ${user}
|
USER ${user}
|
||||||
|
|
||||||
@@ -31,18 +32,13 @@ USER ${user}
|
|||||||
|
|
||||||
WORKDIR /home/${user}
|
WORKDIR /home/${user}
|
||||||
|
|
||||||
RUN wget https://chromium.googlesource.com/chromium/src/+/refs/tags/$VERSION/build/install-build-deps.sh?format=TEXT -O install-build-deps.sh.base64 \
|
RUN wget https://raw.githubusercontent.com/chromium/chromium/$VERSION/build/install-build-deps.sh \
|
||||||
&& \
|
&& \
|
||||||
wget https://chromium.googlesource.com/chromium/src/+/refs/tags/$VERSION/build/install-build-deps-android.sh?format=TEXT -O install-build-deps-android.sh.base64 \
|
wget https://raw.githubusercontent.com/chromium/chromium/$VERSION/build/install-build-deps-android.sh \
|
||||||
&& \
|
&& \
|
||||||
base64 -d install-build-deps.sh.base64 >install-build-deps.sh && \
|
|
||||||
base64 -d install-build-deps-android.sh.base64 >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 && \
|
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-android.sh --no-prompt
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@@ -1,57 +1,60 @@
|
|||||||
diff --git a/gclient_scm.py b/gclient_scm.py
|
diff --git a/gclient_scm.py b/gclient_scm.py
|
||||||
|
index f58c07a8..c8409726 100644
|
||||||
--- a/gclient_scm.py
|
--- a/gclient_scm.py
|
||||||
+++ b/gclient_scm.py
|
+++ b/gclient_scm.py
|
||||||
@@ -1012,28 +1012,35 @@ class GitWrapper(SCMWrapper):
|
@@ -1137,31 +1137,29 @@ class GitWrapper(SCMWrapper):
|
||||||
gclient_utils.safe_makedirs(parent_dir)
|
clone_cmd.append(url)
|
||||||
|
|
||||||
template_dir = None
|
template_dir = None
|
||||||
+ use_fetch = False
|
+ use_fetch = False
|
||||||
+
|
+
|
||||||
+ tmp_dir = tempfile.mkdtemp(
|
+ tmp_dir = tempfile.mkdtemp(
|
||||||
+ prefix='_gclient_%s_' % os.path.basename(self.checkout_path),
|
+ prefix='_gclient_%s_' % os.path.basename(self.checkout_path),
|
||||||
+ dir=parent_dir)
|
+ dir=parent_dir)
|
||||||
+
|
+
|
||||||
if hasattr(options, 'no_history') and options.no_history:
|
if hasattr(options, 'no_history') and options.no_history:
|
||||||
if gclient_utils.IsGitSha(revision):
|
if gclient_utils.IsGitSha(revision):
|
||||||
# In the case of a subproject, the pinned sha is not necessarily the
|
- # In the case of a subproject, the pinned sha is not necessarily the
|
||||||
# head of the remote branch (so we can't just use --depth=N). Instead,
|
- # head of the remote branch (so we can't just use --depth=N). Instead,
|
||||||
# we tell git to fetch all the remote objects from SHA..HEAD by means of
|
- # we tell git to fetch all the remote objects from SHA..HEAD by means
|
||||||
# a template git dir which has a 'shallow' file pointing to the sha.
|
- # of a template git dir which has a 'shallow' file pointing to the
|
||||||
- template_dir = tempfile.mkdtemp(
|
- # sha.
|
||||||
- prefix='_gclient_gittmp_%s' % os.path.basename(self.checkout_path),
|
- template_dir = tempfile.mkdtemp(prefix='_gclient_gittmp_%s' %
|
||||||
- dir=parent_dir)
|
- os.path.basename(self.checkout_path),
|
||||||
- self._Run(['init', '--bare', template_dir], options, cwd=self._root_dir)
|
- dir=parent_dir)
|
||||||
- with open(os.path.join(template_dir, 'shallow'), 'w') as template_file:
|
- self._Run(['init', '--bare', template_dir],
|
||||||
- template_file.write(revision)
|
- options,
|
||||||
- clone_cmd.append('--template=' + template_dir)
|
- cwd=self._root_dir)
|
||||||
+ self._Run(['init', tmp_dir], options, cwd=self._root_dir)
|
- with open(os.path.join(template_dir, 'shallow'),
|
||||||
|
- 'w') as template_file:
|
||||||
|
- template_file.write(revision)
|
||||||
|
- clone_cmd.append('--template=' + template_dir)
|
||||||
|
+ self._Run(['init', tmp_dir], options, cwd=self._root_dir)
|
||||||
+
|
+
|
||||||
+ self._Run(['-C', tmp_dir, 'remote', 'add', 'origin', url], options, cwd=self._root_dir)
|
+ self._Run(['-C', tmp_dir, 'remote', 'add', 'origin', url], options, cwd=self._root_dir)
|
||||||
+
|
+
|
||||||
+ clone_cmd = cfg + ['-C', tmp_dir, 'fetch', '--progress']
|
+ clone_cmd = cfg + ['-C', tmp_dir, 'fetch', '--progress']
|
||||||
+ clone_cmd.append('--depth=1')
|
+ clone_cmd.append('--depth=1')
|
||||||
+ clone_cmd.append(url)
|
+ clone_cmd.append(url)
|
||||||
+ clone_cmd.append(revision)
|
+ clone_cmd.append(revision)
|
||||||
+ use_fetch = True
|
+ use_fetch = True
|
||||||
else:
|
else:
|
||||||
# Otherwise, we're just interested in the HEAD. Just use --depth.
|
# Otherwise, we're just interested in the HEAD. Just use --depth.
|
||||||
clone_cmd.append('--depth=1')
|
clone_cmd.append('--depth=1')
|
||||||
|
|
||||||
- tmp_dir = tempfile.mkdtemp(
|
- tmp_dir = tempfile.mkdtemp(prefix='_gclient_%s_' %
|
||||||
- prefix='_gclient_%s_' % os.path.basename(self.checkout_path),
|
- os.path.basename(self.checkout_path),
|
||||||
- dir=parent_dir)
|
- dir=parent_dir)
|
||||||
try:
|
|
||||||
- clone_cmd.append(tmp_dir)
|
- clone_cmd.append(tmp_dir)
|
||||||
+ if use_fetch == False:
|
+ if use_fetch == False:
|
||||||
+ clone_cmd.append(tmp_dir)
|
+ clone_cmd.append(tmp_dir)
|
||||||
+
|
|
||||||
if self.print_outbuf:
|
try:
|
||||||
print_stdout = True
|
self._Run(clone_cmd,
|
||||||
filter_fn = None
|
@@ -1452,6 +1450,9 @@ class GitWrapper(SCMWrapper):
|
||||||
@@ -1328,6 +1335,9 @@ class GitWrapper(SCMWrapper):
|
|
||||||
if refspec:
|
if refspec:
|
||||||
fetch_cmd.append(refspec)
|
fetch_cmd.append(refspec)
|
||||||
|
|
||||||
+ if hasattr(options, 'no_history') and options.no_history:
|
+ if hasattr(options, 'no_history') and options.no_history:
|
||||||
+ fetch_cmd.append('--depth=1')
|
+ fetch_cmd.append('--depth=1')
|
||||||
+
|
+
|
||||||
|
@@ -10,7 +10,7 @@ git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
|
|||||||
|
|
||||||
echo -e ${RED} -------- apply depot_tools patch ${NC}
|
echo -e ${RED} -------- apply depot_tools patch ${NC}
|
||||||
cd depot_tools/
|
cd depot_tools/
|
||||||
git apply ../depot_tools.diff
|
#git apply ../depot_tools.diff
|
||||||
git apply ../remove_ninja_uploader.diff
|
git apply ../remove_ninja_uploader.diff
|
||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
@@ -22,21 +22,26 @@ echo -e ${RED} -------- download chromium repo ${NC}
|
|||||||
mkdir ./chromium
|
mkdir ./chromium
|
||||||
cd ./chromium
|
cd ./chromium
|
||||||
|
|
||||||
|
export DEPOT_TOOLS_UPDATE=0
|
||||||
|
|
||||||
gclient root
|
gclient root
|
||||||
|
|
||||||
mkdir ./src
|
mkdir ./src
|
||||||
cd ./src
|
cd ./src
|
||||||
|
|
||||||
git init
|
#CHR_SOURCE=https://chromium.googlesource.com/chromium/src.git
|
||||||
git remote add origin https://chromium.googlesource.com/chromium/src.git
|
CHR_SOURCE=https://github.com/chromium/chromium.git
|
||||||
|
|
||||||
git fetch --depth 2 https://chromium.googlesource.com/chromium/src.git +refs/tags/$VERSION:chromium_$VERSION
|
git init
|
||||||
|
git remote add origin $CHR_SOURCE
|
||||||
|
|
||||||
|
git fetch --depth 2 $CHR_SOURCE +refs/tags/$VERSION:chromium_$VERSION
|
||||||
git checkout $VERSION
|
git checkout $VERSION
|
||||||
VERSION_SHA=$( git show-ref -s $VERSION | head -n1 )
|
VERSION_SHA=$( git show-ref -s $VERSION | head -n1 )
|
||||||
|
|
||||||
echo >../.gclient "solutions = ["
|
echo >../.gclient "solutions = ["
|
||||||
echo >>../.gclient " { \"name\" : 'src',"
|
echo >>../.gclient " { \"name\" : 'src',"
|
||||||
echo >>../.gclient " \"url\" : 'https://chromium.googlesource.com/chromium/src.git@$VERSION_SHA',"
|
echo >>../.gclient " \"url\" : '$CHR_SOURCE@$VERSION_SHA',"
|
||||||
echo >>../.gclient " \"deps_file\" : 'DEPS',"
|
echo >>../.gclient " \"deps_file\" : 'DEPS',"
|
||||||
echo >>../.gclient " \"managed\" : True,"
|
echo >>../.gclient " \"managed\" : True,"
|
||||||
echo >>../.gclient " \"custom_deps\" : {"
|
echo >>../.gclient " \"custom_deps\" : {"
|
||||||
|
@@ -77,7 +77,7 @@ RUN useradd -m runner \
|
|||||||
|
|
||||||
# Build args
|
# Build args
|
||||||
ARG TARGETPLATFORM=amd64
|
ARG TARGETPLATFORM=amd64
|
||||||
ARG RUNNER_VERSION=2.302.4
|
ARG RUNNER_VERSION=2.302.5
|
||||||
WORKDIR /runner
|
WORKDIR /runner
|
||||||
|
|
||||||
# Runner download supports amd64 as x64
|
# Runner download supports amd64 as x64
|
||||||
|
@@ -48,7 +48,9 @@ echo "Registering runner ${runner_id}"
|
|||||||
--url "${registration_url}" \
|
--url "${registration_url}" \
|
||||||
--allowedauthorslist "${ALLOWEDAUTHORSLIST}" \
|
--allowedauthorslist "${ALLOWEDAUTHORSLIST}" \
|
||||||
--unattended \
|
--unattended \
|
||||||
--replace
|
--replace \
|
||||||
|
--disableupdate \
|
||||||
|
--ephemeral
|
||||||
|
|
||||||
trap 'remove_runner; exit 130' SIGINT
|
trap 'remove_runner; exit 130' SIGINT
|
||||||
trap 'remove_runner; exit 143' SIGTERM
|
trap 'remove_runner; exit 143' SIGTERM
|
||||||
|
@@ -4,6 +4,13 @@
|
|||||||
.githubusercontent.com
|
.githubusercontent.com
|
||||||
.ubuntu.com
|
.ubuntu.com
|
||||||
|
|
||||||
|
# for .net
|
||||||
|
.dot.net
|
||||||
|
dotnet.microsoft.com
|
||||||
|
dotnetcli.azureedge.net
|
||||||
|
aka.ms
|
||||||
|
packages.microsoft.com
|
||||||
|
|
||||||
# for buildeps
|
# for buildeps
|
||||||
#chromium.googlesource.com
|
#chromium.googlesource.com
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user