Merge branch 'master' into png-img

.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 }}
@@ -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 }}

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() {

ci/sub

@@ -1 +1 @@
-Subproject commit 029fdc1c9533b5bfb9c76b50bdb6d52eea7ddbeb
+Subproject commit 28fb67e3bf11d7df2be9ad57b67b78a1733a7f2d

d2chaos/out/.gitignore

@@ -0,0 +1 @@
+*

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() {