File tree Expand file tree Collapse file tree 8 files changed +22
-18
lines changed Expand file tree Collapse file tree 8 files changed +22
-18
lines changed Original file line number Diff line number Diff line change 11disturl "https://electronjs.org/headers"
2- target "13.5.2 "
2+ target "17.0.0 "
33runtime "electron"
44build_from_source "true"
Original file line number Diff line number Diff line change 1- 2022-02-24T13:55:48.169Z
1+ 2022-02-16T17:23:04.383Z
Original file line number Diff line number Diff line change 9999
100100 if [ -z "$CC" ] || [ -z "$CXX" ]; then
101101 # Download clang based on chromium revision used by vscode
102- curl -s https://raw.githubusercontent.com/chromium/chromium/91 .0.4472.164 /tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux
102+ curl -s https://raw.githubusercontent.com/chromium/chromium/98 .0.4758.74 /tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux
103103 # Download libcxx headers and objects from upstream electron releases
104104 DEBUG=libcxx-fetcher \
105105 VSCODE_LIBCXX_OBJECTS_DIR=$PWD/.build/libcxx-objects \
@@ -109,9 +109,9 @@ steps:
109109 node build/linux/libcxx-fetcher.js
110110 # Set compiler toolchain
111111 # Flags for the client build are based on
112- # https://source.chromium.org/chromium/chromium/src/+/refs/tags/91 .0.4472.164 :build/config/arm.gni
113- # https://source.chromium.org/chromium/chromium/src/+/refs/tags/91 .0.4472.164 :build/config/compiler/BUILD.gn
114- # https://source.chromium.org/chromium/chromium/src/+/refs/tags/91 .0.4472.164 :build/config/c++/BUILD.gn
112+ # https://source.chromium.org/chromium/chromium/src/+/refs/tags/98 .0.4758.74 :build/config/arm.gni
113+ # https://source.chromium.org/chromium/chromium/src/+/refs/tags/98 .0.4758.74 :build/config/compiler/BUILD.gn
114+ # https://source.chromium.org/chromium/chromium/src/+/refs/tags/98 .0.4758.74 :build/config/c++/BUILD.gn
115115 export CC=$PWD/.build/CR_Clang/bin/clang
116116 export CXX=$PWD/.build/CR_Clang/bin/clang++
117117 export CXXFLAGS="-nostdinc++ -D_LIBCPP_HAS_NO_VENDOR_AVAILABILITY_ANNOTATIONS -D__NO_INLINE__ -isystem$PWD/.build/libcxx_headers/include -isystem$PWD/.build/libcxxabi_headers/include -fPIC -flto=thin -fsplit-lto-unit"
Original file line number Diff line number Diff line change @@ -189,6 +189,7 @@ stages:
189189 set -e
190190 export npm_config_arch=$(NPM_ARCH)
191191
192+ <<<<<<< HEAD
192193 if [ -z "$CC" ] || [ -z "$CXX" ]; then
193194 # Download clang based on chromium revision used by vscode
194195 curl -s https://raw.githubusercontent.com/chromium/chromium/91.0.4472.164/tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux
@@ -204,6 +205,9 @@ stages:
204205 export CXX=$PWD/.build/CR_Clang/bin/clang++
205206 export CXXFLAGS="-nostdinc++ -D_LIBCPP_HAS_NO_VENDOR_AVAILABILITY_ANNOTATIONS -isystem$PWD/.build/libcxx_headers/include -isystem$PWD/.build/libcxxabi_headers/include -fPIC -flto=thin -fsplit-lto-unit"
206207 export LDFLAGS="-stdlib=libc++ -fuse-ld=lld -flto=thin -fsplit-lto-unit -L$PWD/.build/libcxx-objects -lc++abi"
208+ =======
209+ if [ "$VSCODE_ARCH" == "x64" ]; then
210+ >>>>>>> f90f60e956e (chore: bump [email protected] ) 207211 export VSCODE_REMOTE_CC=$(which gcc)
208212 export VSCODE_REMOTE_CXX=$(which g++)
209213 fi
Original file line number Diff line number Diff line change 66 "git" : {
77 "name" : " chromium" ,
88 "repositoryUrl" : " https://chromium.googlesource.com/chromium/src" ,
9- "commitHash" : " 8a33e05d162c4f39afa2dcb150e8c2548aa4ccea "
9+ "commitHash" : " a50dd58df713ebe975e3b5306acf6167c253f38a "
1010 }
1111 },
1212 "licenseDetail" : [
4040 " SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
4141 ],
4242 "isOnlyProductionDependency" : true ,
43- "version" : " 91 .0.4472.164 "
43+ "version" : " 98 .0.4758.74 "
4444 },
4545 {
4646 "component" : {
4747 "type" : " git" ,
4848 "git" : {
4949 "name" : " nodejs" ,
5050 "repositoryUrl" : " https://github.com/nodejs/node" ,
51- "commitHash" : " bd60e93357a118204ea238d94e7a9e4209d93062 "
51+ "commitHash" : " 40ecd5601193c316e62e9216e8a4259130686208 "
5252 }
5353 },
5454 "isOnlyProductionDependency" : true ,
55- "version" : " 14.16 .0"
55+ "version" : " 16.13 .0"
5656 },
5757 {
5858 "component" : {
5959 "type" : " git" ,
6060 "git" : {
6161 "name" : " electron" ,
6262 "repositoryUrl" : " https://github.com/electron/electron" ,
63- "commitHash" : " 2727847acabd39933ccd95b92f2c12454c0a24e7 "
63+ "commitHash" : " 34769dd9818e4222ab9cfff93983abae2d1ebdc5 "
6464 }
6565 },
6666 "isOnlyProductionDependency" : true ,
6767 "license" : " MIT" ,
68- "version" : " 13.5.2 "
68+ "version" : " 17.0.0 "
6969 },
7070 {
7171 "component" : {
Original file line number Diff line number Diff line change 136136 "cssnano" : " ^4.1.11" ,
137137 "debounce" : " ^1.0.0" ,
138138 "deemon" : " ^1.4.0" ,
139- "electron" : " 13.5.2 " ,
139+ "electron" : " 17.0.0 " ,
140140 "eslint" : " 8.7.0" ,
141141 "eslint-plugin-header" : " 3.1.1" ,
142142 "eslint-plugin-jsdoc" : " ^19.1.0" ,
Original file line number Diff line number Diff line change 11disturl "http://nodejs.org/dist"
2- target "14.16 .0"
2+ target "16.13 .0"
33runtime "node"
44build_from_source "true"
Original file line number Diff line number Diff line change @@ -4354,10 +4354,10 @@ electron-to-chromium@^1.4.17:
43544354 resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.45.tgz#cf1144091d6683cbd45a231954a745f02fb24598"
43554355 integrity sha512-czF9eYVuOmlY/vxyMQz2rGlNSjZpxNQYBe1gmQv7al171qOIhgyO9k7D5AKlgeTCSPKk+LHhj5ZyIdmEub9oNg==
43564356
4357- electron@13.5.2 :
4358- version "13.5.2 "
4359- resolved "https://registry.yarnpkg.com/electron/-/electron-13.5.2 .tgz#5c5826e58a5e12bb5ca8047b789d07b45260ecbc "
4360- integrity sha512-CPakwDpy5m8dL0383F5uJboQcVtn9bT/+6/wdDKo8LuTUO9aER1TF41v7feZgZW2c+UwoGPWa814ElSQ3qta2A ==
4357+ electron@17.0.0 :
4358+ version "17.0.0 "
4359+ resolved "https://registry.yarnpkg.com/electron/-/electron-17.0.0 .tgz#60f00f3e3c657020e807a519700213943468b4d1 "
4360+ integrity sha512-3UXcBQMwbMWdPvGHaSdPMluHrd+/bc+K143MyvE5zVZ+S1XCHt4sau7dj6svJHns5llN0YG/c6h/vRfadIp8Zg ==
43614361 dependencies:
43624362 "@electron/get" "^1.0.1"
43634363 "@types/node" "^14.6.2"
You can’t perform that action at this time.
0 commit comments