Remove .fp logic from CheckGeneratedFiles bot
Change-Id: I20541992cc85bf52c5672c437fe6baa823841987
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/426397
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
diff --git a/infra/bots/recipes/check_generated_files.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json b/infra/bots/recipes/check_generated_files.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json
index 48ae9b5..88890b2 100644
--- a/infra/bots/recipes/check_generated_files.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json
+++ b/infra/bots/recipes/check_generated_files.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json
@@ -172,31 +172,6 @@
},
{
"cmd": [
- "python",
- "-u",
- "import os\nimport subprocess\n\nfor r, d, files in os.walk(os.path.join('[START_DIR]/cache/work/skia', 'src')):\n for f in files:\n if f.endswith('.fp'):\n path = os.path.join(r, f)\n print 'touch %s' % path\n subprocess.check_call(['touch', path])\n"
- ],
- "cwd": "[START_DIR]/cache/work/skia",
- "env": {
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
- },
- "name": "touch fp files",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@import os@@@",
- "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@for r, d, files in os.walk(os.path.join('[START_DIR]/cache/work/skia', 'src')):@@@",
- "@@@STEP_LOG_LINE@python.inline@ for f in files:@@@",
- "@@@STEP_LOG_LINE@python.inline@ if f.endswith('.fp'):@@@",
- "@@@STEP_LOG_LINE@python.inline@ path = os.path.join(r, f)@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'touch %s' % path@@@",
- "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['touch', path])@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
diff --git a/infra/bots/recipes/check_generated_files.py b/infra/bots/recipes/check_generated_files.py
index 437f2d7..83ea8a4 100644
--- a/infra/bots/recipes/check_generated_files.py
+++ b/infra/bots/recipes/check_generated_files.py
@@ -43,21 +43,6 @@
api.step('generate gl interfaces',
cmd=['make', '-C', 'tools/gpu/gl/interface', 'generate'])
- # Touch all .fp files so that the generated files are rebuilt.
- api.run(
- api.python.inline,
- 'touch fp files',
- program="""import os
-import subprocess
-
-for r, d, files in os.walk(os.path.join('%s', 'src')):
- for f in files:
- if f.endswith('.fp'):
- path = os.path.join(r, f)
- print 'touch %%s' %% path
- subprocess.check_call(['touch', path])
-""" % cwd)
-
# Run GN, regenerate the SKSL files, and make sure rewritten #includes work.
api.build(checkout_root=checkout_root,
out_dir=api.vars.build_dir.join('out', 'Release'))
