Skip to content

Commit

Permalink
Bump bazelbuild/continuous-integration from 9fddc08b79867b8eea406c2d7…
Browse files Browse the repository at this point in the history
…5898d4e98b20388 to 68dea4fe63a2ad44caaa8f3c44df19094b3dd395 (bazelbuild#2224)

Bumps
[bazelbuild/continuous-integration](https://github.com/bazelbuild/continuous-integration)
from 9fddc08b79867b8eea406c2d75898d4e98b20388 to
68dea4fe63a2ad44caaa8f3c44df19094b3dd395.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/bazelbuild/continuous-integration/blob/master/docs/release-playbook.md">bazelbuild/continuous-integration's
changelog</a>.</em></p>
<blockquote>
<h1>Bazel Release Playbook</h1>
<p>This is the guide to conducting a Bazel release. This is especially
relevant for
release managers, but will be of interest to anyone who is curious about
the
release process.</p>
<h2>Preface</h2>
<blockquote>
<p>For future reference and release managers - the release manager
playbook should
be treated like an IKEA manual. That means: Do not try to be smart,
optimize /
skip / reorder steps, otherwise chaos will ensue. Just follow it and the
end
result will be.. well, a usable piece of furniture, or a Bazel release
(depending on the manual).</p>
<p>Like aviation and workplace safety regulations, the playbook is
written in the
tears and blood of broken Bazelisks, pipelines, releases and Git
branches.
Assume that every step is exactly there for a reason, even if it might
not be
obvious. If you follow them to the letter, they are not error prone.
Errors
have only happened in the past, when a release manager thought it's ok
to
follow them by spirit instead. ;)</p>
<p>-- <a href="https://github.com/philwo"><code>@​philwo</code></a></p>
</blockquote>
<h2>One-time setup</h2>
<p>These steps only have to be performed once, ever.</p>
<ul>
<li>Make sure you are a member of the Bazel <a
href="https://github.com/orgs/bazelbuild/teams/release-managers/members">Release
Managers</a> team on GitHub.</li>
<li>Make sure you are a member of the Bazel <a
href="https://buildkite.com/organizations/bazel-trusted/teams/release-managers/members">release-managers</a>
group on BuildKite. If that link does not work for you, ask one of the
Buildkite org admins to add you to
the group.</li>
<li>Set up github ssh key if you haven't already.
<ul>
<li><a
href="https://help.github.com/articles/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent/">https://help.github.com/articles/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent/</a></li>
</ul>
</li>
<li>Generate a new identifier for Google's internal Git mirror: <a
href="https://bazel.googlesource.com/new-password">https://bazel.googlesource.com/new-password</a>
(and paste the code in your shell).</li>
<li>Log in to the Gerrit UI to create an account: <a
href="https://bazel-review.git.corp.google.com/">https://bazel-review.git.corp.google.com/</a>
(without this step, you will see errors such as <code>error_type:
PERMISSION_DENIED_BY_GERRIT_ACL</code> and <code>&quot;\'git push\'
requires a Gerrit user account.&quot;</code> when running the release
script.</li>
</ul>
<h2>Preparing a new release</h2>
<ol>
<li><a href="https://github.com/bazelbuild/bazel/milestones/new">Create
a release blockers milestone</a> named &quot;X.Y.Z release
blockers&quot; (case-sensitive), where we keep track of issues that must
be resolved before the release goes out.
<ul>
<li>Set the (tentative) release date.</li>
<li>Add this description: <code>Issues that need to be resolved before
the X.Y.Z release.</code>.</li>
<li>Refer to <a
href="https://github.com/bazelbuild/bazel/milestone/38">this
example</a></li>
</ul>
</li>
<li><a
href="https://github.com/bazelbuild/bazel/issues/new?assignees=&amp;labels=release%2Cteam-OSS%2CP1%2Ctype%3A+process&amp;template=release.md&amp;title=Release+X.Y+-+%24MONTH+%24YEAR">Create
a release tracking issue</a> to keep the community updated about the
progress of the release. <a
href="https://redirect.github.com/bazelbuild/bazel/issues/16159">See
example</a>. Pin this issue.</li>
<li>Create the branch for the release. The branch should always be named
<code>release-X.Y.Z</code> (the <code>.Z</code> part is important).
Cherry-pick PRs will be sent against this branch.
<ul>
<li>The actual creation of the branch can be done via the GitHub UI or
via the command line. For minor and patch releases, create the branch
from the previous release tag, if possible. How we choose the base
commit of the branch depends on the type of the release:</li>
<li>For patch releases (<code>X.Y.Z</code> where <code>Z&gt;0</code>),
the base commit should simply be <code>X.Y.(Z-1)</code>.</li>
<li>For minor releases (<code>X.Y.0</code> where <code>Y&gt;0</code>),
the base commit should typically be <code>X.(Y-1).&lt;current max
Z&gt;</code>.</li>
<li>For major releases (<code>X.0.0</code>), the base commit is some
&quot;healthy&quot; commit on the main branch.
<ul>
<li>This means that there's an extra step involved in preparing the
release -- &quot;cutting&quot; the release branch, so to speak. For
this, check the <a
href="https://buildkite.com/bazel/bazel-with-downstream-projects-bazel">Bazel@HEAD+Downstream
pipeline</a>. The branch cut should happen on a green commit there; if
the pipeline is persistently red, work with the Green Team to resolve it
first and delay the branch cut as needed.</li>
<li>A first release candidate should immediately be created after the
release branch is created. See <a
href="https://github.com/bazelbuild/continuous-integration/blob/master/docs/#create-a-release-candidate">create
a release candidate</a> below.</li>
</ul>
</li>
</ul>
</li>
</ol>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/bazelbuild/continuous-integration/commit/68dea4fe63a2ad44caaa8f3c44df19094b3dd395"><code>68dea4f</code></a>
Install a previous version of MSVC build tools (<a
href="https://redirect.github.com/bazelbuild/continuous-integration/issues/1968">#1968</a>)</li>
<li><a
href="https://github.com/bazelbuild/continuous-integration/commit/9d79fb4ed17c28ca989a5bedef0ea97dbec031ea"><code>9d79fb4</code></a>
Add fedora40 platform (<a
href="https://redirect.github.com/bazelbuild/continuous-integration/issues/1966">#1966</a>)</li>
<li><a
href="https://github.com/bazelbuild/continuous-integration/commit/e102c9f9d384243dbb80bfd5857f8b6f6c4f1bbc"><code>e102c9f</code></a>
Use grpc protocol for remote cache on Mac (<a
href="https://redirect.github.com/bazelbuild/continuous-integration/issues/1964">#1964</a>)</li>
<li><a
href="https://github.com/bazelbuild/continuous-integration/commit/d3fbef24286f67013da1be6b6963ab917efc3a27"><code>d3fbef2</code></a>
Install Android NDK r25b on Windows VM (<a
href="https://redirect.github.com/bazelbuild/continuous-integration/issues/1965">#1965</a>)</li>
<li><a
href="https://github.com/bazelbuild/continuous-integration/commit/fcd3cdd216acf5b78449ae6c05da1c789f5ef76c"><code>fcd3cdd</code></a>
Gerrit build: Bump Fedora version to 40 (<a
href="https://redirect.github.com/bazelbuild/continuous-integration/issues/1959">#1959</a>)</li>
<li><a
href="https://github.com/bazelbuild/continuous-integration/commit/195ca8dd39d0f35121df8693fb4c6e00bdcce35c"><code>195ca8d</code></a>
Bump requests from 2.31.0 to 2.32.2 in /actions/update-lockfile (<a
href="https://redirect.github.com/bazelbuild/continuous-integration/issues/1958">#1958</a>)</li>
<li><a
href="https://github.com/bazelbuild/continuous-integration/commit/968f5d3d21148f7a52bcc8752370d919731966b1"><code>968f5d3</code></a>
Update lockfiles when PR is merged to a release branch (<a
href="https://redirect.github.com/bazelbuild/continuous-integration/issues/1950">#1950</a>)</li>
<li><a
href="https://github.com/bazelbuild/continuous-integration/commit/ada80845567251d7714192c80480dd24adfcf2ca"><code>ada8084</code></a>
Shard summary: Show root cause of build failures (<a
href="https://redirect.github.com/bazelbuild/continuous-integration/issues/1953">#1953</a>)</li>
<li><a
href="https://github.com/bazelbuild/continuous-integration/commit/9fe262a5dc799e023ff3cda8b76222c85cbf13b3"><code>9fe262a</code></a>
Test shard summary: Include FAILED_TO_BULD targets (<a
href="https://redirect.github.com/bazelbuild/continuous-integration/issues/1952">#1952</a>)</li>
<li><a
href="https://github.com/bazelbuild/continuous-integration/commit/061ce4e133a686b96e567301f167ce1784a6b0f7"><code>061ce4e</code></a>
Add docker image for fedora 40 linux distribution (<a
href="https://redirect.github.com/bazelbuild/continuous-integration/issues/1947">#1947</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/bazelbuild/continuous-integration/compare/9fddc08b79867b8eea406c2d75898d4e98b20388...68dea4fe63a2ad44caaa8f3c44df19094b3dd395">compare
view</a></li>
</ul>
</details>
<br />


Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
dependabot[bot] authored Jun 10, 2024
1 parent db33594 commit 634a2b0
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dismiss_approvals.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
egress-policy: audit

- name: Run BCR PR Reviewer
uses: bazelbuild/continuous-integration/actions/bcr-pr-reviewer@9fddc08b79867b8eea406c2d75898d4e98b20388 # master
uses: bazelbuild/continuous-integration/actions/bcr-pr-reviewer@68dea4fe63a2ad44caaa8f3c44df19094b3dd395 # master
with:
# This token needs to be updated annually on Feb 05.
token: ${{ secrets.BCR_PR_REVIEW_HELPER_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/notify_maintainers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
egress-policy: audit

- name: Run BCR PR Reviewer
uses: bazelbuild/continuous-integration/actions/bcr-pr-reviewer@9fddc08b79867b8eea406c2d75898d4e98b20388 # master
uses: bazelbuild/continuous-integration/actions/bcr-pr-reviewer@68dea4fe63a2ad44caaa8f3c44df19094b3dd395 # master
with:
# This token needs to be updated annually on Feb 05.
token: ${{ secrets.BCR_PR_REVIEW_HELPER_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/review_prs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

- name: Run BCR PR Reviewer
if: github.repository_owner == 'bazelbuild'
uses: bazelbuild/continuous-integration/actions/bcr-pr-reviewer@9fddc08b79867b8eea406c2d75898d4e98b20388 # master
uses: bazelbuild/continuous-integration/actions/bcr-pr-reviewer@68dea4fe63a2ad44caaa8f3c44df19094b3dd395 # master
with:
# This token needs to be updated annually on Feb 05.
token: ${{ secrets.BCR_PR_REVIEW_HELPER_TOKEN }}
Expand Down

0 comments on commit 634a2b0

Please sign in to comment.