Skip to content

Commit 2defc80

Browse files
authored
Prepare release (#320)
1 parent 0d5a56b commit 2defc80

File tree

5 files changed

+78
-42
lines changed

5 files changed

+78
-42
lines changed

CHANGELOG.md

+45
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,50 @@
11
# CHANGELOG
22

3+
## [v3.0.0] (2023-11-27)
4+
5+
### Features
6+
7+
- [#308] Update to node20
8+
- [#291] Add conda-solver option (defaults to libmamba)
9+
10+
### Fixes
11+
12+
- [#299] Fix condaBasePath when useBundled is false, and there's no pre-existing
13+
conda
14+
15+
### Documentation
16+
17+
- [#309] Switch to main branch based development
18+
- [#313] Specify team conda-incubator/setup-miniconda as codeowners
19+
- [#318] README: update actions in examples, add security section, similar
20+
actions
21+
22+
### Tasks and Maintenance
23+
24+
- [#307] Run dependabot against main branch and also update node packages
25+
- [#311] Bump actions/checkout from 2 to 4
26+
- [#310] Bump actions/cache from 1 to 3
27+
- [#314] Strip/update dependencies
28+
- [#315] Split lint into check and build, switch from `npm install` to `npm ci`
29+
- [#317] Bump normalize-url from 4.5.1 to 8.0.0
30+
- [#316] Faster workflow response / saving resources via timeout/concurrency
31+
policy
32+
33+
[v3.0.0]: https://github.com/conda-incubator/setup-miniconda/releases/tag/v2.3.0
34+
[#308]: https://github.com/conda-incubator/setup-miniconda/pull/308
35+
[#291]: https://github.com/conda-incubator/setup-miniconda/pull/291
36+
[#299]: https://github.com/conda-incubator/setup-miniconda/pull/299
37+
[#309]: https://github.com/conda-incubator/setup-miniconda/pull/309
38+
[#313]: https://github.com/conda-incubator/setup-miniconda/pull/313
39+
[#318]: https://github.com/conda-incubator/setup-miniconda/pull/318
40+
[#307]: https://github.com/conda-incubator/setup-miniconda/pull/307
41+
[#311]: https://github.com/conda-incubator/setup-miniconda/pull/311
42+
[#310]: https://github.com/conda-incubator/setup-miniconda/pull/310
43+
[#314]: https://github.com/conda-incubator/setup-miniconda/pull/314
44+
[#315]: https://github.com/conda-incubator/setup-miniconda/pull/315
45+
[#317]: https://github.com/conda-incubator/setup-miniconda/pull/317
46+
[#316]: https://github.com/conda-incubator/setup-miniconda/pull/316
47+
348
## [v2.3.0] (2023-11-22)
449

550
### Documentation

README.md

+18-18
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ You can change the default `test` environment to have a different name or path
147147
by setting the `activate-environment` input option.
148148

149149
```yaml
150-
- uses: conda-incubator/setup-miniconda@v2
150+
- uses: conda-incubator/setup-miniconda@v3
151151
with:
152152
activate-environment: whatever
153153
```
@@ -172,7 +172,7 @@ to do **both** of:
172172
- set `auto-activate-base` to `true`
173173

174174
```yaml
175-
- uses: conda-incubator/setup-miniconda@v2
175+
- uses: conda-incubator/setup-miniconda@v3
176176
with:
177177
auto-activate-base: true
178178
activate-environment: ""
@@ -198,7 +198,7 @@ jobs:
198198
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
199199
python-version: ["3.7", "3.11"]
200200
steps:
201-
- uses: conda-incubator/setup-miniconda@v2
201+
- uses: conda-incubator/setup-miniconda@v3
202202
with:
203203
auto-update-conda: true
204204
python-version: ${{ matrix.python-version }}
@@ -222,7 +222,7 @@ jobs:
222222
name: Ex2 Linux
223223
runs-on: "ubuntu-latest"
224224
steps:
225-
- uses: conda-incubator/setup-miniconda@v2
225+
- uses: conda-incubator/setup-miniconda@v3
226226
with:
227227
miniconda-version: "latest"
228228
activate-environment: foo
@@ -241,7 +241,7 @@ jobs:
241241
name: Ex2 Mac
242242
runs-on: "macos-latest"
243243
steps:
244-
- uses: conda-incubator/setup-miniconda@v2
244+
- uses: conda-incubator/setup-miniconda@v3
245245
with:
246246
miniconda-version: "latest"
247247
activate-environment: foo
@@ -265,7 +265,7 @@ jobs:
265265
name: Ex2 Windows
266266
runs-on: "windows-latest"
267267
steps:
268-
- uses: conda-incubator/setup-miniconda@v2
268+
- uses: conda-incubator/setup-miniconda@v3
269269
with:
270270
miniconda-version: "latest"
271271
activate-environment: foo
@@ -309,7 +309,7 @@ jobs:
309309
shell: bash -el {0}
310310
steps:
311311
- uses: actions/checkout@v4
312-
- uses: conda-incubator/setup-miniconda@v2
312+
- uses: conda-incubator/setup-miniconda@v3
313313
with:
314314
activate-environment: anaconda-client-env
315315
environment-file: etc/example-environment.yml
@@ -341,7 +341,7 @@ jobs:
341341
shell: bash -el {0}
342342
steps:
343343
- uses: actions/checkout@v4
344-
- uses: conda-incubator/setup-miniconda@v2
344+
- uses: conda-incubator/setup-miniconda@v3
345345
with:
346346
activate-environment: foo
347347
python-version: 3.6
@@ -383,7 +383,7 @@ jobs:
383383
shell: bash -el {0}
384384
steps:
385385
- uses: actions/checkout@v4
386-
- uses: conda-incubator/setup-miniconda@v2
386+
- uses: conda-incubator/setup-miniconda@v3
387387
with:
388388
installer-url: https://github.com/conda-forge/miniforge/releases/download/4.8.3-2/Miniforge-pypy3-4.8.3-2-Linux-x86_64.sh
389389
allow-softlinks: true
@@ -415,7 +415,7 @@ jobs:
415415
runs-on: "ubuntu-latest"
416416
steps:
417417
- uses: actions/checkout@v4
418-
- uses: conda-incubator/setup-miniconda@v2
418+
- uses: conda-incubator/setup-miniconda@v3
419419
with:
420420
python-version: 3.6
421421
mamba-version: "*"
@@ -467,7 +467,7 @@ jobs:
467467
shell: bash -el {0}
468468
steps:
469469
- uses: actions/checkout@v4
470-
- uses: conda-incubator/setup-miniconda@v2
470+
- uses: conda-incubator/setup-miniconda@v3
471471
with:
472472
auto-update-conda: false
473473
activate-environment: explicit-env
@@ -498,7 +498,7 @@ jobs:
498498
os: ["ubuntu", "macos", "windows"]
499499
steps:
500500
- uses: actions/checkout@v4
501-
- uses: conda-incubator/setup-miniconda@v2
501+
- uses: conda-incubator/setup-miniconda@v3
502502
with:
503503
environment-file: etc/example-environment.yml
504504
miniforge-version: latest
@@ -530,7 +530,7 @@ jobs:
530530
miniforge-variant: Mambaforge
531531
steps:
532532
- uses: actions/checkout@v4
533-
- uses: conda-incubator/setup-miniconda@v2
533+
- uses: conda-incubator/setup-miniconda@v3
534534
with:
535535
condarc-file: ${{ matrix.condarc-file }}
536536
environment-file: ${{ matrix.environment-file }}
@@ -560,7 +560,7 @@ jobs:
560560
miniconda-version: ["latest"]
561561
steps:
562562
- uses: actions/checkout@v4
563-
- uses: conda-incubator/setup-miniconda@v2
563+
- uses: conda-incubator/setup-miniconda@v3
564564
with:
565565
architecture: ${{ matrix.architecture }}
566566
miniconda-version: $${{ matrix.miniconda-version }}
@@ -587,7 +587,7 @@ jobs:
587587
os: ["ubuntu-latest", "windows-latest"]
588588
steps:
589589
- uses: actions/checkout@v4
590-
- uses: conda-incubator/setup-miniconda@v2
590+
- uses: conda-incubator/setup-miniconda@v3
591591
id: setup-miniconda
592592
continue-on-error: true
593593
with:
@@ -629,7 +629,7 @@ jobs:
629629
key:
630630
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{
631631
hashFiles('etc/example-environment.yml') }}
632-
- uses: conda-incubator/setup-miniconda@v2
632+
- uses: conda-incubator/setup-miniconda@v3
633633
with:
634634
activate-environment: anaconda-client-env
635635
channel-priority: strict
@@ -649,7 +649,7 @@ a environment file.
649649

650650
```yaml
651651
- name: Setup Mambaforge
652-
uses: conda-incubator/setup-miniconda@v2
652+
uses: conda-incubator/setup-miniconda@v3
653653
with:
654654
miniforge-variant: Mambaforge
655655
miniforge-version: latest
@@ -731,7 +731,7 @@ jobs:
731731
shell: bash -el {0}
732732
steps:
733733
- uses: actions/checkout@v4
734-
- uses: conda-incubator/setup-miniconda@v2
734+
- uses: conda-incubator/setup-miniconda@v3
735735
with:
736736
activate-environment: anaconda-client-env
737737
environment-file: etc/example-environment-caching.yml

RELEASE.md

+15-21
Original file line numberDiff line numberDiff line change
@@ -10,40 +10,34 @@ npm-check-updates
1010

1111
- Ensure the [CHANGELOG](./CHANGELOG.md) is up-to-date.
1212

13-
- Update the `version` in [package.json](./package.json).
13+
- If this release is a major version, update all the example YAML in the
14+
[README](./README.md), e.g. `4.0.0` would need `@v3` -> `@v4`.
1415

15-
- If this release is a major version, update all the example YAML in the
16-
[README](./README.md), e.g. `3.0.0` would need `@v2` -> `@v3`.
16+
- Ensure that all
17+
[workflow runs](https://github.com/conda-incubator/setup-miniconda/actions?query=branch%3Amain)
18+
for the latest commit on main are green.
1719

18-
- Run the [build](./CONTRIBUTING.md#build).
20+
- Create a new release via "Draft a new release" button at the
21+
[Release page](https://github.com/conda-incubator/setup-miniconda/releases):
1922

20-
- We keep the `master` branch until `v3` is released with a warning so we also
21-
merge this with main.
22-
23-
```bash
24-
git remote update
25-
git checkout origin/master -b master
26-
git merge origin/main
27-
git push origin master
28-
```
29-
30-
- Create a new named tag:
31-
32-
```bash
33-
git tag -a vX.Y.Z -m 'Release version vX.Y.Z'
34-
```
23+
- Choose a new tag like `vX.Y.Z` that targets the current main branch and that
24+
is created on publish of the release
25+
- Choose the title `Version X.Y.Z`
26+
- Paste the relevant [CHANGELOG](./CHANGELOG.md) section into the description
27+
field
28+
- Publish the release
3529

3630
Replace `X.Y.Z` by the appropriate version number.
3731

3832
- Point the old `vX` tag to latest `vX.Y.Z` tag:
3933

4034
```bash
41-
git checkout main
35+
git remote update
4236
git tag -d vX
4337
git push origin :refs/tags/vX
38+
git checkout vX.Y.Z
4439
git tag -a vX -m 'Release version vX.Y.Z'
4540
git push origin --tags
46-
git push origin main
4741
```
4842

4943
Replace `X.Y.Z` by the appropriate version number.

package-lock.json

-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"name": "setup-miniconda",
3-
"version": "2.3.0",
43
"description": "GitHub action for setting up conda from default or custom installers",
54
"main": "lib/main.js",
65
"scripts": {

0 commit comments

Comments
 (0)