From 987e062e2cd6096c16b4c5045ab310c60af715d2 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Mon, 22 Aug 2022 19:58:12 -0700 Subject: [PATCH 1/2] Cover release/7.0 in our pipelines --- .azure/pipelines/helix-matrix.yml | 1 + .azure/pipelines/quarantined-pr.yml | 4 +++- .github/dependabot.yml | 13 ++++++++++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.azure/pipelines/helix-matrix.yml b/.azure/pipelines/helix-matrix.yml index 0684583d13b5..bb03846838d2 100644 --- a/.azure/pipelines/helix-matrix.yml +++ b/.azure/pipelines/helix-matrix.yml @@ -13,6 +13,7 @@ schedules: include: - release/5.0 - release/6.0 + - release/7.0 always: false variables: diff --git a/.azure/pipelines/quarantined-pr.yml b/.azure/pipelines/quarantined-pr.yml index 2a49290726e8..6d6c8cbb38e2 100644 --- a/.azure/pipelines/quarantined-pr.yml +++ b/.azure/pipelines/quarantined-pr.yml @@ -3,7 +3,7 @@ # # Configure which branches trigger builds -# We want to run quarantined tests on release/5.0 and main as well as on PRs +# We want to run quarantined tests on release/5.0 and later as well as on PRs trigger: batch: true branches: @@ -11,6 +11,7 @@ trigger: - main - release/5.0 - release/6.0 + - release/7.0 # Run PR validation on branches that include Helix tests pr: @@ -20,6 +21,7 @@ pr: - main - release/5.0 - release/6.0 + - release/7.0 paths: exclude: - .github/* diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 902c5873c325..0f21612d6844 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -62,4 +62,15 @@ updates: labels: - area-infrastructure target-branch: "release/6.0" - + - package-ecosystem: "gitsubmodule" + directory: "/" + schedule: + interval: "monthly" + allow: + - dependency-type: "all" + commit-message: + prefix: "[release/7.0] " + include: scope + labels: + - area-infrastructure + target-branch: "release/7.0" From fa99abdf8b616cba610aa88697d0c759936d1cf7 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 23 Aug 2022 16:09:01 -0700 Subject: [PATCH 2/2] PR feedback: Remove release/5.0 mentions in our YAML --- .azure/pipelines/helix-matrix.yml | 1 - .azure/pipelines/quarantined-pr.yml | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.azure/pipelines/helix-matrix.yml b/.azure/pipelines/helix-matrix.yml index bb03846838d2..c59b65b32b44 100644 --- a/.azure/pipelines/helix-matrix.yml +++ b/.azure/pipelines/helix-matrix.yml @@ -11,7 +11,6 @@ schedules: - cron: "0 9 * * *" branches: include: - - release/5.0 - release/6.0 - release/7.0 always: false diff --git a/.azure/pipelines/quarantined-pr.yml b/.azure/pipelines/quarantined-pr.yml index 6d6c8cbb38e2..2d6ce7f2446f 100644 --- a/.azure/pipelines/quarantined-pr.yml +++ b/.azure/pipelines/quarantined-pr.yml @@ -3,13 +3,12 @@ # # Configure which branches trigger builds -# We want to run quarantined tests on release/5.0 and later as well as on PRs +# We want to run quarantined tests on release/6.0 and later as well as on PRs trigger: batch: true branches: include: - main - - release/5.0 - release/6.0 - release/7.0 @@ -19,7 +18,6 @@ pr: branches: include: - main - - release/5.0 - release/6.0 - release/7.0 paths: