sercanto/infra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nixpkgs-update: various

Browse source 
- remove response escaping

- add NIXPKGS_UPDATE_BIN, WORKER_NAME to worker env
This commit is contained in:
zowoq 2024-10-19 14:46:56 +10:00
parent ca0f1c1ab5
commit e37d6f9f6c
2 changed files with 7 additions and 4 deletions

3
hosts/build02/nixpkgs-update.nix
View file

@ -56,6 +56,9 @@ let
StandardOutput = "journal"; StandardOutput = "journal";
}; };
environment.NIXPKGS_UPDATE_BIN = nixpkgs-update-bin;
environment.WORKER_NAME = name;
script = builtins.readFile ./worker.bash; script = builtins.readFile ./worker.bash;
}; };

8
hosts/build02/worker.bash
View file

@ -1,14 +1,14 @@
mkdir -p "$LOGS_DIRECTORY/~workers/" mkdir -p "$LOGS_DIRECTORY/~workers/"
# This is for public logs at nixpkgs-update-logs.nix-community.org/~workers # This is for public logs at nixpkgs-update-logs.nix-community.org/~workers
exec > >(rotatelogs -eD "$LOGS_DIRECTORY"'/~workers/%Y-%m-%d-${name}.stdout.log' 86400) exec > >(rotatelogs -eD "$LOGS_DIRECTORY/~workers/%Y-%m-%d-${WORKER_NAME}.stdout.log" 86400)
exec 2> >(rotatelogs -eD "$LOGS_DIRECTORY"'/~workers/%Y-%m-%d-${name}.stderr.log' 86400 >&2) exec 2> >(rotatelogs -eD "$LOGS_DIRECTORY/~workers/%Y-%m-%d-${WORKER_NAME}.stderr.log" 86400 >&2)
socket=/run/nixpkgs-update-supervisor/work.sock socket=/run/nixpkgs-update-supervisor/work.sock
function run-nixpkgs-update { function run-nixpkgs-update {
exit_code=0 exit_code=0
set -x set -x
timeout 6h ${nixpkgs-update-bin} update-batch --pr --outpaths --nixpkgs-review "$attr_path $payload" || exit_code=$? timeout 6h "${NIXPKGS_UPDATE_BIN}" update-batch --pr --outpaths --nixpkgs-review "$attr_path $payload" || exit_code=$?
set +x set +x
if [ $exit_code -eq 124 ]; then if [ $exit_code -eq 124 ]; then
echo "Update was interrupted because it was taking too long." echo "Update was interrupted because it was taking too long."
@ -28,7 +28,7 @@ while true; do
sleep 60 sleep 60
;; ;;
JOB\ *) JOB\ *)
read -r attr_path payload <<< "''${response#JOB }" read -r attr_path payload <<< "${response#JOB }"
# If one worker is initializing the nixpkgs clone, the other will # If one worker is initializing the nixpkgs clone, the other will
# try to use the incomplete clone, consuming a bunch of jobs and # try to use the incomplete clone, consuming a bunch of jobs and
# throwing them away. So we use a crude locking mechanism to # throwing them away. So we use a crude locking mechanism to