diff --git a/.github/labeler.yml b/.github/labeler.yml index 9cda3b0..2f3a4ee 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -41,4 +41,4 @@ tests: - "tests/**" release: - - base-branch: "main" + - base-branch: "trunk" diff --git a/.github/workflows/autofix.yml b/.github/workflows/autofix.yml index 89980c0..3ad0296 100644 --- a/.github/workflows/autofix.yml +++ b/.github/workflows/autofix.yml @@ -3,7 +3,7 @@ name: autofix.ci on: pull_request: push: - branches: ["main"] + branches: ["trunk"] permissions: contents: read diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index 8f94748..15b3af6 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -2,7 +2,7 @@ name: "Pages" on: push: - branches: [main] + branches: [stable] workflow_dispatch: jobs: pre-job: diff --git a/README.md b/README.md index b4df627..c246018 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # wire -![Rust Tests Status](https://img.shields.io/github/actions/workflow/status/mrshmllow/wire/test.yml?branch=main&style=flat-square&label=Rust%20Tests) -![BuildBot Build & VM Test Status](https://img.shields.io/github/checks-status/mrshmllow/wire/main?style=flat-square&label=BuildBot%20Build%20%26%20VM%20Tests) -![Documentation Status](https://img.shields.io/github/actions/workflow/status/mrshmllow/wire/pages.yml?branch=main&style=flat-square&label=Documentation) +![Rust Tests Status](https://img.shields.io/github/actions/workflow/status/mrshmllow/wire/test.yml?branch=trunk&style=flat-square&label=Rust%20Tests) +![BuildBot Build & VM Test Status](https://img.shields.io/github/checks-status/mrshmllow/wire/trunk?style=flat-square&label=BuildBot%20Build%20%26%20VM%20Tests) +![Documentation Status](https://img.shields.io/github/actions/workflow/status/mrshmllow/wire/pages.yml?branch=trunk&style=flat-square&label=Documentation) wire is a tool to deploy nixos systems. its usage is inspired by colmena however it is not a fork. diff --git a/bench/run.nix b/bench/run.nix index 754ac1f..1f51af4 100644 --- a/bench/run.nix +++ b/bench/run.nix @@ -33,7 +33,7 @@ sleep 30 echo "awake" - wire_main=$(nix build --print-out-paths github:mrshmllow/wire#wire-small --no-link) + wire_trunk=$(nix build --print-out-paths github:mrshmllow/wire#wire-small --no-link) wire_args="apply test --path ./wire -vv --ssh-accept-host -p 10" colmena_args="apply test --config ./colmena/hive.nix -v -p 10" @@ -41,7 +41,7 @@ --export-markdown stats.md \ --export-json run.json \ "${lib.getExe self'.packages.wire-small} $wire_args" -n "wire@HEAD" \ - "$wire_main/bin/wire $wire_args" -n "wire@main" \ + "$wire_trunk/bin/wire $wire_args" -n "wire@trunk" \ "${lib.getExe' inputs.colmena_benchmarking.packages.x86_64-linux.colmena "colmena"} $colmena_args" \ -n "colmena@pinned" ''; diff --git a/doc/.vitepress/config.ts b/doc/.vitepress/config.ts index f21170d..5a37c38 100644 --- a/doc/.vitepress/config.ts +++ b/doc/.vitepress/config.ts @@ -20,7 +20,7 @@ export default withMermaid( footer: { message: - 'Released under the AGPL-3.0 License.', + 'Released under the AGPL-3.0 License.', copyright: "Copyright 2024-2025 wire Contributors", }, @@ -35,7 +35,7 @@ export default withMermaid( items: [ { text: "Changelog", - link: "https://github.com/mrshmllow/wire/blob/main/CHANGELOG.md", + link: "https://github.com/mrshmllow/wire/blob/trunk/CHANGELOG.md", }, ], }, @@ -128,7 +128,7 @@ export default withMermaid( }, editLink: { - pattern: "https://github.com/mrshmllow/wire/edit/main/doc/:path", + pattern: "https://github.com/mrshmllow/wire/edit/trunk/doc/:path", text: "Edit this page on GitHub", }, diff --git a/doc/snippets/default.nix b/doc/snippets/default.nix index 6136b88..4d6c452 100644 --- a/doc/snippets/default.nix +++ b/doc/snippets/default.nix @@ -1,6 +1,4 @@ { - getting-started-hm = import ./getting-started/home.nix; - getting-started-hm-flake = import ./getting-started/hm.flake.nix; getting-started-nixos = import ./getting-started/configuration.nix; getting-started-nixos-flake = import ./getting-started/nixos.flake.nix; getting-started-cache = import ./getting-started/cache.nix; diff --git a/doc/snippets/getting-started/configuration.nix b/doc/snippets/getting-started/configuration.nix index d70d3c6..29b30b3 100644 --- a/doc/snippets/getting-started/configuration.nix +++ b/doc/snippets/getting-started/configuration.nix @@ -1,7 +1,7 @@ {system, ...}: let wire = import ( # [!code ++] - builtins.fetchTarball "https://github.com/mrshmllow/wire/archive/refs/heads/main.tar.gz" # [!code ++] + builtins.fetchTarball "https://github.com/mrshmllow/wire/archive/refs/heads/trunk.tar.gz" # [!code ++] ); # [!code ++] in { environment.systemPackages = [ diff --git a/doc/snippets/getting-started/flake-merged.nix b/doc/snippets/getting-started/flake-merged.nix index b2e974e..d43b2aa 100644 --- a/doc/snippets/getting-started/flake-merged.nix +++ b/doc/snippets/getting-started/flake-merged.nix @@ -2,45 +2,47 @@ inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; inputs.wire.url = "github:mrshmllow/wire"; - outputs = { - self, - nixpkgs, - wire, - ... - } @ inputs: { - wire = wire.makeHive { - # Give wire our ninixosConfigurations - inherit (self) nixosConfigurations; + outputs = + { + self, + nixpkgs, + wire, + ... + }@inputs: + { + wire = wire.makeHive { + # Give wire our ninixosConfigurations + inherit (self) nixosConfigurations; - meta = { - # ... from above - }; + meta = { + # ... from above + }; - node-a.deployment = { - # ... + node-a.deployment = { + # ... + }; }; - }; - nixosConfigurations = { - node-a = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = {inherit inputs;}; - modules = [ - { - nixpkgs.hostPlatform = "x86_64-linux"; - } - ]; - }; + nixosConfigurations = { + node-a = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = { inherit inputs; }; + modules = [ + { + nixpkgs.hostPlatform = "x86_64-linux"; + } + ]; + }; - node-b = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = {inherit inputs;}; - modules = [ - { - nixpkgs.hostPlatform = "x86_64-linux"; - } - ]; + node-b = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = { inherit inputs; }; + modules = [ + { + nixpkgs.hostPlatform = "x86_64-linux"; + } + ]; + }; }; }; - }; } diff --git a/doc/snippets/getting-started/hm.flake.nix b/doc/snippets/getting-started/hm.flake.nix deleted file mode 100644 index 639edfa..0000000 --- a/doc/snippets/getting-started/hm.flake.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - inputs = { - # ... - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - home-manager = { - url = "github:nix-community/home-manager"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - wire.url = "github:mrshmllow/wire"; # [!code ++] - }; - - outputs = { - # ... - nixpkgs, - home-manager, - wire, # [!code ++] - ... - }: let - system = "x86_64-linux"; - pkgs = nixpkgs.legacyPackages.${system}; - in { - homeConfigurations.my-user = home-manager.lib.homeManagerConfiguration { - inherit pkgs; - modules = [ - # ... - { - home.packages = [ - wire.packages.${system}.wire # [!code ++] - ]; - } - ]; - }; - }; -} diff --git a/doc/snippets/getting-started/home.nix b/doc/snippets/getting-started/home.nix deleted file mode 100644 index f62235a..0000000 --- a/doc/snippets/getting-started/home.nix +++ /dev/null @@ -1,12 +0,0 @@ -{system, ...}: let - wire = import ( - # [!code ++] - builtins.fetchTarball "https://github.com/mrshmllow/wire/archive/refs/heads/main.tar.gz" # [!code ++] - ); # [!code ++] -in { - home.packages = [ - wire.packages.${system}.wire # [!code ++] - ]; - - # ... -} diff --git a/doc/tutorial/overview.md b/doc/tutorial/overview.md index c33af20..5f72942 100644 --- a/doc/tutorial/overview.md +++ b/doc/tutorial/overview.md @@ -52,7 +52,7 @@ Ready? Skip to [Nix Setup](./part-one/nix-setup). ### Speed wire is about >2x faster than colmena deploying [identical large -hives](https://github.com/mrshmllow/wire/blob/main/bench/run.nix). +hives](https://github.com/mrshmllow/wire/blob/trunk/bench/run.nix). | Command | Mean [s] | Min [s] | Max [s] | Relative | | :--------------- | ---------------: | ------: | ------: | ----------: | diff --git a/garnix.yaml b/garnix.yaml index f52eca6..17c2299 100644 --- a/garnix.yaml +++ b/garnix.yaml @@ -1,3 +1,3 @@ builds: exclude: ["checks.*.*"] - branch: main + branch: trunk