Skip to content

Commit

Permalink
chore: bump chromium to 116.0.5845.190 (26-x-y) (#39887)
Browse files Browse the repository at this point in the history
* chore: bump chromium in DEPS to 116.0.5845.190

* chore: 4869108: handle absolute and relative gn imports in autoninja

https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4869108
(cherry picked from commit d94c772)

* chore: set GOMA_DIR for autoninja

(cherry picked from commit 94f24bd)

* Revert "chore: 4869108: handle absolute and relative gn imports in autoninja"

This reverts commit 8b567d7.

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
  • Loading branch information
electron-roller[bot] and jkleinsc committed Sep 18, 2023
1 parent 90a311d commit 496577d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .circleci/config/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ step-setup-goma-for-build: &step-setup-goma-for-build
exit 1
fi
echo 'export GN_GOMA_FILE='`node -e "console.log(require('./src/utils/goma.js').gnFilePath)"` >> $BASH_ENV
echo 'export LOCAL_GOMA_DIR='`node -e "console.log(require('./src/utils/goma.js').dir)"` >> $BASH_ENV
echo 'export GOMA_DIR='`node -e "console.log(require('./src/utils/goma.js').dir)"` >> $BASH_ENV
echo 'export GOMA_FALLBACK_ON_AUTH_FAILURE=true' >> $BASH_ENV
cd ..
touch "${TMPDIR:=/tmp}"/.goma-ready
Expand Down Expand Up @@ -730,8 +730,8 @@ step-show-goma-stats: &step-show-goma-stats
command: |
set +e
set +o pipefail
$LOCAL_GOMA_DIR/goma_ctl.py stat
$LOCAL_GOMA_DIR/diagnose_goma_log.py
$GOMA_DIR/goma_ctl.py stat
$GOMA_DIR/diagnose_goma_log.py
true
when: always
background: true
Expand Down
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'

vars = {
'chromium_version':
'116.0.5845.189',
'116.0.5845.190',
'node_version':
'v18.16.1',
'nan_version':
Expand Down

0 comments on commit 496577d

Please sign in to comment.