Switching from make to just

2 years ago · 0cd1474909
parent b9e352efad
commit 0cd1474909
12 changed files with 26 additions and 68 deletions
--- a/21
+++ b/21
@ -1,21 +0,0 @@
-FMT_TARGETS := \
-	meatballhat.com \
-	jool.meatballhat.com \
-	gilly.meatballhat.com \
-	vault.meatballhat.com
-
-.PHONY: default
-default: check
-
-.PHONY: check
-check: terrafmt shlint
-
-.PHONY: terrafmt
-terrafmt: $(foreach t,$(FMT_TARGETS),.fmt.$(t))
-
-.PHONY: shlint
-shlint:
-	GITHUB_WORKSPACE=$(PWD) bash .github/actions/shlint/entrypoint
-
-.fmt.%:
-	terraform fmt -check $*
--- a/gilly.meatballhat.com/Makefile
+++ b/gilly.meatballhat.com/Makefile
@ -1 +0,0 @@
-include $(shell git rev-parse --show-toplevel)/terraform.mk
--- a/jool.meatballhat.com/Makefile
+++ b/jool.meatballhat.com/Makefile
@ -1 +0,0 @@
-include $(shell git rev-parse --show-toplevel)/terraform.mk
--- a/jool.meatballhat.com/www/Makefile
+++ b/jool.meatballhat.com/www/Makefile
@ -1,17 +0,0 @@
-PYTHON := python3
-
-HTTP_PORT := 9000
-SERVER_MODULE := http.server
-
-NOW = $(shell date -u)
-
-.PHONY: all
-all: humans.txt
-
-humans.txt: humans.txt.in index.html
-	cat humans.txt.in | sed "s/___LAST_UPDATE___/$(NOW)/" | \
-		iconv -f ISO-8859-1 -t utf-8 > $@
-
-.PHONY: serve
-serve:
-	$(PYTHON) -m $(SERVER_MODULE) $(HTTP_PORT)
--- a/jool.meatballhat.com/www/humans.txt
+++ b/jool.meatballhat.com/www/humans.txt
@ -2,7 +2,7 @@
  Hello: Dan Buch

 /* SITE */
-  Last update: Tue Feb  2 02:13:37 PM UTC 2021
+  Last update: Thu Jul 22 01:55:56 AM UTC 2021
  Language: English
  Doctype: HTML5
  Technologies: text
--- a/jool.meatballhat.com/www/images/notepad.gif
+++ b/jool.meatballhat.com/www/images/notepad.gif
--- a/jool.meatballhat.com/www/index.html
+++ b/jool.meatballhat.com/www/index.html
@ -16,13 +16,6 @@
      a, a:visited, a:active {
        color: #ccc;
      }
-      .serious-internet {
-        display: block;
-        width: 59px;
-        height: 68px;
-        background: #aaa;
-        padding: 0.5em;
-      }
    </style>
  </head>
  <body>
@ -33,16 +26,14 @@
    </header>
    <section>
      <div>
-        <h2>Hello.  I'm Dan.</h2>
+        <h2>Hello. I'm Dan.</h2>
      </div>
      <hr/>
      <div>
        <ul>
          <li><a title="Source Codes" href="https://git.meatballhat.com">git</a></li>
-          <li><a title="Padlocks" href="https://keybase.io/meatballhat">keybase</a></li>
-          <li><a title="Wat" href="humans.txt">humans</a></li>
+          <li><a title="Humans" href="humans.txt">humans</a></li>
        </ul>
-        <a class="serious-internet" href="http://www.vim.org/"><img src="images/notepad.gif" /></a>
      </div>
    </section>
  </body>
--- a/jool.meatballhat.com/www/justfile
+++ b/jool.meatballhat.com/www/justfile
@ -0,0 +1,10 @@
+set dotenv-load := false
+
+now := `date -u`
+
+all:
+  sed "s/___LAST_UPDATE___/{{now}}/" <humans.txt.in | \
+    iconv -f ISO-8859-1 -t utf-8 | tee humans.txt &>/dev/null
+
+serve port='9000':
+  python3 -m http.server {{port}}
--- a/13
+++ b/13
@ -0,0 +1,13 @@
+set dotenv-load := false
+
+fmt_targets := "meatballhat.com jool.meatballhat.com gilly.meatballhat.com vault.meatballhat.com"
+
+check: terrafmt shlint
+
+terrafmt:
+  for t in {{ fmt_targets }} ; do \
+    terraform fmt -check "${t}"; \
+  done
+
+shlint:
+  GITHUB_WORKSPACE={{justfile_directory()}} bash .github/actions/shlint/entrypoint
--- a/meatballhat.com/Makefile
+++ b/meatballhat.com/Makefile
@ -1 +0,0 @@
-include $(shell git rev-parse --show-toplevel)/terraform.mk
--- a/terraform.mk
+++ b/terraform.mk
@ -1,14 +0,0 @@
-TFPLAN := main.tfplan
-TFPLAN_PREREQS ?=
-
-.PHONY: plan
-plan: $(TFPLAN_PREREQS)
-	terraform plan -out $(TFPLAN)
-
-.PHONY: apply
-apply: $(TFPLAN)
-	terraform apply $<
-
-.PHONY: clean
-clean:
-	$(RM) $(TFPLAN)
--- a/vault.meatballhat.com/Makefile
+++ b/vault.meatballhat.com/Makefile
@ -1 +0,0 @@
-include $(shell git rev-parse --show-toplevel)/terraform.mk
				`@ -1 +0,0 @@`
				`include $(shell git rev-parse --show-toplevel)/terraform.mk`