diff --git a/.github/workflows/agent.yml b/.github/workflows/agent.yml index d738124..03e181a 100644 --- a/.github/workflows/agent.yml +++ b/.github/workflows/agent.yml @@ -10,6 +10,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@master + - uses: actions/setup-go@v2 + with: + go-version: '^1.17.2' - name: Run GoReleaser uses: goreleaser/goreleaser-action@v2 if: startsWith(github.ref, 'refs/tags/') diff --git a/.github/workflows/test-on-pr.yml b/.github/workflows/test-on-pr.yml index ab63f18..1a5e3e0 100644 --- a/.github/workflows/test-on-pr.yml +++ b/.github/workflows/test-on-pr.yml @@ -11,6 +11,9 @@ jobs: GO111MODULE: on steps: - uses: actions/checkout@v2 + - uses: actions/setup-go@v2 + with: + go-version: "^1.17.2" - name: Unit test run: | go test -v ./... diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 144af18..fd03cef 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,6 +17,11 @@ jobs: GO111MODULE: on steps: - uses: actions/checkout@v2 + - run: go version + - uses: actions/setup-go@v2 + with: + go-version: '^1.17.2' + - run: go version - name: Unit test run: | go test -v ./... diff --git a/README.md b/README.md index ee6648a..15d5896 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@
LOGO designed by 熊大 .

-    +   

:trollface: 哪吒监控 一站式轻监控轻运维系统。支持系统状态、HTTP(SSL 证书变更、即将到期、到期)、TCP、Ping 监控报警,计划任务和在线终端。

diff --git a/cmd/agent/main.go b/cmd/agent/main.go index ecb77b1..763e920 100644 --- a/cmd/agent/main.go +++ b/cmd/agent/main.go @@ -255,6 +255,9 @@ func doSelfUpdate(donNotUseLocalVersion bool) { } func handleUpgradeTask(task *pb.Task, result *pb.TaskResult) { + if agentConf.DisableForceUpdate { + return + } doSelfUpdate(true) } diff --git a/service/dao/dao.go b/service/dao/dao.go index 18a9e72..9cd9af2 100644 --- a/service/dao/dao.go +++ b/service/dao/dao.go @@ -13,7 +13,7 @@ import ( pb "github.com/naiba/nezha/proto" ) -var Version = "v0.10.7" // !!记得修改 README 中的 badge 版本!! +var Version = "v0.10.8" // !!记得修改 README 中的 badge 版本!! var ( Conf *model.Config