Skip to content

Commit 60e099f

Browse files
authored
🤖 Update infrastructure file(s) (#174)
1 parent 0d482c7 commit 60e099f

File tree

5 files changed

+27
-21
lines changed

5 files changed

+27
-21
lines changed

‎.github/template-files/config.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,10 @@ conda/infrastructure:
4343
- src: templates/releases/RELEASE.md
4444
dst: RELEASE.md
4545
with:
46-
placeholder: MAJOR.MINOR
46+
canary_channel: https://anaconda.org/conda-canary
47+
# SemVer placeholders
48+
placeholder: MAJOR.MINOR.MINOR
49+
placeholder_x: MAJOR.MINOR.x
4750
- src: templates/releases/rever.xsh
4851
dst: rever.xsh
4952
- src: templates/releases/TEMPLATE

‎.github/workflows/cla.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ubuntu-latest
1919
steps:
2020
- name: Check CLA
21-
uses: conda/actions/check-cla@15f883f14f4232f83658e3609c3316d58905138f # v24.8.0
21+
uses: conda/actions/check-cla@6e72e0db87e72f0020e493aeb02f864363bd9258 # v24.11.1
2222
with:
2323
# [required]
2424
# A token with ability to comment, label, and modify the commit status

‎.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
days-before-issue-stale: 90
3434
days-before-issue-close: 21
3535
steps:
36-
- uses: conda/actions/read-yaml@15f883f14f4232f83658e3609c3316d58905138f # v24.8.0
36+
- uses: conda/actions/read-yaml@6e72e0db87e72f0020e493aeb02f864363bd9258 # v24.11.1
3737
id: read_yaml
3838
with:
3939
path: https://raw.githubusercontent.com/conda/infra/main/.github/messages.yml

‎.github/workflows/update.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ jobs:
5555
git config --global user.name 'Conda Bot'
5656
git config --global user.email '[email protected]'
5757
58-
- uses: conda/actions/combine-durations@15f883f14f4232f83658e3609c3316d58905138f # v24.8.0
58+
- uses: conda/actions/combine-durations@6e72e0db87e72f0020e493aeb02f864363bd9258 # v24.11.1
5959
id: durations
6060
continue-on-error: true
6161

62-
- uses: conda/actions/template-files@15f883f14f4232f83658e3609c3316d58905138f # v24.8.0
62+
- uses: conda/actions/template-files@6e72e0db87e72f0020e493aeb02f864363bd9258 # v24.11.1
6363
id: templates
6464
continue-on-error: true
6565

@@ -80,7 +80,7 @@ jobs:
8080
- if: github.event.comment.body != '@conda-bot render'
8181
id: create
8282
# no-op if no commits were made
83-
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7.0.5
83+
uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # v7.0.6
8484
with:
8585
push-to-fork: ${{ env.FORK }}
8686
token: ${{ secrets.SYNC_TOKEN }}

‎RELEASE.md

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
# Release Process
1414

1515
> [!NOTE]
16-
> Throughout this document are references to the version number as `MAJOR.MINOR.[$patch_number]`, this should be replaced with the correct version number. Do **not** prefix the version with a lowercase `v`.
16+
> Throughout this document are references to the version number as `MAJOR.MINOR.MINOR`, this should be replaced with the correct version number. Do **not** prefix the version with a lowercase `v`.
1717
1818
## 1. Open the release issue and cut a release branch. (do this ~1 week prior to release)
1919

2020
> [!NOTE]
21-
> The new release branch should adhere to the naming convention of `MAJOR.MINOR.x` (make sure to put the `.x` at the end!). In the case of patch/hotfix releases, however, do NOT cut a new release branch; instead, use the previously-cut release branch with the appropriate `MAJOR.MINOR.x` version numbers.
21+
> The new release branch should adhere to the naming convention of `MAJOR.MINOR.x` (note the difference to `MAJOR.MINOR.MINOR`). In the case of patch/hotfix releases, however, do NOT cut a new release branch; instead, use the previously-cut `MAJOR.MINOR.x` release branch.
2222
2323
Use the issue template below to create the release issue. After creating the release issue, pin it for easy access.
2424

@@ -87,7 +87,7 @@ If a patch release is necessary, reopen the original release issue and append th
8787

8888
```markdown
8989
<details open> <!-- feel free to remove the open attribute once this section is completed -->
90-
<summary><h4>Patch MAJOR.MINOR.[$patch_number]</h4></summary>
90+
<summary><h4>Patch MAJOR.MINOR.MINOR</h4></summary>
9191

9292
- [ ] <!-- list issues & PRs that need to be resolved here -->
9393
- [ ] Create release PR (see [release process][process])
@@ -106,6 +106,9 @@ If a patch release is necessary, reopen the original release issue and append th
106106
> [!NOTE]
107107
> The [epic template][epic template] is perfect for this; remember to remove the **`epic`** label.
108108
109+
> [!NOTE]
110+
> A patch release is like a regular, i.e., follow the same steps in the process as you would for a regular release. Most patches are authored by existing contributors (most likely maintainers themselves) so running `rever <VERSION>` may succeed on the first pass.
111+
109112
## 2. Alert various parties of the upcoming release. (do this ~1 week prior to release)
110113

111114
Let various interested parties know about the upcoming release; at minimum, conda-forge maintainers should be informed. For major features, a blog post describing the new features should be prepared and posted once the release is completed (see the announcements section of the release issue).
@@ -114,7 +117,7 @@ Let various interested parties know about the upcoming release; at minimum, cond
114117

115118
### Canary Builds for Manual Testing
116119

117-
Once the release PRs are filed, successful canary builds will be available on `https://anaconda.org/conda-canary/conda/files?channel=rc-conda-content-trust-MAJOR.MINOR.x` for manual testing.
120+
Once the release PRs are filed, successful canary builds will be available on `https://anaconda.org/conda-canary/conda-content-trust/files?channel=rc-conda-content-trust-MAJOR.MINOR.x` for manual testing.
118121

119122
> [!NOTE]
120123
> You do not need to apply the `build::review` label for release PRs; every commit to the release branch builds and uploads canary builds to the respective `rc-` label.
@@ -153,7 +156,7 @@ Currently, there are only 2 activities we use rever for, (1) aggregating the aut
153156
2. Create a versioned branch, this is where rever will make its changes:
154157
155158
```bash
156-
(rever) $ git checkout -b changelog-MAJOR.MINOR.[$patch_number]
159+
(rever) $ git checkout -b changelog-MAJOR.MINOR.MINOR
157160
```
158161
159162
2. Run `rever --activities authors <VERSION>`:
@@ -181,7 +184,7 @@ Currently, there are only 2 activities we use rever for, (1) aggregating the aut
181184
- Here's a sample run where we undo the commit made by rever in order to commit the changes to `.authors.yml` separately:
182185

183186
```bash
184-
(rever) $ rever --activities authors --force MAJOR.MINOR.[$patch_number]
187+
(rever) $ rever --activities authors --force MAJOR.MINOR.MINOR
185188
186189
# changes were made to .authors.yml as per the prior bullet
187190
(rever) $ git diff --name-only HEAD HEAD~1
@@ -250,7 +253,7 @@ Currently, there are only 2 activities we use rever for, (1) aggregating the aut
250253
> * Add `win-arm64` as a known platform (subdir). (#11778)
251254
> ```
252255
253-
- You can utilize [GitHub's compare view][compare] to review what changes are to be included in this release. Make sure you compare the current release branch against the previous one (e.g., `24.5.x` would be compared against `24.3.x`)
256+
- You can utilize [GitHub's compare view][compare] to review what changes are to be included in this release. Make sure you compare the current release branch against the previous one
254257
255258
- Add a new news snippet for any PRs of importance that are missing.
256259
@@ -310,8 +313,8 @@ Currently, there are only 2 activities we use rever for, (1) aggregating the aut
310313
+ 86957814cf235879498ed7806029b8ff5f400034 Update .authors.yml
311314
+ 3ec7491f2f58494a62f1491987d66f499f8113ad Update .mailmap
312315
+ 432a9e1b41a3dec8f95a7556632f9a93fdf029fd Update news
313-
+ a5c0db938893d2c12cab12a1f7eb3e646ed80373 Update authorship for MAJOR.MINOR.[$patch_number]
314-
+ 5e95169d0df4bcdc2da9a6ba4a2561d90e49f75d Update CHANGELOG for MAJOR.MINOR.[$patch_number]
316+
+ a5c0db938893d2c12cab12a1f7eb3e646ed80373 Update authorship for MAJOR.MINOR.MINOR
317+
+ 5e95169d0df4bcdc2da9a6ba4a2561d90e49f75d Update CHANGELOG for MAJOR.MINOR.MINOR
315318
```
316319
317320
7. Since rever does not include stats on first-time contributors, we will need to add this manually.
@@ -332,18 +335,18 @@ Currently, there are only 2 activities we use rever for, (1) aggregating the aut
332335
+ 86957814cf235879498ed7806029b8ff5f400034 Update .authors.yml
333336
+ 3ec7491f2f58494a62f1491987d66f499f8113ad Update .mailmap
334337
+ 432a9e1b41a3dec8f95a7556632f9a93fdf029fd Update news
335-
+ a5c0db938893d2c12cab12a1f7eb3e646ed80373 Update authorship for MAJOR.MINOR.[$patch_number]
336-
+ 5e95169d0df4bcdc2da9a6ba4a2561d90e49f75d Update CHANGELOG for MAJOR.MINOR.[$patch_number]
338+
+ a5c0db938893d2c12cab12a1f7eb3e646ed80373 Update authorship for MAJOR.MINOR.MINOR
339+
+ 5e95169d0df4bcdc2da9a6ba4a2561d90e49f75d Update CHANGELOG for MAJOR.MINOR.MINOR
337340
+ 93fdf029fd4cf235872c12cab12a1f7e8f95a755 Add first-time contributions
338341
```
339342
340343
8. Push this versioned branch.
341344
342345
```bash
343-
(rever) $ git push -u upstream changelog-MAJOR.MINOR.[$patch_number]
346+
(rever) $ git push -u upstream changelog-MAJOR.MINOR.MINOR
344347
```
345348
346-
9. Open the Release PR targing the `MAJOR.MINOR.x` branch.
349+
9. Open the Release PR targeting the `MAJOR.MINOR.x` branch.
347350
348351
<details>
349352
<summary>GitHub PR Template</summary>
@@ -367,7 +370,7 @@ Currently, there are only 2 activities we use rever for, (1) aggregating the aut
367370
368371
| Field | Value |
369372
|---|---|
370-
| Choose a tag | `MAJOR.MINOR.[$patch_number]` |
373+
| Choose a tag | `MAJOR.MINOR.MINOR` |
371374
| Target | `MAJOR.MINOR.x` |
372375
| Body | copy/paste blurb from `CHANGELOG.md` |
373376
@@ -405,7 +408,7 @@ To publish the release, go to the project's release page (e.g., https://github.c
405408
406409
</details>
407410
408-
## 9. Open PRs to bump [Anaconda Recipes][Anaconda Recipes] and [conda-forge][conda-forge] feedstocks to use `MAJOR.MINOR.[$patch_number]`.
411+
## 9. Open PRs to bump [Anaconda Recipes][Anaconda Recipes] and [conda-forge][conda-forge] feedstocks to use `MAJOR.MINOR.MINOR`.
409412
410413
> [!NOTE]
411414
> Conda-forge's PRs will be auto-created via the `regro-cf-autotick-bot`. Follow the instructions below if any changes need to be made to the recipe that were not automatically added (these instructions are only necessary for anyone who is _not_ a conda-forge feedstock maintainer, since maintainers can push changes directly to the autotick branch):

0 commit comments

Comments
 (0)