feat: add local binaries update system #629
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -116,7 +116,7 @@ help: ## Show this help message. | |||||
| ##@ General | ||||||
|
|
||||||
| .PHONY: install | ||||||
| install: setup nix-build nix-switch shell-install ## Set up full environment (setup, flake-update, build, switch, shell-install). | ||||||
|
There was a problem hiding this comment. The help comment for the install target mentions "flake-update" but the target definition no longer includes nix-flake-update (which was removed in this change). The comment should be updated to accurately reflect the current dependencies.
Suggested change
|
||||||
|
|
||||||
| .PHONY: build | ||||||
| build: nix-build ## Build Nix configuration. | ||||||
|
|
@@ -159,26 +159,25 @@ sync: ## Sync dotagents (commands, skills, MCP configuration). | |||||
| .PHONY: test | ||||||
| test: neovim-test shell-test ## Run all tests (neovim + shell). | ||||||
|
|
||||||
| ##@ Update | ||||||
|
|
||||||
| .PHONY: update | ||||||
| update: update-local-binaries ## Update local binaries | ||||||
|
|
||||||
| .PHONY: update-local-binaries | ||||||
| update-local-binaries: ## Update and rebuild local binaries from .local-binaries.txt. | ||||||
| @echo "🔄 Updating local binaries..." | ||||||
| @if [ "$$CI" = "true" ] || [ "$$IN_DOCKER" = "true" ]; then \ | ||||||
| echo "⏭️ Skipping local binaries update in CI/Docker"; \ | ||||||
| else \ | ||||||
| ./scripts/update-local-binaries.sh; \ | ||||||
| fi | ||||||
|
|
||||||
|
|
||||||
| ##@ Upgrade | ||||||
|
|
||||||
| .PHONY: upgrade | ||||||
| upgrade: nix-upgrade overlays-upgrade neovim-upgrade ## Upgrade Nix flake, overlays, Neovim plugins | ||||||
|
|
||||||
| .PHONY: dev | ||||||
| dev: nix-develop ## Enter the Nix dev shell (alias for nix-develop). | ||||||
|
|
@@ -249,8 +248,8 @@ nix-install: ## Install Nix if not already installed. | |||||
|
|
||||||
| ##@ Nix | ||||||
|
|
||||||
| .PHONY: nix-upgrade | ||||||
| nix-upgrade: nix-flake-upgrade nix-build nix-switch ## Upgrade Nix flake, build, and switch. | ||||||
|
|
||||||
| .PHONY: nix-backup | ||||||
| nix-backup: ## Backup configuration files. | ||||||
|
|
@@ -304,8 +303,8 @@ nix-flake-check: ## Check Nix flake configuration. | |||||
| fi | ||||||
| @echo "✅ Nix flake check completed successfully" | ||||||
|
|
||||||
| .PHONY: nix-flake-upgrade | ||||||
| nix-flake-upgrade: nix-connect ## Update flake.lock file. | ||||||
| @echo "♻️ Refreshing flake.lock file..." | ||||||
| @if [ "$$CI" = "true" ] || [ "$$IN_DOCKER" = "true" ] || [ "$$AUTOMATED_UPDATE" = "true" ]; then \ | ||||||
| echo "Bypassing flake update in CI/Docker/automated update"; \ | ||||||
|
|
@@ -509,8 +508,6 @@ shell-install: ## Set up Fish shell as default shell. | |||||
| echo "⚠️ Fish shell not found. Skipping Fish setup."; \ | ||||||
| fi | ||||||
|
|
||||||
|
|
||||||
| ##@ Docker | ||||||
|
|
||||||
|
|
@@ -756,7 +753,7 @@ shell-test-dev: ## Run shell tests inside the Nix dev shell (mirrors CI). | |||||
| .PHONY: shell-check | ||||||
| shell-check: ## Run ShellCheck on shell scripts. | ||||||
| @echo "🔍 Running ShellCheck..." | ||||||
| @find . -name '*.sh' -not -path './node_modules/*' -not -path './.git/*' -not -path './result/*' -not -path './.venv/*' -not -path './.claude/*' -not -path './dotagents/.claude/*' -not -path './dotagents/.codex/*' -print0 | xargs -0 shellcheck | ||||||
|
|
||||||
| .PHONY: shell-check-dev | ||||||
| shell-check-dev: ## Run ShellCheck inside the Nix dev shell (mirrors CI). | ||||||
|
|
@@ -779,3 +776,14 @@ doppler-upload: ## Upload .env file to Doppler (dotfiles/prd). | |||||
| @echo "🔐 Uploading .env to Doppler..." | ||||||
| @doppler secrets upload --project dotfiles --config prd .env | ||||||
| @echo "✅ .env uploaded to Doppler (dotfiles/prd)" | ||||||
|
|
||||||
| ##@ Overlays | ||||||
|
|
||||||
| .PHONY: overlays-upgrade | ||||||
| overlays-upgrade: ## Upgrade all custom overlays to latest versions. | ||||||
| @echo "🔄 Upgrading custom overlays..." | ||||||
| @if [ "$$CI" = "true" ] || [ "$$IN_DOCKER" = "true" ]; then \ | ||||||
| echo "⏭️ Skipping overlay upgrade in CI/Docker"; \ | ||||||
| else \ | ||||||
| ./scripts/upgrade-overlays.sh all; \ | ||||||
| fi | ||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,68 @@ | ||||||||
| { pkgs, ... }: | ||||||||
| let | ||||||||
| inherit (pkgs) lib; | ||||||||
| in | ||||||||
| { | ||||||||
| launchd.agents.make-updater = lib.mkIf pkgs.stdenv.isDarwin { | ||||||||
| enable = true; | ||||||||
| config = { | ||||||||
| ProgramArguments = [ | ||||||||
| "${pkgs.bash}/bin/bash" | ||||||||
| "${./update.sh}" | ||||||||
| ]; | ||||||||
| Environment = { | ||||||||
| PATH = "${ | ||||||||
| lib.makeBinPath [ | ||||||||
| pkgs.git | ||||||||
| pkgs.bash | ||||||||
| pkgs.coreutils | ||||||||
|
Contributor
There was a problem hiding this comment. P2: macOS launchd PATH omits sed/gnused, but make update requires sed, causing the mac updater to fail Prompt for AI agents
|
||||||||
| pkgs.gnumake | ||||||||
| ] | ||||||||
|
Comment on lines
+15
to
+20
Contributor
There was a problem hiding this comment. The |
||||||||
| }:/opt/homebrew/bin:/usr/local/bin"; | ||||||||
|
There was a problem hiding this comment. The Linux systemd service sets AUTOMATED_UPDATE=true but the macOS launchd service doesn't set this environment variable. This creates inconsistent behavior between platforms - on Linux, certain operations will be skipped (like flake updates per the Makefile logic) but on macOS they won't be. Consider setting this variable for both platforms or documenting why the difference is intentional.
Suggested change
|
||||||||
| }; | ||||||||
| StartInterval = 10800; | ||||||||
| StandardOutPath = "/tmp/make-updater.log"; | ||||||||
| StandardErrorPath = "/tmp/make-updater.error.log"; | ||||||||
| }; | ||||||||
| }; | ||||||||
|
|
||||||||
| systemd.user.services.make-updater = lib.mkIf pkgs.stdenv.isLinux { | ||||||||
| Unit = { | ||||||||
| Description = "Make update service"; | ||||||||
| }; | ||||||||
| Service = { | ||||||||
| Type = "oneshot"; | ||||||||
| Environment = [ | ||||||||
| "PATH=${ | ||||||||
| lib.makeBinPath [ | ||||||||
| pkgs.bash | ||||||||
| pkgs.coreutils | ||||||||
| pkgs.curl | ||||||||
| pkgs.gawk | ||||||||
| pkgs.git | ||||||||
| pkgs.gnumake | ||||||||
| pkgs.gnused | ||||||||
| pkgs.nix | ||||||||
| pkgs.sudo | ||||||||
| pkgs.which | ||||||||
| ] | ||||||||
|
Comment on lines
+37
to
+48
Contributor
There was a problem hiding this comment. The |
||||||||
| }" | ||||||||
| "AUTOMATED_UPDATE=true" | ||||||||
| ]; | ||||||||
| ExecStart = "${./update.sh}"; | ||||||||
| }; | ||||||||
| }; | ||||||||
|
|
||||||||
| systemd.user.timers.make-updater = lib.mkIf pkgs.stdenv.isLinux { | ||||||||
| Unit = { | ||||||||
| Description = "Timer for make update"; | ||||||||
| }; | ||||||||
| Timer = { | ||||||||
| OnCalendar = "*-*-* 00/3:00:00"; | ||||||||
| Persistent = true; | ||||||||
| }; | ||||||||
| Install = { | ||||||||
| WantedBy = [ "timers.target" ]; | ||||||||
| }; | ||||||||
| }; | ||||||||
| } | ||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| set -euo pipefail | ||
|
|
||
| cd ~/dotfiles | ||
|
|
||
| make update |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The comment for the
installtarget is out of sync with its dependencies. It still mentionsflake-update, butnix-flake-updatehas been removed from the target. Please update the comment to accurately reflect the target's behavior.