Compare commits

..

6 Commits

Author SHA1 Message Date
uazo
4893074e00 Do not automatically update DEPOT_TOOLS 2022-07-15 10:10:56 +02:00
uazo
abf39d8c09 Update depot_tools.diff 2022-07-15 10:02:47 +02:00
uazo
fd177a7772 change skip_clangd_unsupported_options 2022-07-12 17:41:44 +02:00
uazo
2de67fd5af fix sudo error
fix "sudo must be owned by uid 0 and have the setuid bit set"
2022-07-12 15:14:35 +02:00
uazo
a284b224fb Update Dockerfile 2022-07-08 19:32:23 +02:00
uazo
d5b30106a5 Add prerequisite for systemwebview target 2022-07-08 19:31:21 +02:00
4 changed files with 53 additions and 44 deletions

View File

@@ -368,7 +368,10 @@ jobs:
-t compdb cc cxx objc objcxx >$WORKSPACE/chromium/src/out/bromite/compile_commands.json
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 && \
/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
if: ${{ github.event.inputs.debug == 'false' }}

View File

@@ -16,13 +16,14 @@ 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
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
RUN useradd -m -d /home/${user} ${user} && \
chown -R ${user} /home/${user} && \
adduser ${user} sudo && \
chmod 4755 /usr/bin/sudo && \
echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
USER ${user}

View File

@@ -1,57 +1,60 @@
diff --git a/gclient_scm.py b/gclient_scm.py
index f58c07a8..c8409726 100644
--- a/gclient_scm.py
+++ b/gclient_scm.py
@@ -1012,28 +1012,35 @@ class GitWrapper(SCMWrapper):
gclient_utils.safe_makedirs(parent_dir)
template_dir = None
+ use_fetch = False
@@ -1137,31 +1137,29 @@ class GitWrapper(SCMWrapper):
clone_cmd.append(url)
template_dir = None
+ use_fetch = False
+
+ tmp_dir = tempfile.mkdtemp(
+ prefix='_gclient_%s_' % os.path.basename(self.checkout_path),
+ dir=parent_dir)
+ tmp_dir = tempfile.mkdtemp(
+ prefix='_gclient_%s_' % os.path.basename(self.checkout_path),
+ dir=parent_dir)
+
if hasattr(options, 'no_history') and options.no_history:
if gclient_utils.IsGitSha(revision):
# 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,
# we tell git to fetch all the remote objects from SHA..HEAD by means of
# a template git dir which has a 'shallow' file pointing to the sha.
- template_dir = tempfile.mkdtemp(
- prefix='_gclient_gittmp_%s' % os.path.basename(self.checkout_path),
- dir=parent_dir)
- self._Run(['init', '--bare', template_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)
if hasattr(options, 'no_history') and options.no_history:
if gclient_utils.IsGitSha(revision):
- # 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,
- # we tell git to fetch all the remote objects from SHA..HEAD by means
- # of a template git dir which has a 'shallow' file pointing to the
- # sha.
- template_dir = tempfile.mkdtemp(prefix='_gclient_gittmp_%s' %
- os.path.basename(self.checkout_path),
- dir=parent_dir)
- self._Run(['init', '--bare', template_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.append('--depth=1')
+ clone_cmd.append(url)
+ clone_cmd.append(revision)
+ use_fetch = True
else:
# Otherwise, we're just interested in the HEAD. Just use --depth.
clone_cmd.append('--depth=1')
- tmp_dir = tempfile.mkdtemp(
- prefix='_gclient_%s_' % os.path.basename(self.checkout_path),
- dir=parent_dir)
try:
+ clone_cmd = cfg + ['-C', tmp_dir, 'fetch', '--progress']
+ clone_cmd.append('--depth=1')
+ clone_cmd.append(url)
+ clone_cmd.append(revision)
+ use_fetch = True
else:
# Otherwise, we're just interested in the HEAD. Just use --depth.
clone_cmd.append('--depth=1')
- tmp_dir = tempfile.mkdtemp(prefix='_gclient_%s_' %
- os.path.basename(self.checkout_path),
- dir=parent_dir)
- clone_cmd.append(tmp_dir)
+ if use_fetch == False:
+ clone_cmd.append(tmp_dir)
+
if self.print_outbuf:
print_stdout = True
filter_fn = None
@@ -1328,6 +1335,9 @@ class GitWrapper(SCMWrapper):
try:
self._Run(clone_cmd,
@@ -1452,6 +1450,9 @@ class GitWrapper(SCMWrapper):
if refspec:
fetch_cmd.append(refspec)
+ if hasattr(options, 'no_history') and options.no_history:
+ fetch_cmd.append('--depth=1')
+

View File

@@ -22,6 +22,8 @@ echo -e ${RED} -------- download chromium repo ${NC}
mkdir ./chromium
cd ./chromium
export DEPOT_TOOLS_UPDATE=0
gclient root
mkdir ./src