Release v0.34.0 (#1394)

* Update Cargo.toml and fixtures to v0.34.0 * Update Cargo.lock prior to v0.34.0 * flake.lock: Update Flake lock file updates: • Updated input 'nixpkgs': 'https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.737779%2Brev-9abb87b552b7f55ac8916b6fc9e5cb486656a2f3/019463c0-2408-72ce-9579-5965e6e5e05b/source.tar.gz?narHash=sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ%3D' (2025-01-13) → 'https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.738172%2Brev-eb62e6aa39ea67e0b8018ba8ea077efe65807dc8/01946c30-5ff9-7d30-acd1-28101cd9be64/source.tar.gz?narHash=sha256-uQ%2BNQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140%3D' (2025-01-14) * Add prepare-release.sh * checkout -b -> checkout -B * Update Cargo.lock first, then Cargo.toml * Use toml-cli for updating Cargo.toml * fixup: correct order and update commit messages --------- Co-authored-by: Cole Helbling <[email protected]>
DeterminateSystems · Jan 16, 2025 · 9c5542a · 9c5542a
1 parent d7de0e4
commit 9c5542a
Show file tree

Hide file tree

Showing 9 changed files with 62 additions and 20 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -348,21 +348,21 @@ You can also remove your `$HOME/nix-installer-wsl-tests-temp` folder whenever yo
 
 This package uses [Semantic Versioning](https://semver.org/). When determining the version number for a new release refer to Semantic Versioning for guidance. You can use the `check-semver` command alias from within the development environment to validate your changes don't break semver.
 
-To cut a release:
+To cut a release, run `./prepare-release.sh 0.0.1`.
+This script will:
 
 - 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 update --aggressive`
   - `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
+- Update the versions in the fixture data in `test/fixtures/**/*.json`
+- Push the branch, create a PR ("Release v0.0.1").
+  This pull request will automatically run VM and container tests:
   - `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`
-- Update the versions in the fixture data in `test/fixtures/**/*.json`
-- Push the branch, create a PR ("Release v0.0.1")
 - Once the PR tests pass and it has been reviewed, merge it
 - Checkout the `main` branch and `git pull`
 - Prepare a draft release that creates the new tag on publish

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "nix-installer"
 description = "The Determinate Nix Installer"
-version = "0.33.0"
+version = "0.34.0"
 edition = "2021"
 resolver = "2"
 license = "LGPL-2.1"

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -132,6 +132,7 @@
               check.check-semver
               check.check-clippy
               editorconfig-checker
+              toml-cli
             ]
             ++ lib.optionals (pkgs.stdenv.isLinux) (with pkgs; [
               checkpolicy

diff --git a/prepare-release.sh b/prepare-release.sh
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+set -eux
+
+version=$1
+
+if ! echo "$version" | grep -q "^[[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+$"; then
+  echo "argv[1] needs to be a version, in x.y.z format."
+  exit 1
+fi
+
+git fetch
+git checkout origin/main
+git checkout -B "release-v$version"
+
+nix flake update --commit-lock-file
+
+cargo update --aggressive
+git add Cargo.lock
+git commit -m "Update Cargo.lock dependencies"
+
+toml set ./Cargo.toml package.version "$version" > Cargo.toml.next
+mv Cargo.toml.next Cargo.toml
+git add Cargo.toml
+
+cargo fetch
+git add Cargo.lock
+
+for fname in $(find ./tests/fixtures -name '*.json'); do
+  cat "$fname" \
+    | jq '.version = $version | .diagnostic_data.version = $version' --arg version "$version" \
+    > "$fname.next"
+  mv "$fname.next" "$fname"
+  git add "$fname"
+done
+
+git commit -m "Release v$version"
+
+cargo outdated --ignore-external-rel --aggressive
+
+echo "Complete"
diff --git a/tests/fixtures/linux/linux.json b/tests/fixtures/linux/linux.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.33.0",
+  "version": "0.34.0",
   "actions": [
     {
       "action": {
@@ -1164,7 +1164,7 @@
   },
   "diagnostic_data": {
     "attribution": null,
-    "version": "0.33.0",
+    "version": "0.34.0",
     "planner": "linux",
     "configured_settings": [],
     "os_name": "Ubuntu",

diff --git a/tests/fixtures/linux/steam-deck.json b/tests/fixtures/linux/steam-deck.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.33.0",
+  "version": "0.34.0",
   "actions": [
     {
       "action": {
@@ -1224,7 +1224,7 @@
   },
   "diagnostic_data": {
     "attribution": null,
-    "version": "0.33.0",
+    "version": "0.34.0",
     "planner": "steam-deck",
     "configured_settings": [],
     "os_name": "SteamOS",

diff --git a/tests/fixtures/macos/macos.json b/tests/fixtures/macos/macos.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.33.0",
+  "version": "0.34.0",
   "actions": [
     {
       "action": {
@@ -1266,7 +1266,7 @@
   },
   "diagnostic_data": {
     "attribution": null,
-    "version": "0.33.0",
+    "version": "0.34.0",
     "planner": "macos",
     "configured_settings": [],
     "os_name": "unknown",