diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1157e58e7..cdd572bc2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,83 +5,15 @@ concurrency: cancel-in-progress: true jobs: - assert-linear: + ci: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - with: - submodules: recursive - - run: COLOR=1 ./make.sh assert-linear - env: - GITHUB_TOKEN: ${{ secrets._GITHUB_TOKEN }} - DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }} - fmt: - 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 fmt - 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: - - 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 lint - env: - GITHUB_TOKEN: ${{ secrets._GITHUB_TOKEN }} - DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }} - build: - 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 build - env: - GITHUB_TOKEN: ${{ secrets._GITHUB_TOKEN }} - DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }} - test: - 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 test + - run: COLOR=1 ./make.sh all race env: GITHUB_TOKEN: ${{ secrets._GITHUB_TOKEN }} DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }} @@ -90,22 +22,3 @@ jobs: with: name: d2chaos-test path: ./d2chaos/out - race: - 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 race - env: - GITHUB_TOKEN: ${{ secrets._GITHUB_TOKEN }} - DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }} - - uses: actions/upload-artifact@v3 - if: always() - with: - name: d2chaos-race - path: ./d2chaos/out diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index 6334923c1..9fc372532 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -10,17 +10,15 @@ concurrency: cancel-in-progress: true jobs: - all: + ci: 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: CI_ALL=1 COLOR=1 ./make.sh + - run: COLOR=1 CI_FORCE=1 ./make.sh all race env: GITHUB_TOKEN: ${{ secrets._GITHUB_TOKEN }} DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }} diff --git a/Makefile b/Makefile index 9780b7bc0..d4241d86f 100644 --- a/Makefile +++ b/Makefile @@ -2,9 +2,6 @@ .PHONY: all all: fmt gen lint build test -ifdef CI -all: assert-linear -endif .PHONY: fmt fmt: @@ -24,6 +21,3 @@ test: .PHONY: race race: prefix "$@" ./ci/test.sh --race ./... -.PHONY: assert-linear -assert-linear: - prefix "$@" ./ci/sub/assert_linear.sh diff --git a/ci/release/_install.sh b/ci/release/_install.sh index 4cd840ca9..a66f2d730 100755 --- a/ci/release/_install.sh +++ b/ci/release/_install.sh @@ -14,7 +14,7 @@ help() { fi cat <&2 + printf '$COLOR must be 0, 1, false or true but got %s\n' "$COLOR" >&2 fi fi @@ -219,8 +219,9 @@ header() { } bigheader() { + set -- "$(echo "$*" | sed "s/^/ * /")" logp "/** - * $1 +$* **/" } diff --git a/install.sh b/install.sh index 678dabfe5..112a76d50 100755 --- a/install.sh +++ b/install.sh @@ -68,7 +68,7 @@ should_color() { _COLOR=1 return 0 else - printf '$COLOR must be 0, 1, false or true but got %s' "$COLOR" >&2 + printf '$COLOR must be 0, 1, false or true but got %s\n' "$COLOR" >&2 fi fi @@ -225,8 +225,9 @@ header() { } bigheader() { + set -- "$(echo "$*" | sed "s/^/ * /")" logp "/** - * $1 +$* **/" } @@ -478,7 +479,7 @@ help() { fi cat <