Revert "Run formatter and update reference in CI" This reverts commit bed604c5285d12bb3f986b8b2395396042d0980d. Reason for revert: This doesn't work in CQ. https://ci.chromium.org/ui/p/gn/builders/try/linux/b8683656153016286785/overview ``` /b/s/w/ir/x/w/gn/tools/update_reference.sh: line 12: ninja: command not found ``` Original change's description: > Run formatter and update reference in CI > > Change-Id: I6ca5a45dd11f7e6185912aad9b52f5b26a6a6964 > Reviewed-on: https://gn-review.googlesource.com/c/gn/+/22062 > Reviewed-by: Takuto Ikuta <tikuta@google.com> > Commit-Queue: Matt Stark <msta@google.com> TBR=tikuta@google.com,gn-scoped@luci-project-accounts.iam.gserviceaccount.com,msta@google.com No-Presubmit: true No-Tree-Checks: true No-Try: true Change-Id: I8d961255d120ab00541b5d22d112e7cb6d4abfd4 Reviewed-on: https://gn-review.googlesource.com/c/gn/+/22180 Reviewed-by: Junji Watanabe <jwata@google.com> Commit-Queue: Takuto Ikuta <tikuta@google.com>
diff --git a/infra/recipes/gn.expected/ci_linux.json b/infra/recipes/gn.expected/ci_linux.json index 5503e35..5a76c33 100644 --- a/infra/recipes/gn.expected/ci_linux.json +++ b/infra/recipes/gn.expected/ci_linux.json
@@ -664,67 +664,6 @@ ] }, { - "cmd": [ - "[START_DIR]/gn/tools/run_formatter.sh", - "--diff" - ], - "cwd": "[START_DIR]/gn", - "env": { - "AR": "[START_DIR]/cipd/bin/llvm-ar", - "CC": "[START_DIR]/cipd/bin/clang", - "CFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot", - "CLANG_FORMAT": "[START_DIR]/cipd/bin/clang-format", - "CXX": "[START_DIR]/cipd/bin/clang++", - "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" - }, - "luci_context": { - "realm": { - "name": "gn:ci" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "debug.linux-amd64.Check tools/run_formatter.sh", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@2@@@" - ] - }, - { - "cmd": [ - "[START_DIR]/gn/tools/update_reference.sh", - "--diff" - ], - "cwd": "[START_DIR]/gn", - "env": { - "AR": "[START_DIR]/cipd/bin/llvm-ar", - "CC": "[START_DIR]/cipd/bin/clang", - "CFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot", - "CXX": "[START_DIR]/cipd/bin/clang++", - "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" - }, - "luci_context": { - "realm": { - "name": "gn:ci" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "debug.linux-amd64.Check tools/update_reference.sh", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@2@@@" - ] - }, - { "cmd": [], "name": "release" }, @@ -830,67 +769,6 @@ ] }, { - "cmd": [ - "[START_DIR]/gn/tools/run_formatter.sh", - "--diff" - ], - "cwd": "[START_DIR]/gn", - "env": { - "AR": "[START_DIR]/cipd/bin/llvm-ar", - "CC": "[START_DIR]/cipd/bin/clang", - "CFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot", - "CLANG_FORMAT": "[START_DIR]/cipd/bin/clang-format", - "CXX": "[START_DIR]/cipd/bin/clang++", - "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" - }, - "luci_context": { - "realm": { - "name": "gn:ci" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "release.linux-amd64.Check tools/run_formatter.sh", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@2@@@" - ] - }, - { - "cmd": [ - "[START_DIR]/gn/tools/update_reference.sh", - "--diff" - ], - "cwd": "[START_DIR]/gn", - "env": { - "AR": "[START_DIR]/cipd/bin/llvm-ar", - "CC": "[START_DIR]/cipd/bin/clang", - "CFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot", - "CXX": "[START_DIR]/cipd/bin/clang++", - "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" - }, - "luci_context": { - "realm": { - "name": "gn:ci" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "release.linux-amd64.Check tools/update_reference.sh", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@2@@@" - ] - }, - { "cmd": [], "name": "release.linux-amd64.upload", "~followup_annotations": [
diff --git a/infra/recipes/gn.expected/cipd_exists.json b/infra/recipes/gn.expected/cipd_exists.json index be06266..0c22ae2 100644 --- a/infra/recipes/gn.expected/cipd_exists.json +++ b/infra/recipes/gn.expected/cipd_exists.json
@@ -664,67 +664,6 @@ ] }, { - "cmd": [ - "[START_DIR]/gn/tools/run_formatter.sh", - "--diff" - ], - "cwd": "[START_DIR]/gn", - "env": { - "AR": "[START_DIR]/cipd/bin/llvm-ar", - "CC": "[START_DIR]/cipd/bin/clang", - "CFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot", - "CLANG_FORMAT": "[START_DIR]/cipd/bin/clang-format", - "CXX": "[START_DIR]/cipd/bin/clang++", - "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" - }, - "luci_context": { - "realm": { - "name": "infra-internal:ci" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "debug.linux-amd64.Check tools/run_formatter.sh", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@2@@@" - ] - }, - { - "cmd": [ - "[START_DIR]/gn/tools/update_reference.sh", - "--diff" - ], - "cwd": "[START_DIR]/gn", - "env": { - "AR": "[START_DIR]/cipd/bin/llvm-ar", - "CC": "[START_DIR]/cipd/bin/clang", - "CFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot", - "CXX": "[START_DIR]/cipd/bin/clang++", - "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" - }, - "luci_context": { - "realm": { - "name": "infra-internal:ci" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "debug.linux-amd64.Check tools/update_reference.sh", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@2@@@" - ] - }, - { "cmd": [], "name": "release" }, @@ -830,67 +769,6 @@ ] }, { - "cmd": [ - "[START_DIR]/gn/tools/run_formatter.sh", - "--diff" - ], - "cwd": "[START_DIR]/gn", - "env": { - "AR": "[START_DIR]/cipd/bin/llvm-ar", - "CC": "[START_DIR]/cipd/bin/clang", - "CFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot", - "CLANG_FORMAT": "[START_DIR]/cipd/bin/clang-format", - "CXX": "[START_DIR]/cipd/bin/clang++", - "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" - }, - "luci_context": { - "realm": { - "name": "infra-internal:ci" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "release.linux-amd64.Check tools/run_formatter.sh", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@2@@@" - ] - }, - { - "cmd": [ - "[START_DIR]/gn/tools/update_reference.sh", - "--diff" - ], - "cwd": "[START_DIR]/gn", - "env": { - "AR": "[START_DIR]/cipd/bin/llvm-ar", - "CC": "[START_DIR]/cipd/bin/clang", - "CFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot", - "CXX": "[START_DIR]/cipd/bin/clang++", - "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" - }, - "luci_context": { - "realm": { - "name": "infra-internal:ci" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "release.linux-amd64.Check tools/update_reference.sh", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@2@@@" - ] - }, - { "cmd": [], "name": "release.linux-amd64.upload", "~followup_annotations": [
diff --git a/infra/recipes/gn.expected/cipd_register.json b/infra/recipes/gn.expected/cipd_register.json index 8a529a4..4303782 100644 --- a/infra/recipes/gn.expected/cipd_register.json +++ b/infra/recipes/gn.expected/cipd_register.json
@@ -664,67 +664,6 @@ ] }, { - "cmd": [ - "[START_DIR]/gn/tools/run_formatter.sh", - "--diff" - ], - "cwd": "[START_DIR]/gn", - "env": { - "AR": "[START_DIR]/cipd/bin/llvm-ar", - "CC": "[START_DIR]/cipd/bin/clang", - "CFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot", - "CLANG_FORMAT": "[START_DIR]/cipd/bin/clang-format", - "CXX": "[START_DIR]/cipd/bin/clang++", - "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" - }, - "luci_context": { - "realm": { - "name": "infra-internal:ci" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "debug.linux-amd64.Check tools/run_formatter.sh", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@2@@@" - ] - }, - { - "cmd": [ - "[START_DIR]/gn/tools/update_reference.sh", - "--diff" - ], - "cwd": "[START_DIR]/gn", - "env": { - "AR": "[START_DIR]/cipd/bin/llvm-ar", - "CC": "[START_DIR]/cipd/bin/clang", - "CFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot", - "CXX": "[START_DIR]/cipd/bin/clang++", - "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" - }, - "luci_context": { - "realm": { - "name": "infra-internal:ci" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "debug.linux-amd64.Check tools/update_reference.sh", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@2@@@" - ] - }, - { "cmd": [], "name": "release" }, @@ -830,67 +769,6 @@ ] }, { - "cmd": [ - "[START_DIR]/gn/tools/run_formatter.sh", - "--diff" - ], - "cwd": "[START_DIR]/gn", - "env": { - "AR": "[START_DIR]/cipd/bin/llvm-ar", - "CC": "[START_DIR]/cipd/bin/clang", - "CFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot", - "CLANG_FORMAT": "[START_DIR]/cipd/bin/clang-format", - "CXX": "[START_DIR]/cipd/bin/clang++", - "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" - }, - "luci_context": { - "realm": { - "name": "infra-internal:ci" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "release.linux-amd64.Check tools/run_formatter.sh", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@2@@@" - ] - }, - { - "cmd": [ - "[START_DIR]/gn/tools/update_reference.sh", - "--diff" - ], - "cwd": "[START_DIR]/gn", - "env": { - "AR": "[START_DIR]/cipd/bin/llvm-ar", - "CC": "[START_DIR]/cipd/bin/clang", - "CFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot", - "CXX": "[START_DIR]/cipd/bin/clang++", - "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" - }, - "luci_context": { - "realm": { - "name": "infra-internal:ci" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "release.linux-amd64.Check tools/update_reference.sh", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@2@@@" - ] - }, - { "cmd": [], "name": "release.linux-amd64.upload", "~followup_annotations": [
diff --git a/infra/recipes/gn.expected/cq_linux.json b/infra/recipes/gn.expected/cq_linux.json index 5323e49..035f993 100644 --- a/infra/recipes/gn.expected/cq_linux.json +++ b/infra/recipes/gn.expected/cq_linux.json
@@ -715,67 +715,6 @@ ] }, { - "cmd": [ - "[START_DIR]/gn/tools/run_formatter.sh", - "--diff" - ], - "cwd": "[START_DIR]/gn", - "env": { - "AR": "[START_DIR]/cipd/bin/llvm-ar", - "CC": "[START_DIR]/cipd/bin/clang", - "CFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot", - "CLANG_FORMAT": "[START_DIR]/cipd/bin/clang-format", - "CXX": "[START_DIR]/cipd/bin/clang++", - "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" - }, - "luci_context": { - "realm": { - "name": "gn:try" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "debug.linux-amd64.Check tools/run_formatter.sh", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@2@@@" - ] - }, - { - "cmd": [ - "[START_DIR]/gn/tools/update_reference.sh", - "--diff" - ], - "cwd": "[START_DIR]/gn", - "env": { - "AR": "[START_DIR]/cipd/bin/llvm-ar", - "CC": "[START_DIR]/cipd/bin/clang", - "CFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot", - "CXX": "[START_DIR]/cipd/bin/clang++", - "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" - }, - "luci_context": { - "realm": { - "name": "gn:try" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "debug.linux-amd64.Check tools/update_reference.sh", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@2@@@" - ] - }, - { "cmd": [], "name": "release" }, @@ -881,67 +820,6 @@ ] }, { - "cmd": [ - "[START_DIR]/gn/tools/run_formatter.sh", - "--diff" - ], - "cwd": "[START_DIR]/gn", - "env": { - "AR": "[START_DIR]/cipd/bin/llvm-ar", - "CC": "[START_DIR]/cipd/bin/clang", - "CFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot", - "CLANG_FORMAT": "[START_DIR]/cipd/bin/clang-format", - "CXX": "[START_DIR]/cipd/bin/clang++", - "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" - }, - "luci_context": { - "realm": { - "name": "gn:try" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "release.linux-amd64.Check tools/run_formatter.sh", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@2@@@" - ] - }, - { - "cmd": [ - "[START_DIR]/gn/tools/update_reference.sh", - "--diff" - ], - "cwd": "[START_DIR]/gn", - "env": { - "AR": "[START_DIR]/cipd/bin/llvm-ar", - "CC": "[START_DIR]/cipd/bin/clang", - "CFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot", - "CXX": "[START_DIR]/cipd/bin/clang++", - "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" - }, - "luci_context": { - "realm": { - "name": "gn:try" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "release.linux-amd64.Check tools/update_reference.sh", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@2@@@" - ] - }, - { "cmd": [], "name": "release.linux-amd64.upload", "~followup_annotations": [
diff --git a/infra/recipes/gn.py b/infra/recipes/gn.py index 8cd05c6..f4723bd 100644 --- a/infra/recipes/gn.py +++ b/infra/recipes/gn.py
@@ -270,13 +270,6 @@ if target.is_host: api.step('test', [src_dir.join('out', 'gn_unittests')]) - if api.platform.is_linux: - with api.context(env={'CLANG_FORMAT': cipd_dir.join('bin', 'clang-format')}): - api.step('Check tools/run_formatter.sh', - [src_dir.join('tools', 'run_formatter.sh'), '--diff']) - api.step('Check tools/update_reference.sh', - [src_dir.join('tools', 'update_reference.sh'), '--diff']) - if config['name'] != 'release': continue