Skip to content

Commit b99e908

Browse files
committed
TESTING: tools
1 parent 71f5b1c commit b99e908

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

.github/workflows/tools.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -294,8 +294,8 @@ jobs:
294294
allow-prereleases: true
295295
- run: ${{ matrix.run }}
296296
if: github.event_name == 'schedule' || inputs.id == 'all' || inputs.id == matrix.id
297-
env:
298-
GITHUB_TOKEN: ${{ secrets.GH_USER_TOKEN }}
297+
# env:
298+
# GITHUB_TOKEN: ${{ secrets.GH_USER_TOKEN }}
299299
- name: Generate commit message if not set
300300
if: env.COMMIT_MSG == '' && (github.event_name == 'schedule' || inputs.id == 'all' || inputs.id == matrix.id)
301301
run: |
@@ -305,7 +305,7 @@ jobs:
305305
# Creates a PR or update the Action's existing PR, or
306306
# no-op if the base branch is already up-to-date.
307307
with:
308-
token: ${{ secrets.GH_USER_TOKEN }}
308+
# token: ${{ secrets.GH_USER_TOKEN }}
309309
branch: actions/tools-update-${{ matrix.id }} # Custom branch *just* for this Action.
310310
delete-branch: true
311311
commit-message: ${{ env.COMMIT_MSG }}

tools/dep_updaters/update-inspector-protocol.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
#!/bin/sh
2-
set -e
2+
set -ex
33
# Shell script to update inspector_protocol in the source tree to the version same with V8's.
44

55
BASE_DIR=$(cd "$(dirname "$0")/../.." && pwd)
66
DEPS_DIR="$BASE_DIR/deps"
77

8+
git status --porcelain
9+
810
# shellcheck disable=SC1091
911
. "$BASE_DIR/tools/dep_updaters/utils.sh"
1012

tools/inspector_protocol/roll.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ def RunCmd(cmd):
3535
(stdoutdata, stderrdata) = p.communicate()
3636
if p.returncode != 0:
3737
raise Exception('%s: exit status %d', str(cmd), p.returncode)
38+
print(f"error: {stderrdata.decode('utf-8') if stderrdata else 'None'}")
3839
return stdoutdata.decode('utf-8')
3940

4041

@@ -43,7 +44,11 @@ def CheckRepoIsClean(path):
4344
# If path isn't a git repo, this will throw and exception.
4445
# And if it is a git repo and 'git status' has anything interesting to say,
4546
# then it's not clean (uncommitted files etc.)
46-
if len(RunCmd(['git', 'status', '--porcelain'])) != 0:
47+
res = RunCmd(['git', 'status', '--porcelain'])
48+
print(f"result type: {type(res)}, len: {len(res)}")
49+
print(f"result: {res}")
50+
if len(res) != 0:
51+
sys.stdout.flush()
4752
raise Exception('%s is not a clean git repo (run git status)' % path)
4853

4954

@@ -125,10 +130,6 @@ def main(argv):
125130
CheckRepoIsClean(upstream)
126131
CheckRepoIsClean(downstream)
127132
CheckRepoIsInspectorProtocolCheckout(upstream)
128-
# Check that the destination Git repo isn't at the main branch - it's
129-
# generally a bad idea to check into the main branch, so we catch this
130-
# common pilot error here early.
131-
CheckRepoIsNotAtMainBranch(downstream)
132133

133134
# Read V8's inspector_protocol revision
134135
v8_ip_revision = ReadV8IPRevision(downstream)

0 commit comments

Comments
 (0)