diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cdd572bc2..f4e90106c 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 }} @@ -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/ci/sub b/ci/sub index 029fdc1c9..28fb67e3b 160000 --- a/ci/sub +++ b/ci/sub @@ -1 +1 @@ -Subproject commit 029fdc1c9533b5bfb9c76b50bdb6d52eea7ddbeb +Subproject commit 28fb67e3bf11d7df2be9ad57b67b78a1733a7f2d diff --git a/d2chaos/out/.gitignore b/d2chaos/out/.gitignore new file mode 100644 index 000000000..72e8ffc0d --- /dev/null +++ b/d2chaos/out/.gitignore @@ -0,0 +1 @@ +* 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() {