From 6aa6d925f163cc38d85a8b9b577778868bf87f52 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Thu, 24 Apr 2025 12:47:12 -0600 Subject: [PATCH 1/5] add version number to release --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3801a8c..0bbca8f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,7 +62,7 @@ release-job: assets: links: - name: "v$PKG_VERSION" - url: "${PKG_REGISTRY_URL}/x86_64-unknown-linux-gnu/v${PKG_VERSION}/nyxi-installer" + url: "${PKG_REGISTRY_URL}/x86_64-unknown-linux-gnu/v${PKG_VERSION}/nyxi-installer-v${PKG_VERSION}" upload-job: stage: release From c56acc8a33c70bb5a5953e8db3038cc6d0f78879 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Thu, 24 Apr 2025 12:56:56 -0600 Subject: [PATCH 2/5] fix issue with data directory --- src/main.rs | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/src/main.rs b/src/main.rs index 7638f49..372549f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -114,7 +114,7 @@ fn grab_flake() { easy.url("https://gitlab.com/ahoneybun/nix-configs/-/raw/main/flake.nix") .unwrap(); - let mut file = File::create("data/flake.nix").unwrap(); + let mut file = File::create("flake.nix").unwrap(); { let mut transfer = easy.transfer(); @@ -133,7 +133,7 @@ fn grab_config() { easy.url("https://gitlab.com/ahoneybun/nix-configs/-/raw/main/configuration.nix") .unwrap(); - let mut file = File::create("data/configuration.nix").unwrap(); + let mut file = File::create("configuration.nix").unwrap(); { let mut transfer = easy.transfer(); @@ -152,7 +152,7 @@ fn grab_home() { easy.url("https://gitlab.com/ahoneybun/nix-configs/-/raw/main/home.nix") .unwrap(); - let mut file = File::create("data/home.nix").unwrap(); + let mut file = File::create("home.nix").unwrap(); { let mut transfer = easy.transfer(); @@ -172,7 +172,7 @@ fn grab_gnome() { .url("https://gitlab.com/ahoneybun/nix-configs/-/raw/main/desktops/gnome.nix") .unwrap(); - let mut config_file = File::create("data/gnome.nix").unwrap(); + let mut config_file = File::create("gnome.nix").unwrap(); { let mut transfer = gnome_config.transfer(); @@ -245,12 +245,7 @@ fn main() { // Copies the nix files to /mnt/etc/nixos/ let _nix_move = Command::new("mv") - .args([ - "-f", - "data/flake.nix", - "data/configuration.nix", - "data/home.nix", - ]) + .args(["-f", "flake.nix", "configuration.nix", "home.nix"]) .arg("/mnt/etc/nixos") .output() .expect("Failed to move nix files over"); @@ -289,7 +284,7 @@ fn main() { let mut garrus_config = Easy::new(); garrus_config.url("https://gitlab.com/ahoneybun/nix-configs/-/raw/main/hosts/x86_64/garrus/configuration.nix").unwrap(); - let mut config_file = File::create("data/garrus.nix").unwrap(); + let mut config_file = File::create("garrus.nix").unwrap(); { let mut transfer = garrus_config.transfer(); @@ -304,7 +299,7 @@ fn main() { // Copies the system nix files to /mnt/etc/nixos/ let _garrus_nix_copy = Command::new("mv") - .args(["data/garrus.nix", "data/gnome.nix", "/mnt/etc/nixos"]) + .args(["garrus.nix", "gnome.nix", "/mnt/etc/nixos"]) .output() .expect("Failed to copy nix files over"); @@ -326,7 +321,7 @@ fn main() { let mut vm_config = Easy::new(); vm_config.url("https://gitlab.com/ahoneybun/nix-configs/-/raw/main/hosts/x86_64/vm/configuration.nix").unwrap(); - let mut config_file = File::create("data/vm.nix").unwrap(); + let mut config_file = File::create("vm.nix").unwrap(); { let mut transfer = vm_config.transfer(); @@ -341,7 +336,7 @@ fn main() { // Copies the system nix files to /mnt/etc/nixos/ let _garrus_nix_copy = Command::new("mv") - .args(["data/vm.nix", "/mnt/etc/nixos"]) + .args(["vm.nix", "/mnt/etc/nixos"]) .output() .expect("Failed to copy nix files over"); From 58b2337efa724bf5fa4a12130f7836614468e073 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Thu, 24 Apr 2025 13:12:27 -0600 Subject: [PATCH 3/5] run when a tag is manually created --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0bbca8f..f69d56f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -53,7 +53,6 @@ release-job: - echo "======== RELEASE JOB ========" rules: - if: $CI_COMMIT_TAG - when: never # Do not run this job when a tag is created manually - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Run this job when commits are pushed or merged to the default branch release: tag_name: "v$PKG_VERSION" From 40d1209d75f93c791582556753ca389c8b5881a5 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Thu, 24 Apr 2025 13:16:45 -0600 Subject: [PATCH 4/5] hotfix with nix file creation --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 69aee11..6a365e2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nyxi-installer" -version = "2.0.0" +version = "2.0.1" edition = "2021" [dependencies] From 0d32bf0d6edb67c398537aff1d555f48999b9631 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Thu, 24 Apr 2025 13:26:01 -0600 Subject: [PATCH 5/5] fix release upload --- .gitlab-ci.yml | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f69d56f..6bf9262 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,7 +61,7 @@ release-job: assets: links: - name: "v$PKG_VERSION" - url: "${PKG_REGISTRY_URL}/x86_64-unknown-linux-gnu/v${PKG_VERSION}/nyxi-installer-v${PKG_VERSION}" + url: "${PKG_REGISTRY_URL}/x86_64-unknown-linux-gnu/v${PKG_VERSION}/nyxi-installer" upload-job: stage: release diff --git a/Cargo.toml b/Cargo.toml index 6a365e2..2e8fa81 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nyxi-installer" -version = "2.0.1" +version = "2.0.2" edition = "2021" [dependencies]