Skip to content

Commit

Permalink
Merge pull request #81 from mweinelt/update-nixos-infra
Browse files Browse the repository at this point in the history
Update references to nixos/infra and nixos-search flake inputs
  • Loading branch information
wegank authored Apr 26, 2024
2 parents d9e106f + 77c782e commit f1e6f18
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions src/Branch-Off.md
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,10 @@ Now we prepare the master branch for the next release after this one.
Now that everything on git is done, we are still missing the channels.

1. Create the necessary channels for `https://channels.nixos.org` in beta status, by updating
[`channels.nix`](https://github.com/NixOS/nixos-org-configurations/blob/master/channels.nix) in `nixos-org-configurations`
[`channels.nix`](https://github.com/NixOS/infra/blob/master/channels.nix) in `infra`
and nag the infrastructure team to get these changes deployed.

Example: [22.11](https://github.com/NixOS/nixos-org-configurations/commit/9a0b3674a11b445c973334c78e8ca0eda36775e4)
Example: [22.11](https://github.com/NixOS/infra/commit/9a0b3674a11b445c973334c78e8ca0eda36775e4)

1. Create the backport [labels](https://github.com/NixOS/nixpkgs/labels) for all new branches:
- `backport staging-21.05`
Expand All @@ -171,7 +171,7 @@ The following steps should be done after the channels have become available on [
```bash
git clone [email protected]:nixos/nixos-search
nix --extra-experimental-features "nix-command flakes" flake lock --update-input nixos-org-configurations
nix --extra-experimental-features "nix-command flakes" flake lock --update-input nixos-infra
```

1. Give the [Marketing team](https://matrix.to/#/#marketing:nixos.org) a heads-up about the upcoming release
Expand Down
8 changes: 4 additions & 4 deletions src/EOL-Cleanup.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
The old release reaches its end of life one month after the new release
gets released. At that point a few cleanup tasks need to be done.

1. Set the EOL channel status from `deprecated` to `unmaintained` in `nixos-org-configurations`. Examples:
- [channels: Deprecate NixOS 22.05](https://github.com/NixOS/nixos-org-configurations/pull/229)
- [channels: Mark 21.11 as unmaintained](https://github.com/NixOS/nixos-org-configurations/pull/211)
- [channels:21.05 is unmaintained](https://github.com/NixOS/nixos-org-configurations/pull/201)
1. Set the EOL channel status from `deprecated` to `unmaintained` in `infra`. Examples:
- [channels: Deprecate NixOS 22.05](https://github.com/NixOS/infra/pull/229)
- [channels: Mark 21.11 as unmaintained](https://github.com/NixOS/infra/pull/211)
- [channels:21.05 is unmaintained](https://github.com/NixOS/infra/pull/201)

1. Once this is merged, update the [`nixos-search`](https://github.com/NixOS/nixos-search)
repository to reflect that status on [search.nixos.org](https://search.nixos.org).
Expand Down
6 changes: 3 additions & 3 deletions src/Final-Release.md
Original file line number Diff line number Diff line change
Expand Up @@ -166,16 +166,16 @@ export NEWVER=23.05
The website is hosted by a CDN so you may occasionally see the old site for a couple of minutes/hours (?) after your changes
1. Update [nixos-org-configurations](https://github.com/NixOS/nixos-org-configurations) to reflect the `stable` channel
1. Update [infra](https://github.com/NixOS/infra) to reflect the `stable` channel
status for $NEWVER and the `deprecated` status for $OLDVER.
Examples: [22.11](https://github.com/NixOS/nixos-org-configurations/pull/228), [22.05](https://github.com/NixOS/nixos-org-configurations/pull/210), [21.11](https://github.com/NixOS/nixos-org-configurations/pull/192)
Examples: [22.11](https://github.com/NixOS/infra/pull/228), [22.05](https://github.com/NixOS/infra/pull/210), [21.11](https://github.com/NixOS/infra/pull/192)
1. Create a new topic on [Discourse](https://discourse.nixos.org/) to announce the release.
Examples: [22.11](https://discourse.nixos.org/t/nixos-22-11-released/23637), [22.05](https://discourse.nixos.org/t/nixos-22-05-released/19404)
1. Once the Pull Request in `nixos-org-configurations` is merged, update [nixos-search](https://github.com/NixOS/nixos-search/) to mark the channel as released.
1. Once the Pull Request in `infra` is merged, update [nixos-search](https://github.com/NixOS/nixos-search/) to mark the channel as released.
This is the same process as for the creation of the beta channel in the project.
## After Release
Expand Down
2 changes: 1 addition & 1 deletion src/Zero-Hydra-Failures.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ There is an autoscaler in place for aarch64-linux and x86_64-linux while the
darwin allocations are pretty much static.

If capacity issues are apparent, contact the infrastructure team on the
`nixos-org-configurations` repository (example: [21.11 example](https://github.com/NixOS/nixos-org-configurations/issues/186)),
`infra` repository (example: [21.11 example](https://github.com/NixOS/infra/issues/186)),
and start a discussion in [#infra:nixos.org](https://matrix.to/#/#infra:nixos.org).

## ZHF issue
Expand Down

0 comments on commit f1e6f18

Please sign in to comment.