Adjusted Makefile; added important changelog item. (#1422)

Signed-off-by: Bartek Plotka <bwplotka@gmail.com>

.circleci/config.yml

@@ -22,7 +22,7 @@ jobs:
               echo $GOOGLE_APPLICATION_CREDENTIALS_CONTENT > $GOOGLE_APPLICATION_CREDENTIALS
               echo "Awesome! GCS integration tests are enabled."
             fi
-      - run: make check-go-mod
+      - run: make deps
       - run: make lint
       - run: make check-docs
       - run: make format

CHANGELOG.md

@@ -18,6 +18,7 @@ We use *breaking* word for marking changes that are not backward compatible (rel
 
 ### Changed
 
+- [#1414](https://github.com/thanos-io/thanos/pull/1413) Upgraded important dependencies: Prometheus to 2.12-rc.0. TSDB is now part of Prometheus.
 - [#1380](https://github.com/thanos-io/thanos/pull/1380) Upgraded important dependencies: Prometheus to 2.11.1 and TSDB to 0.9.1. Some changes affecting Querier:
   - [ENHANCEMENT] Query performance improvement: Efficient iteration and search in HashForLabels and HashWithoutLabels. #5707
   - [ENHANCEMENT] Optimize queries using regexp for set lookups. tsdb#602

Makefile

@@ -106,7 +106,7 @@ assets: $(GOBINDATA)
 
 # build builds Thanos binary using `promu`.
 .PHONY: build
-build: check-git  go-mod-tidy $(PROMU)
+build: check-git deps $(PROMU)
 	@echo ">> building binaries $(GOBIN)"
 	@$(PROMU) build --prefix $(PREFIX)
 
@@ -120,6 +120,7 @@ crossbuild: $(PROMU)
 .PHONY: deps
 deps:
 	@go mod tidy
+	@go mod verify
 
 # docker builds docker with no tag.
 .PHONY: docker
@@ -188,15 +189,6 @@ test-deps:
 	$(call fetch_go_bin_version,github.com/prometheus/alertmanager/cmd/alertmanager,$(ALERTMANAGER_VERSION))
 	$(call fetch_go_bin_version,github.com/minio/minio,$(MINIO_SERVER_VERSION))
 
-# go mod related
-.PHONY: go-mod-tidy
-go-mod-tidy: check-git
-	@go mod tidy
-
-.PHONY: check-go-mod
-check-go-mod:
-	@go mod verify
-
 # tooling deps. TODO(bwplotka): Pin them all to certain version!
 .PHONY: check-git
 check-git: