summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Sima <ben@bsima.me>2024-04-07 16:14:10 -0400
committerBen Sima <ben@bsima.me>2024-04-09 22:13:59 -0400
commit14ca07741c500a0a25c7207175e269e5cd766acd (patch)
tree025a1178d981172383d990526a4b479768f44189
parentc43acccbabc02464a6b02bd191199dd0ccd47b52 (diff)
Replace tidy.sh with git clean, add it to ci
I realized that tidy was doing the same thing as git clean, but git clean can do it more robust and exactly. So switch to that and add it to the git test config aliases so I don't accidentally test with old artifacts.
-rw-r--r--.envrc10
-rwxr-xr-xBiz/Ide/tidy.sh2
-rwxr-xr-xBiz/Ide/tips.sh7
3 files changed, 8 insertions, 11 deletions
diff --git a/.envrc b/.envrc
index 05b10d0..8bdfa95 100644
--- a/.envrc
+++ b/.envrc
@@ -38,11 +38,11 @@
# configure git
git config --local core.hooksPath "$CODEROOT/Biz/Ide/hooks"
git config --local branchless.test.strategy worktree
- git config --local branchless.test.alias.default 'CODEROOT=$PWD bild --test **/*'
- git config --local branchless.test.alias.bild 'CODEROOT=$PWD bild **/*'
- git config --local branchless.test.alias.lint 'CODEROOT=$PWD bild Biz/Lint.hs && _/bin/lint **/*'
- git config --local branchless.test.alias.lintfix 'CODEROOT=$PWD bild Biz/Lint.hs && _/bin/lint --fix **/*'
- git config --local branchless.test.alias.ci 'CODEROOT=$PWD Biz/Ci.sh'
+ git config --local branchless.test.alias.default 'git clean -ffdx && CODEROOT=$PWD bild --test **/*'
+ git config --local branchless.test.alias.bild 'git clean -ffdx && CODEROOT=$PWD bild **/*'
+ git config --local branchless.test.alias.lint 'git clean -ffdx && CODEROOT=$PWD bild Biz/Lint.hs && _/bin/lint **/*'
+ git config --local branchless.test.alias.lintfix 'git clean -ffdx && CODEROOT=$PWD bild Biz/Lint.hs && _/bin/lint --fix **/*'
+ git config --local branchless.test.alias.ci 'git clean -ffdx && CODEROOT=$PWD Biz/Ci.sh'
#
# load local settings
. ./.envrc.local
diff --git a/Biz/Ide/tidy.sh b/Biz/Ide/tidy.sh
deleted file mode 100755
index 81a07c4..0000000
--- a/Biz/Ide/tidy.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-rm -f "$CODEROOT"/_/bin/*
diff --git a/Biz/Ide/tips.sh b/Biz/Ide/tips.sh
index 895e54e..c572022 100755
--- a/Biz/Ide/tips.sh
+++ b/Biz/Ide/tips.sh
@@ -2,12 +2,11 @@
echo ""
echo "bizdev" | figlet | lolcat
echo ""
-echo " bild.sh compile code"
+echo " bild compile code"
echo " repl.sh start a repl"
-echo " deps.sh manage dependencies with niv"
+echo " deps manage dependencies with niv"
echo " tips.sh show this message"
-echo " lint.sh auto-lint all changed files"
+echo " lint auto-lint all changed files"
echo " push.sh send a namespace to the cloud"
echo " ship.sh lint, bild, and push one (or all) namespace(s)"
-echo " tidy.sh cleanup common working files"
echo ""