Merge branch 'master' into alixander/orientation

This commit is contained in:
Alexander Wang 2022-11-29 16:18:39 -08:00
commit c495253f86
No known key found for this signature in database
GPG key ID: D89FA31966BDBECE
4 changed files with 17 additions and 8 deletions

View file

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

View file

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

2
ci/sub

@ -1 +1 @@
Subproject commit 824046d952b1442c76a057553591652c889fb7cb
Subproject commit 28fb67e3bf11d7df2be9ad57b67b78a1733a7f2d

View file

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