зеркало из https://github.com/mozilla/gecko-dev.git
Backed out 5 changesets (bug 1743687) for causing lint failures CLOSED TREE
Backed out changeset 588c884f4422 (bug 1743687) Backed out changeset 7f89f91eb11d (bug 1743687) Backed out changeset 871bb9f148c9 (bug 1743687) Backed out changeset 26ac06520a7a (bug 1743687) Backed out changeset c1816940d74a (bug 1743687)
This commit is contained in:
Noemi Erli
Родитель
e8362594a0
Коммит
036444c437
|
|
@ -14,7 +14,7 @@ php-windows-7.4.24:
|
|||
description: VC15 x64 Non Thread Safe (2021-Sep-21 16:58:34)
|
||||
fetch:
|
||||
type: static-url
|
||||
url: https://windows.php.net/downloads/releases/archives/php-7.4.24-nts-Win32-vc15-x64.zip
|
||||
url: https://windows.php.net/downloads/releases/php-7.4.24-nts-Win32-vc15-x64.zip
|
||||
sha256: 1e93fb390ab2761a47d27c97225a518759731c632c0dd87436cbf25f19582436
|
||||
size: 26067094
|
||||
artifact-name: php.tar.zst
|
||||
|
|
@ -25,9 +25,3 @@ arcanist:
|
|||
type: git
|
||||
repo: https://github.com/phacility/arcanist.git
|
||||
revision: a028291f8e5e79b6446ad67ed8b0be9c5ec8f029
|
||||
depot_tools:
|
||||
description: Google's depot_tools package
|
||||
fetch:
|
||||
type: git
|
||||
repo: https://chromium.googlesource.com/chromium/tools/depot_tools.git
|
||||
revision: 7b3351443198f4e7d068999b169385b55a43679a
|
||||
|
|
|
|||
|
|
@ -84,14 +84,7 @@ jobs:
|
|||
max-run-time: 3600
|
||||
taskcluster-proxy: true
|
||||
env:
|
||||
TOOLTOOL_MANIFEST: "taskcluster/ci/updatebot/tooltool-manifests/updatebot.manifest"
|
||||
MSYSTEM: "MINGW64"
|
||||
# begin _GENERATE_DEPOT_TOOLS_BINARIES_
|
||||
# artifacts:
|
||||
# - type: directory
|
||||
# name: public/depot_tools.zip
|
||||
# path: build\src\obj-build\depot_tools
|
||||
# end _GENERATE_DEPOT_TOOLS_BINARIES_
|
||||
TOOLTOOL_MANIFEST: "taskcluster/ci/updatebot/tooltool-manifests/vc++-2019-runtime.manifest"
|
||||
run:
|
||||
using: run-task
|
||||
cwd: '{checkout}'
|
||||
|
|
@ -110,4 +103,3 @@ jobs:
|
|||
- cloud-sql-proxy-1.25.0
|
||||
- php-windows-7.4.24
|
||||
- arcanist
|
||||
- depot_tools
|
||||
|
|
|
|||
|
|
@ -1,29 +0,0 @@
|
|||
[
|
||||
{
|
||||
"version": "vcruntime140.dll from Microsoft Visual C++ Redistributable for Visual Studio 2019 ver 14.29.30133.0",
|
||||
"size": 97160,
|
||||
"visibility": "internal",
|
||||
"digest": "aa6afd6bea27f554e3646152d8c4f96f7bcaaa4933f8b7c04346e410f93f23cfa6d29362fd5d51ccbb8b6223e094cd89e351f072ad0517553703f5bf9de28778",
|
||||
"algorithm": "sha512",
|
||||
"filename": "vcruntime140.dll",
|
||||
"unpack": false
|
||||
},
|
||||
{
|
||||
"version": "Visual Studio Community 2019, Windows SDK 10.0.19041.0, and a few system dlls Lobotmized for Angle Update",
|
||||
"filename": "vs-sdk-and-windir-shim.zip",
|
||||
"size": 463564917,
|
||||
"algorithm": "sha512",
|
||||
"digest": "20d93b0014ca44a666ca2b5cc570127f24378454889ff0a036df72213cd18140185d2c2e61df40bf1e4c0d9d2dc83a7796af9d2a13252de3c85faad068291945",
|
||||
"visibility": "internal",
|
||||
"unpack": true
|
||||
},
|
||||
{
|
||||
"version": "Windows binaries for depot_tools retrieved with depot_tools revision 7b3351443198f4e7d068999b169385b55a43679a on 2021-12-18",
|
||||
"filename": "depot_tools-preloaded-binaries-7b3351443198f4e7d068999b169385b55a43679a-2021-12-18.zip",
|
||||
"size": 315038144,
|
||||
"algorithm": "sha512",
|
||||
"digest": "250f3f3fcf631c53de1f505c53eb5ba782864fa92111eef0d710a1e7d0ad3da66db2fb8908d7c6d83e149674e976984d679f9a641eb9bea0b5c3d7b4f236920d",
|
||||
"visibility": "internal",
|
||||
"unpack": true
|
||||
}
|
||||
]
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
[
|
||||
{
|
||||
"version": "vcruntime140.dll from Microsoft Visual C++ Redistributable for Visual Studio 2019 ver 14.29.30133.0",
|
||||
"size": 97160,
|
||||
"visibility": "internal",
|
||||
"digest": "aa6afd6bea27f554e3646152d8c4f96f7bcaaa4933f8b7c04346e410f93f23cfa6d29362fd5d51ccbb8b6223e094cd89e351f072ad0517553703f5bf9de28778",
|
||||
"algorithm": "sha512",
|
||||
"filename": "vcruntime140.dll",
|
||||
"unpack": false
|
||||
}
|
||||
]
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/src/workflow/ArcanistDiffWorkflow.php b/src/workflow/ArcanistDiffWorkflow.php
|
||||
index 38aa4b62..c9b7e215 100644
|
||||
--- a/src/workflow/ArcanistDiffWorkflow.php
|
||||
+++ b/src/workflow/ArcanistDiffWorkflow.php
|
||||
@@ -899,7 +899,7 @@ EOTEXT
|
||||
throw new Exception(pht('Repository API is not supported.'));
|
||||
}
|
||||
|
||||
- $limit = 1024 * 1024 * 4;
|
||||
+ $limit = 1024 * 1024 * 12;
|
||||
foreach ($changes as $change) {
|
||||
$size = 0;
|
||||
foreach ($change->getHunks() as $hunk) {
|
||||
|
|
@ -20,29 +20,9 @@ MOZ_FETCHES_PATH="$PWD"
|
|||
#########################################################
|
||||
# Install dependencies
|
||||
|
||||
# Move depot_tools
|
||||
cd "$MOZ_FETCHES_DIR"
|
||||
mv depot_tools.git depot_tools
|
||||
|
||||
|
||||
# Generating a new version of the preloaded depot_tools download can be done by:
|
||||
# 1) Running the task, uncommenting the variable assignment below, uncommenting the
|
||||
# _GENERATE_DEPOT_TOOLS_BINARIES_ section in taskcluster/ci/updatebot/kind.yml,
|
||||
# and ensuring that an angle update will actually take place (so it downloads the depot_tools)
|
||||
# 2) Downloading and sanity-checking the depot_tools-preloaded-binaries-GIT_HASH-DATE.zip artifact
|
||||
# 3) Adding it to tooltool
|
||||
# 4) Updating the updatebot manifest
|
||||
# Note that even for the same git revision the downloaded tools can change, so they are tagged
|
||||
# with both the git hash and the date it was generated
|
||||
|
||||
# export GENERATE_DEPOT_TOOLS_BINARIES=1
|
||||
|
||||
if test -n "$GENERATE_DEPOT_TOOLS_BINARIES"; then
|
||||
cp -r depot_tools depot_tools-from-git
|
||||
fi
|
||||
|
||||
# Git is at /c/Program Files/Git/cmd/git.exe
|
||||
# It's in PATH for this script (confusingly) but not in PATH so we need to add it
|
||||
which git
|
||||
export PATH="/c/Program Files/Git/cmd:$PATH"
|
||||
|
||||
# php & arcanist
|
||||
|
|
@ -55,12 +35,15 @@ cp "$GECKO_PATH/taskcluster/docker/updatebot/windows-php.ini" "$MOZ_FETCHES_DIR/
|
|||
|
||||
cd "$MOZ_FETCHES_DIR/arcanist.git"
|
||||
patch -p1 < "$GECKO_PATH/taskcluster/docker/updatebot/arcanist_windows_stream.patch"
|
||||
patch -p1 < "$GECKO_PATH/taskcluster/docker/updatebot/arcanist_patch_size.patch"
|
||||
cd "$MOZ_FETCHES_DIR"
|
||||
|
||||
export PATH="$MOZ_FETCHES_PATH/php-win:$PATH"
|
||||
export PATH="$MOZ_FETCHES_PATH/arcanist.git/bin:$PATH"
|
||||
|
||||
|
||||
|
||||
ls "$MOZ_FETCHES_PATH/arcanist.git/bin"
|
||||
|
||||
# get Updatebot
|
||||
cd "$MOZ_FETCHES_DIR"
|
||||
git clone https://github.com/mozilla-services/updatebot.git
|
||||
|
|
@ -97,39 +80,6 @@ export PYTHONUNBUFFERED=1
|
|||
cd "$UPDATEBOT_PATH"
|
||||
python3 -m poetry run python3 ./automation.py
|
||||
|
||||
#########################################################
|
||||
if test -n "$GENERATE_DEPOT_TOOLS_BINARIES"; then
|
||||
# Artifacts
|
||||
|
||||
cd "$MOZ_FETCHES_PATH"
|
||||
mv depot_tools depot_tools-from-tc
|
||||
|
||||
# Clean out unneeded files
|
||||
# Need to use cmd because for some reason rm from bash throws 'Access Denied'
|
||||
cmd '/c for /d /r %i in (*__pycache__) do rmdir /s /q %i'
|
||||
rm -rf depot_tools-from-git/.git || true
|
||||
|
||||
# Delete the files that are already in git
|
||||
find depot_tools-from-git -mindepth 1 -maxdepth 1 | sed s/depot_tools-from-git/depot_tools-from-tc/ | while read d; do rm -rf $d; done
|
||||
|
||||
# Make the artifact
|
||||
rm -rf depot_tools-preloaded-binaries #remove it if it existed (i.e. we probably have one from tooltool already)
|
||||
mv depot_tools-from-tc depot_tools-preloaded-binaries
|
||||
|
||||
# zip can't add symbolic links, and exits with an error code. || true avoids a script crash
|
||||
zip -r depot_tools-preloaded-binaries.zip depot_tools-preloaded-binaries/ || true
|
||||
|
||||
# Convoluted way to get the git hash, because we don't have a .git directory
|
||||
# Adding extra print statements just in case we need to debug it
|
||||
GIT_HASH=$(grep depot_tools -A 1 "$GECKO_PATH/taskcluster/ci/fetch/updatebot.yml" | tee /dev/tty | grep revision | tee /dev/tty | awk -F': *' '{print $2}' | tee /dev/tty)
|
||||
DATE=$(date -I)
|
||||
mv depot_tools-preloaded-binaries.zip "depot_tools-preloaded-binaries-$GIT_HASH-$DATE.zip"
|
||||
|
||||
# Put the artifact into the directory we will look for it
|
||||
mkdir -p "$GECKO_PATH/obj-build/depot_tools" || true
|
||||
mv "depot_tools-preloaded-binaries-$GIT_HASH-$DATE.zip" "$GECKO_PATH/obj-build/depot_tools"
|
||||
fi
|
||||
|
||||
#########################################################
|
||||
echo "Killing SQL Proxy"
|
||||
taskkill -f -im cloud_sql_proxy.exe || true
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче