From 4d5de0835f80da6aa90d5875b027e577837e393b Mon Sep 17 00:00:00 2001 From: Paul Gschwendtner Date: Tue, 16 Oct 2018 22:21:47 +0200 Subject: [PATCH] chore: update required statuses for github robot * Currently the merge status is always pending because the CircleCI job workflows have been changed. --- .circleci/config.yml | 3 +++ .github/angular-robot.yml | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 038cf87e7657..c37d478f274c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -121,6 +121,9 @@ jobs: # ---------------------------------------------------------------------------------------- # Workflow definitions. A workflow usually groups multiple jobs together. This is useful if # one job depends on another. +# +# NOTE: When updating this configuration section, make sure to update GitHub robot +# config to match the new workflow jobs. # ---------------------------------------------------------------------------------------- workflows: version: 2 diff --git a/.github/angular-robot.yml b/.github/angular-robot.yml index 015a870c9539..46537b424376 100644 --- a/.github/angular-robot.yml +++ b/.github/angular-robot.yml @@ -52,7 +52,9 @@ merge: requiredStatuses: # TODO(josephperrott): reenable once CI flakiness is addressed # - "continuous-integration/travis-ci/pr" - - "ci/circleci: build" + - "ci/circleci: lint" + - "ci/circleci: bazel_build_test" + - "ci/circleci: tests_local_browsers" # the comment that will be added when the merge label is added despite failing checks, leave empty or set to false to disable # {{MERGE_LABEL}} will be replaced by the value of the mergeLabel option