From 3b2aa1e44ba845ca488a5dd0f8e364b16fbbbd79 Mon Sep 17 00:00:00 2001 From: Sebastian Silbermann Date: Mon, 30 Mar 2020 15:05:14 +0200 Subject: [PATCH 1/2] ci: run prettier first the following task will fail if the format is out-of-date so check format first --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0a589b84f32e8e..4e921f7fe7d40b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -106,6 +106,9 @@ jobs: steps: - checkout - install_js + - run: + name: Check if yarn prettier was run + command: yarn prettier check-changed - run: name: Generate PropTypes command: yarn proptypes --disable-cache @@ -118,9 +121,6 @@ jobs: - run: name: '`yarn docs:api` changes committed?' command: git diff --exit-code - - run: - name: Check if yarn prettier was run - command: yarn prettier check-changed - run: name: Lint command: yarn lint:ci From c5c10f3c51903dc1b401c849a5e7d12d0e698591 Mon Sep 17 00:00:00 2001 From: Sebastian Silbermann Date: Mon, 30 Mar 2020 15:05:42 +0200 Subject: [PATCH 2/2] PR: needs rebase -> PR: out-of-date --- .github/workflows/maintenance.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maintenance.yml b/.github/workflows/maintenance.yml index a9978c797a1a0c..2ab4b42bd8d739 100644 --- a/.github/workflows/maintenance.yml +++ b/.github/workflows/maintenance.yml @@ -14,7 +14,7 @@ jobs: - name: check if prs are dirty uses: eps1lon/actions-label-merge-conflict@releases/1.x with: - dirtyLabel: 'PR: needs rebase' + dirtyLabel: 'PR: out-of-date' removeOnDirtyLabel: 'PR: ready to ship' repoToken: '${{ secrets.GITHUB_TOKEN }}' retryAfter: 130