* chore: revert clang roll

* Revert "build: temporarily disable WOA testing (#28916)"

This reverts commit 5a9a298a74.
This commit is contained in:
Robo 2021-05-03 06:53:51 -07:00 коммит произвёл GitHub
Родитель 9601dc59fc
Коммит dc0c52eaa7
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
3 изменённых файлов: 25 добавлений и 3 удалений

Просмотреть файл

@ -229,7 +229,5 @@ deploy_script:
& python script\release\uploaders\upload.py --verbose
}
} elseif (Test-Path Env:\TEST_WOA) {
# temporarily disabled due to issues from chromium roll
# node script/release/ci-release-build.js --job=electron-woa-testing --ci=VSTS --armTest --appveyorJobId=$env:APPVEYOR_JOB_ID $env:APPVEYOR_REPO_BRANCH
echo "Skipping WOA testing for now"
node script/release/ci-release-build.js --job=electron-woa-testing --ci=VSTS --armTest --appveyorJobId=$env:APPVEYOR_JOB_ID $env:APPVEYOR_REPO_BRANCH
}

Просмотреть файл

@ -106,3 +106,4 @@ fix_add_check_for_sandbox_then_result.patch
extend_apply_webpreferences.patch
fix_expose_decrementcapturercount_in_web_contents_impl.patch
add_setter_for_browsermainloop_result_code.patch
revert_roll_clang_llvmorg-13-init-7051-gdad5caa5-2.patch

Просмотреть файл

@ -0,0 +1,23 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: deepak1556 <hop2deep@gmail.com>
Date: Fri, 30 Apr 2021 16:36:14 -0700
Subject: Revert "Roll clang llvmorg-13-init-7051-gdad5caa5-2 :
llvmorg-13-init-7296-ga749bd76-1"
This reverts commit 6da81f26271d1efe8c3da6dd7cfb409d35763a35.
This broke WoA builds, ref: https://github.com/electron/electron/issues/28876
diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py
index 603d9d165cf43b5efb1c18501eb4c29d6f8d558b..33cd83fc835e0204a4aba0e17d2152b3021a4c35 100755
--- a/tools/clang/scripts/update.py
+++ b/tools/clang/scripts/update.py
@@ -39,7 +39,7 @@ import zipfile
# https://chromium.googlesource.com/chromium/src/+/main/docs/updating_clang.md
# Reverting problematic clang rolls is safe, though.
# This is the output of `git describe` and is usable as a commit-ish.
-CLANG_REVISION = 'llvmorg-13-init-7296-ga749bd76'
+CLANG_REVISION = 'llvmorg-13-init-7051-gdad5caa5'
CLANG_SUB_REVISION = 2
PACKAGE_VERSION = '%s-%s' % (CLANG_REVISION, CLANG_SUB_REVISION)