From 95c5d67b58eb494f4e75c2004cdf24855f9936d7 Mon Sep 17 00:00:00 2001
From: Anmol Sethi <anmol@terrastruct.com>
Date: Tue, 29 Nov 2022 14:57:48 -0800
Subject: [PATCH 1/2] ci/sub: Update

---
 .github/workflows/ci.yml | 2 +-
 ci/sub                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cdd572bc2..0458e9e63 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ jobs:
         with:
           go-version-file: ./go.mod
           cache: true
-      - run: COLOR=1 ./make.sh all race
+      - run: COLOR=1 ./make.sh
         env:
           GITHUB_TOKEN: ${{ secrets._GITHUB_TOKEN }}
           DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
diff --git a/ci/sub b/ci/sub
index 029fdc1c9..28fb67e3b 160000
--- a/ci/sub
+++ b/ci/sub
@@ -1 +1 @@
-Subproject commit 029fdc1c9533b5bfb9c76b50bdb6d52eea7ddbeb
+Subproject commit 28fb67e3bf11d7df2be9ad57b67b78a1733a7f2d

From ffa77ecf104b18ffe08f1d7c5b63a503836cf342 Mon Sep 17 00:00:00 2001
From: Anmol Sethi <anmol@terrastruct.com>
Date: Tue, 29 Nov 2022 15:25:26 -0800
Subject: [PATCH 2/2] ci: Prevent merging of fixups

---
 .github/workflows/ci.yml           | 9 +++++++++
 ci/release/template/scripts/lib.sh | 6 +++---
 install.sh                         | 6 +++---
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0458e9e63..f4e90106c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,3 +22,12 @@ jobs:
         with:
           name: d2chaos-test
           path: ./d2chaos/out
+  nofixups:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - run: git submodule update --init
+      - run: COLOR=1 ./ci/sub/nofixups.sh
+        env:
+          GITHUB_TOKEN: ${{ secrets._GITHUB_TOKEN }}
+          DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
diff --git a/ci/release/template/scripts/lib.sh b/ci/release/template/scripts/lib.sh
index 490be17a0..3dc704bb0 100644
--- a/ci/release/template/scripts/lib.sh
+++ b/ci/release/template/scripts/lib.sh
@@ -138,15 +138,15 @@ strlen() {
 }
 
 echoerr() {
-  FGCOLOR=1 logp err "$*" | humanpath>&2
+  FGCOLOR=1 logp err "$*"
 }
 
 caterr() {
-  FGCOLOR=1 logpcat err "$@" | humanpath >&2
+  FGCOLOR=1 logpcat err "$@"
 }
 
 printferr() {
-  FGCOLOR=1 logfp err "$@" | humanpath >&2
+  FGCOLOR=1 logfp err "$@"
 }
 
 logp() {
diff --git a/install.sh b/install.sh
index 112a76d50..7afad1716 100755
--- a/install.sh
+++ b/install.sh
@@ -144,15 +144,15 @@ strlen() {
 }
 
 echoerr() {
-  FGCOLOR=1 logp err "$*" | humanpath>&2
+  FGCOLOR=1 logp err "$*"
 }
 
 caterr() {
-  FGCOLOR=1 logpcat err "$@" | humanpath >&2
+  FGCOLOR=1 logpcat err "$@"
 }
 
 printferr() {
-  FGCOLOR=1 logfp err "$@" | humanpath >&2
+  FGCOLOR=1 logfp err "$@"
 }
 
 logp() {