From c09064dc602c55b2491bece62589222469d7994f Mon Sep 17 00:00:00 2001
From: Anmol Sethi <anmol@terrastruct.com>
Date: Sun, 20 Nov 2022 02:11:15 -0800
Subject: [PATCH] ci: Many more fixes

---
 .github/workflows/ci.yml         | 14 ++++++++++++++
 Makefile                         |  8 ++++----
 ci/{release/gen_sh.sh => gen.sh} |  2 +-
 ci/release/gen_install.sh        |  4 ----
 ci/release/gen_template_lib.sh   |  4 ----
 5 files changed, 19 insertions(+), 13 deletions(-)
 rename ci/{release/gen_sh.sh => gen.sh} (82%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1727e3638..a18a4bd80 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,6 +29,20 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets._GITHUB_TOKEN }}
           DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
+  gen:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+      - uses: actions/setup-go@v3
+        with:
+          go-version-file: ./go.mod
+          cache: true
+      - run: COLOR=1 ./make.sh gen
+        env:
+          GITHUB_TOKEN: ${{ secrets._GITHUB_TOKEN }}
+          DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
   lint:
     runs-on: ubuntu-latest
     steps:
diff --git a/Makefile b/Makefile
index a1c404ed4..9780b7bc0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 .POSIX:
 
 .PHONY: all
-all: fmt lint build test
+all: fmt gen lint build test
 ifdef CI
 all: assert-linear
 endif
@@ -9,9 +9,9 @@ endif
 .PHONY: fmt
 fmt:
 	prefix "$@" ./ci/sub/fmt/make.sh
-.PHONY: fmt-release
-fmt-release_sh:
-	prefix "$@" ./ci/release/gen_sh.sh
+.PHONY: gen
+gen:
+	prefix "$@" ./ci/gen.sh
 .PHONY: lint
 lint:
 	prefix "$@" go vet --composites=false ./...
diff --git a/ci/release/gen_sh.sh b/ci/gen.sh
similarity index 82%
rename from ci/release/gen_sh.sh
rename to ci/gen.sh
index 63d9a0d3c..db0c557ab 100755
--- a/ci/release/gen_sh.sh
+++ b/ci/gen.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 set -eu
-cd -- "$(dirname "$0")/../.."
+cd -- "$(dirname "$0")/.."
 . ./ci/sub/lib.sh
 
 ./ci/release/gen_install.sh
diff --git a/ci/release/gen_install.sh b/ci/release/gen_install.sh
index ee5249d87..082bdcc52 100755
--- a/ci/release/gen_install.sh
+++ b/ci/release/gen_install.sh
@@ -37,7 +37,3 @@ sh_c cat \
 sh_c cat ./ci/release/_install.sh \
   \| sed -n "'/cd -- \"\$(dirname/,/cd -/!p'" \>\> install.sh
 sh_c chmod -w install.sh
-
-if [ -n "${CI-}" ]; then
-  git_assert_clean
-fi
diff --git a/ci/release/gen_template_lib.sh b/ci/release/gen_template_lib.sh
index b79c8ab61..1f523767a 100755
--- a/ci/release/gen_template_lib.sh
+++ b/ci/release/gen_template_lib.sh
@@ -27,7 +27,3 @@ sh_c cat \
   ./ci/sub/lib/log.sh \
   \| sed "-e'/^\. /d'" \>\>./ci/release/template/scripts/lib.sh
 sh_c chmod -w ./ci/release/template/scripts/lib.sh
-
-if [ -n "${CI-}" ]; then
-  git_assert_clean
-fi