From 4af19fcaeb7324423917a33abbd2ce76015aafce Mon Sep 17 00:00:00 2001 From: Helena Li Date: Fri, 4 Feb 2022 18:06:18 -0800 Subject: [PATCH 1/6] remove peer reliability --- buildkite/src/Jobs/Test/TestnetIntegrationTests.dhall | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildkite/src/Jobs/Test/TestnetIntegrationTests.dhall b/buildkite/src/Jobs/Test/TestnetIntegrationTests.dhall index f7db3e0f849..e0931a37937 100644 --- a/buildkite/src/Jobs/Test/TestnetIntegrationTests.dhall +++ b/buildkite/src/Jobs/Test/TestnetIntegrationTests.dhall @@ -24,7 +24,7 @@ in Pipeline.build Pipeline.Config::{ }, steps = [ TestExecutive.build "integration_tests", - TestExecutive.execute "peers-reliability" dependsOn, + -- TestExecutive.execute "peers-reliability" dependsOn, TestExecutive.execute "chain-reliability" dependsOn, TestExecutive.execute "payment" dependsOn, TestExecutive.execute "gossip-consis" dependsOn, From 63b55d01ee6cd116e26ca5d4ffce11e8e8d9d2b1 Mon Sep 17 00:00:00 2001 From: Helena Li Date: Mon, 7 Feb 2022 15:10:40 -0800 Subject: [PATCH 2/6] fix dirty when logic --- buildkite/src/Command/MinaArtifact.dhall | 1 + 1 file changed, 1 insertion(+) diff --git a/buildkite/src/Command/MinaArtifact.dhall b/buildkite/src/Command/MinaArtifact.dhall index c5e6f411356..b8f14c94eb8 100644 --- a/buildkite/src/Command/MinaArtifact.dhall +++ b/buildkite/src/Command/MinaArtifact.dhall @@ -20,6 +20,7 @@ let dirtyWhen = [ S.strictlyStart (S.contains "buildkite/src/Command/MinaArtifact"), S.exactly "buildkite/scripts/build-artifact" "sh", S.exactly "buildkite/scripts/connect-to-mainnet-on-compatible" "sh", + S.strictlyStart (S.contains "buildkite/src/Jobs/Test/TestnetIntegrationTest"), S.strictlyStart (S.contains "dockerfiles"), S.strictlyStart (S.contains "scripts") ] From a5c43ba3bca46c3e934f25daea7a8979c3e16c28 Mon Sep 17 00:00:00 2001 From: Helena Li Date: Mon, 7 Feb 2022 15:29:06 -0800 Subject: [PATCH 3/6] make it even looser --- buildkite/src/Command/MinaArtifact.dhall | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildkite/src/Command/MinaArtifact.dhall b/buildkite/src/Command/MinaArtifact.dhall index b8f14c94eb8..092d4594374 100644 --- a/buildkite/src/Command/MinaArtifact.dhall +++ b/buildkite/src/Command/MinaArtifact.dhall @@ -20,7 +20,7 @@ let dirtyWhen = [ S.strictlyStart (S.contains "buildkite/src/Command/MinaArtifact"), S.exactly "buildkite/scripts/build-artifact" "sh", S.exactly "buildkite/scripts/connect-to-mainnet-on-compatible" "sh", - S.strictlyStart (S.contains "buildkite/src/Jobs/Test/TestnetIntegrationTest"), + S.strictlyStart (S.contains "buildkite/src/Jobs"), S.strictlyStart (S.contains "dockerfiles"), S.strictlyStart (S.contains "scripts") ] From b9096344cc7c6915f2e9967eca3af9d684bd5d47 Mon Sep 17 00:00:00 2001 From: Helena Li Date: Mon, 7 Feb 2022 15:33:01 -0800 Subject: [PATCH 4/6] respond to feedback --- buildkite/src/Command/MinaArtifact.dhall | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/buildkite/src/Command/MinaArtifact.dhall b/buildkite/src/Command/MinaArtifact.dhall index 092d4594374..d54c4361092 100644 --- a/buildkite/src/Command/MinaArtifact.dhall +++ b/buildkite/src/Command/MinaArtifact.dhall @@ -20,7 +20,8 @@ let dirtyWhen = [ S.strictlyStart (S.contains "buildkite/src/Command/MinaArtifact"), S.exactly "buildkite/scripts/build-artifact" "sh", S.exactly "buildkite/scripts/connect-to-mainnet-on-compatible" "sh", - S.strictlyStart (S.contains "buildkite/src/Jobs"), + S.strictlyStart (S.contains "buildkite/src/Jobs/Test"), + S.strictlyStart (S.contains "buildkite/src/Command"), S.strictlyStart (S.contains "dockerfiles"), S.strictlyStart (S.contains "scripts") ] From bbf03cb4288a87bb711d8028a160c95c0019bb15 Mon Sep 17 00:00:00 2001 From: Helena Li Date: Mon, 7 Feb 2022 16:00:17 -0800 Subject: [PATCH 5/6] try to fix mergify --- .mergify.yml | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index abe93db54dc..800f63f0cab 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,3 +1,10 @@ +queue_rules: + - name: default + conditions: + # Conditions to get out of the queue (= merged) + # - check-success=ci-one + # - check-success=ci-two + pull_request_rules: - name: automatically merge approved PRs with the ready-to-merge label conditions: @@ -6,9 +13,9 @@ pull_request_rules: - "#approved-reviews-by>=1" - label=ready-to-merge actions: - merge: + queue: method: merge - strict: false + strict: default delete_head_branch: {} - name: automatically merge approved PRs into develop with the ready-to-merge-into-develop label conditions: @@ -18,9 +25,9 @@ pull_request_rules: - label=ready-to-merge-into-develop - base=develop actions: - merge: + queue: method: merge - strict: false + strict: default delete_head_branch: {} - name: automatically merge approved PRs into develop-until-4.1-hardfork with the ready-to-merge-into-develop label conditions: @@ -30,9 +37,9 @@ pull_request_rules: - label=ready-to-merge-into-develop - base=develop-until-4.1-hardfork actions: - merge: + queue: method: merge - strict: false + strict: default delete_head_branch: {} - name: automatically merge approved PRs into develop-until-adversarial with the ready-to-merge-into-develop label conditions: @@ -42,7 +49,7 @@ pull_request_rules: - label=ready-to-merge-into-develop - base=develop-until-adversarial actions: - merge: + queue: method: merge - strict: false + strict: default delete_head_branch: {} From 636b35494838f691859334ca4a2bf4184029fa0a Mon Sep 17 00:00:00 2001 From: Helena Li Date: Mon, 7 Feb 2022 16:19:10 -0800 Subject: [PATCH 6/6] remove mergify --- .mergify.yml | 55 ---------------------------------------------- .mergify.yml.jinja | 52 ------------------------------------------- 2 files changed, 107 deletions(-) delete mode 100644 .mergify.yml delete mode 100644 .mergify.yml.jinja diff --git a/.mergify.yml b/.mergify.yml deleted file mode 100644 index 800f63f0cab..00000000000 --- a/.mergify.yml +++ /dev/null @@ -1,55 +0,0 @@ -queue_rules: - - name: default - conditions: - # Conditions to get out of the queue (= merged) - # - check-success=ci-one - # - check-success=ci-two - -pull_request_rules: - - name: automatically merge approved PRs with the ready-to-merge label - conditions: - - "status-success=buildkite/mina-pr-gating" - - "status-success=buildkite/mina/pr" - - "#approved-reviews-by>=1" - - label=ready-to-merge - actions: - queue: - method: merge - strict: default - delete_head_branch: {} - - name: automatically merge approved PRs into develop with the ready-to-merge-into-develop label - conditions: - - "status-success=buildkite/mina-pr-gating" - - "status-success=buildkite/mina/pr" - - "#approved-reviews-by>=1" - - label=ready-to-merge-into-develop - - base=develop - actions: - queue: - method: merge - strict: default - delete_head_branch: {} - - name: automatically merge approved PRs into develop-until-4.1-hardfork with the ready-to-merge-into-develop label - conditions: - - "status-success=buildkite/mina-pr-gating" - - "status-success=buildkite/mina/pr" - - "#approved-reviews-by>=1" - - label=ready-to-merge-into-develop - - base=develop-until-4.1-hardfork - actions: - queue: - method: merge - strict: default - delete_head_branch: {} - - name: automatically merge approved PRs into develop-until-adversarial with the ready-to-merge-into-develop label - conditions: - - "status-success=buildkite/mina-pr-gating" - - "status-success=buildkite/mina/pr" - - "#approved-reviews-by>=1" - - label=ready-to-merge-into-develop - - base=develop-until-adversarial - actions: - queue: - method: merge - strict: default - delete_head_branch: {} diff --git a/.mergify.yml.jinja b/.mergify.yml.jinja deleted file mode 100644 index e32b044167a..00000000000 --- a/.mergify.yml.jinja +++ /dev/null @@ -1,52 +0,0 @@ -pull_request_rules: - - name: automatically merge approved PRs with the ready-to-merge label - conditions: - {%- for status in required_status | sort %} - - "status-success={{status}}" - {%- endfor %} - - "#approved-reviews-by>=1" - - label=ready-to-merge - actions: - merge: - method: merge - strict: false - delete_head_branch: {} - - name: automatically merge approved PRs into develop with the ready-to-merge-into-develop label - conditions: - {%- for status in required_status | sort %} - - "status-success={{status}}" - {%- endfor %} - - "#approved-reviews-by>=1" - - label=ready-to-merge-into-develop - - base=develop - actions: - merge: - method: merge - strict: false - delete_head_branch: {} - - name: automatically merge approved PRs into develop-until-4.1-hardfork with the ready-to-merge-into-develop label - conditions: - {%- for status in required_status | sort %} - - "status-success={{status}}" - {%- endfor %} - - "#approved-reviews-by>=1" - - label=ready-to-merge-into-develop - - base=develop-until-4.1-hardfork - actions: - merge: - method: merge - strict: false - delete_head_branch: {} - - name: automatically merge approved PRs into develop-until-adversarial with the ready-to-merge-into-develop label - conditions: - {%- for status in required_status | sort %} - - "status-success={{status}}" - {%- endfor %} - - "#approved-reviews-by>=1" - - label=ready-to-merge-into-develop - - base=develop-until-adversarial - actions: - merge: - method: merge - strict: false - delete_head_branch: {}