Skip to content

Commit

Permalink
Release v0.24.0 (#1137)
Browse files Browse the repository at this point in the history
* flake.lock: Update

Flake lock file updates:

• Updated input 'fenix':
    'https://api.flakehub.com/f/pinned/nix-community/fenix/0.1.1955%2Brev-60ab4a085ef6ee40f2ef7921ca4061084dd8cf26/01910d03-2462-7e48-b72e-439d1152bd11/source.tar.gz?narHash=sha256-l7/yMehbrL5d4AI8E2hKtNlT50BlUAau4EKTgPg9KcY%3D' (2024-08-01)
  → 'https://api.flakehub.com/f/pinned/nix-community/fenix/0.1.1986%2Brev-28b42d01f549c38bd165296fbcb4fe66d98fc24f/0191aca7-e3ea-728d-bfd8-c4744f4a108d/source.tar.gz?narHash=sha256-BtLY9lWu/pe6/ImFwuRRRqMwLacY5AZOKA2hUHUQ64k%3D' (2024-09-01)
• Updated input 'fenix/rust-analyzer-src':
    'github:rust-lang/rust-analyzer/c8e41d95061543715b30880932ec3dc24c42d7ae?narHash=sha256-1na4m2PNH99syz2g/WQ%2BHr3RfY7k4H8NBnmkr5dFDXw%3D' (2024-07-31)
  → 'github:rust-lang/rust-analyzer/914a1caab54e48a028b2407d0fe6fade89532f67?narHash=sha256-TBujPMMIv8RG6BKlsBEpCln1ePmWz79xTcJOQpU2L18%3D' (2024-08-31)
• Updated input 'nix/nix/flake-compat':
    'github:edolstra/flake-compat/35bb57c0c8d8b62bbfd284272c928ceb64ddbde9?narHash=sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm%2B504Ch3sNKLd8%3D' (2023-01-17)
  → 'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33?narHash=sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U%3D' (2023-10-04)
• Updated input 'nix/nix/flake-parts':
    'github:hercules-ci/flake-parts/9126214d0a59633752a136528f5f3b9aa8565b7d?narHash=sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm%2BGpZNw%3D' (2024-04-01)
  → 'github:hercules-ci/flake-parts/9227223f6d922fee3c7b190b2cc238a99527bbb7?narHash=sha256-pQMhCCHyQGRzdfAkdJ4cIWiw%2BJNuWsTX7f0ZYSyz0VY%3D' (2024-07-03)
• Updated input 'nix/nix/git-hooks-nix':
    'github:cachix/git-hooks.nix/4509ca64f1084e73bc7a721b20c669a8d4c5ebe6?narHash=sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk%3D' (2024-08-28)
  → 'github:cachix/git-hooks.nix/f451c19376071a90d8c58ab1a953c6e9840527fd?narHash=sha256-6FPUl7HVtvRHCCBQne7Ylp4p%2BdpP3P/OYuzjztZ4s70%3D' (2024-07-15)
• Updated input 'nix/nix/nixpkgs':
    'github:NixOS/nixpkgs/6e99f2a27d600612004fbd2c3282d614bfee6421?narHash=sha256-eV%2B63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi%2BM%3D' (2024-08-30)
  → 'github:NixOS/nixpkgs/c3d4ac725177c030b1e289015989da2ad9d56af0?narHash=sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz%2BNG82pbdg%3D' (2024-08-15)
• Updated input 'nix/nixpkgs':
    'https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2405.631440%2Brev-2819fffa7fa42156680f0d282c60d81e8fb185b7/0190034c-678d-7039-b45c-fa38168f2500/source.tar.gz?narHash=sha256-mJi4/gjiwQlSaxjA6AusXBN/6rQRaPCycR7bd8fydnQ%3D' (2024-06-09)
  → 'https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2405.634339%2Brev-797f7dc49e0bc7fab4b57c021cdf68f595e47841/01917ea1-8ce4-7d71-a601-f943a160def2/source.tar.gz?narHash=sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE%3D' (2024-08-22)
• Updated input 'nixpkgs':
    'https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.672439%2Brev-71e91c409d1e654808b2621f28a327acfdad8dc2/01919c14-b63e-7736-a9e9-48bee9f65f2b/source.tar.gz?narHash=sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w%3D' (2024-08-28)
  → 'https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.674318%2Brev-12228ff1752d7b7624a54e9c1af4b222b3c1073b/0191adaa-df39-7d38-92e0-798658d0033f/source.tar.gz?narHash=sha256-Ym04C5%2BqovuQDYL/rKWSR%2BWESseQBbNAe5DsXNx5trY%3D' (2024-08-31)

* Drop patched cargo-outdated

* cargo update --aggressive

* CONTRIBUTING: update release process to align with reality

* Release v0.24.0

* ci: fixup release checks conditional
  • Loading branch information
cole-h authored Sep 3, 2024
1 parent cc38e99 commit 661fe1c
Show file tree
Hide file tree
Showing 11 changed files with 55 additions and 168 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ jobs:
name: Run x86_64 Linux release checks
runs-on: UbuntuLatest64Cores256GX86
needs: [lints, build-x86_64-linux]
if: contains(github.ref, 'release-')
if: contains(github.ref, 'release-') || contains(github.head_ref, 'release-')
permissions:
id-token: "write"
contents: "read"
Expand Down
21 changes: 8 additions & 13 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -364,28 +364,23 @@ This package uses [Semantic Versioning](https://semver.org/). When determining t

To cut a release:

* Create a release branch from `main` (`git checkout -b release-v0.0.1`)
+ Release PRs should not contain any installer-related changes which require review
* Ensure the `flake.lock`, `Cargo.lock`, and Rust dependencies are up-to-date with the following:
+ `nix flake update --commit-lock-file`
+ `cargo outdated --ignore-external-rel --aggressive`
+ `cargo update --aggressive`
+ Make a PR for for this and let it get merged separately
* Create a release branch from `main` (`git checkout -b release-v0.0.1`)
* Remove the `-unreleased` from the `version` field in `Cargo.toml` and the fixture JSON files
+ Release PRs should not contain any tangible code changes which require review
+ `cargo outdated --ignore-external-rel --aggressive`
* Ensure the VM / container tests still pass with the following:
+ NOTE: At time of writing, these are run in CI on release branches
+ `nix flake check -L`
+ `nix build .#hydraJobs.container-test.all.x86_64-linux.all -L -j 6`
+ `nix build .#hydraJobs.vm-test.all.x86_64-linux.all -L -j 6`
* Push the branch, create a PR ("Release v0.0.1")
* Once the PR tests pass and it has been reviewed, merge it
* `git pull` on the `main` branch
* Tag the release (`git tag v0.0.1`)
* Push the tag (`git push origin v0.0.1`)
* The CI should produce artifacts via Buildkite and create a "Draft" release containing them on GitHub
+ This will take a bit, use this time to draft a changelog
* Review the draft release, test the artifacts in a VM
* Create a changelog following the format of last release
* Checkout the `main` branch and `git pull`
* Prepare a draft release that creates the new tag on publish
+ Create a changelog following the format of the last release
* Undraft the release
* CI will produce artifacts and upload them to the release
* Once you are certain the release is good, `cargo publish` it
+ **Warning:** While you can re-release Github releases, it is not possible to do the same on `crates.io`
* Create a PR bumping the version up one minor in the `Cargo.toml` and fixture JSON files, adding `-unreleased` at the end (`v0.0.2-unreleased`)
24 changes: 12 additions & 12 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "nix-installer"
description = "The Determinate Nix Installer"
version = "0.23.0"
version = "0.24.0"
edition = "2021"
resolver = "2"
license = "LGPL-2.1"
Expand Down
60 changes: 30 additions & 30 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 0 additions & 7 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,6 @@
};
});

# NOTE(cole-h): Got hit by the Rust 1.80 x time incompatibility issue:
# https://github.com/NixOS/nixpkgs/issues/332957
# Can be removed once https://github.com/NixOS/nixpkgs/pull/335152 merges.
cargo-outdated = final.callPackage ./nix/cargo-outdated.nix {
inherit (final.darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security SystemConfiguration;
};

nix-installer = naerskLib.buildPackage sharedAttrs;
} // nixpkgs.lib.optionalAttrs (prev.stdenv.system == "x86_64-linux") rec {
default = nix-installer-static;
Expand Down
54 changes: 0 additions & 54 deletions nix/cargo-outdated-update-time-dep.patch

This file was deleted.

47 changes: 0 additions & 47 deletions nix/cargo-outdated.nix

This file was deleted.

2 changes: 1 addition & 1 deletion tests/fixtures/linux/linux.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.23.0",
"version": "0.24.0",
"actions": [
{
"action": {
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/linux/steam-deck.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.23.0",
"version": "0.24.0",
"actions": [
{
"action": {
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/macos/macos.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.23.0",
"version": "0.24.0",
"actions": [
{
"action": {
Expand Down

0 comments on commit 661fe1c

Please sign in to comment.