From 904de577261e7024373e7a42fd763184764238f9 Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Tue, 10 Oct 2023 13:15:59 -0400 Subject: Don't swallow namespace-parsing errors Previously, if there was a problem with the inputs and bild failed to determine the namespace, 'fromPath' would return 'Nothing' and then 'catMaybes' would drop the error-causing input altogether. In the one time that I had a bad input, this made debugging incredibly difficult. It's always a bad idea to swallow errors silently, so instead lets just kill the program if we have bad inputs. --- Biz/Cloud/post-receive | 39 --------------------------------------- Biz/Cloud/post-receive.bash | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 39 deletions(-) delete mode 100755 Biz/Cloud/post-receive create mode 100755 Biz/Cloud/post-receive.bash (limited to 'Biz/Cloud') diff --git a/Biz/Cloud/post-receive b/Biz/Cloud/post-receive deleted file mode 100755 index 4a67043..0000000 --- a/Biz/Cloud/post-receive +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env bash -# -# creates an archive of a git repo on push -# -# unfortunately the nixos gitolite module does not copy the 'commonHooks' -# properly, so we have to manually deploy this like so: -# -# scp Biz/Cloud/post-receive \ -# root@simatime.com:/srv/git/.gitolite/hooks/common/post-receive -# -# One time only: -# -# ssh root@simatime.com "sudo -u git gitolite setup -ho" -# -# Also on first-time setup, might need to manually check the permissions are -# correct on $webroot/archive or wherever else. -# -set -euo pipefail -while read oldrev newrev refname -do - if [[ -e ./git-daemon-export-ok ]] - then - repo=$(basename $PWD | sed 's/.git//g') - branch=$(git rev-parse --symbolic --abbrev-ref $refname) - webroot="/srv/www/simatime.com/" - outdir="$webroot/archive/$repo/$branch" - mkdir -p $outdir - echo " making: https://simatime.com/archive/$repo/$branch/$newrev.tar.gz" - git archive "$branch" --prefix "$repo-$branch/" --format tar \ - | gzip > "$outdir/$newrev.tar.gz" - echo " making: https://simatime.com/archive/$repo/$branch/$newrev.sha256" - hash=$(nix-prefetch-url --unpack file://$outdir/$newrev.tar.gz 2>/dev/null) - echo "$hash" > "$outdir/$newrev.sha256" - echo " commit: $newrev" - echo " sha256: $hash" - echo " in biz: deps update $repo --branch $branch --rev $newrev --attribute sha256=$hash" - chmod -R 755 "$webroot/archive" - fi -done diff --git a/Biz/Cloud/post-receive.bash b/Biz/Cloud/post-receive.bash new file mode 100755 index 0000000..4a67043 --- /dev/null +++ b/Biz/Cloud/post-receive.bash @@ -0,0 +1,39 @@ +#!/usr/bin/env bash +# +# creates an archive of a git repo on push +# +# unfortunately the nixos gitolite module does not copy the 'commonHooks' +# properly, so we have to manually deploy this like so: +# +# scp Biz/Cloud/post-receive \ +# root@simatime.com:/srv/git/.gitolite/hooks/common/post-receive +# +# One time only: +# +# ssh root@simatime.com "sudo -u git gitolite setup -ho" +# +# Also on first-time setup, might need to manually check the permissions are +# correct on $webroot/archive or wherever else. +# +set -euo pipefail +while read oldrev newrev refname +do + if [[ -e ./git-daemon-export-ok ]] + then + repo=$(basename $PWD | sed 's/.git//g') + branch=$(git rev-parse --symbolic --abbrev-ref $refname) + webroot="/srv/www/simatime.com/" + outdir="$webroot/archive/$repo/$branch" + mkdir -p $outdir + echo " making: https://simatime.com/archive/$repo/$branch/$newrev.tar.gz" + git archive "$branch" --prefix "$repo-$branch/" --format tar \ + | gzip > "$outdir/$newrev.tar.gz" + echo " making: https://simatime.com/archive/$repo/$branch/$newrev.sha256" + hash=$(nix-prefetch-url --unpack file://$outdir/$newrev.tar.gz 2>/dev/null) + echo "$hash" > "$outdir/$newrev.sha256" + echo " commit: $newrev" + echo " sha256: $hash" + echo " in biz: deps update $repo --branch $branch --rev $newrev --attribute sha256=$hash" + chmod -R 755 "$webroot/archive" + fi +done -- cgit v1.2.3