mirror of
https://github.com/ceph/go-ceph
synced 2025-02-07 22:11:54 +00:00
makefile: remove check-ceph-version which is no longer neeeded
The per-ceph-version buildfiles remove the need for this rule. Signed-off-by: John Mulligan <jmulligan@redhat.com>
This commit is contained in:
parent
d213fb3e02
commit
3a0bacb039
8
Makefile
8
Makefile
@ -39,7 +39,7 @@ test:
|
||||
|
||||
.PHONY: test-docker test-container
|
||||
test-docker: test-container
|
||||
test-container: check-ceph-version $(BUILDFILE) $(RESULTS_DIR)
|
||||
test-container: $(BUILDFILE) $(RESULTS_DIR)
|
||||
$(CONTAINER_CMD) run --device /dev/fuse --cap-add SYS_ADMIN $(CONTAINER_OPTS) --rm -v $(CURDIR):/go/src/github.com/ceph/go-ceph$(VOLUME_FLAGS) $(RESULTS_VOLUME) $(CI_IMAGE_TAG)
|
||||
|
||||
ifdef RESULTS_DIR
|
||||
@ -54,12 +54,6 @@ $(BUILDFILE): $(CONTAINER_CONFIG_DIR)/Dockerfile entrypoint.sh
|
||||
@$(CONTAINER_CMD) inspect -f '{{.Id}}' $(CI_IMAGE_TAG) > $(BUILDFILE)
|
||||
echo $(CEPH_VERSION) >> $(BUILDFILE)
|
||||
|
||||
# check-ceph-version checks for the last used Ceph version in the container
|
||||
# image and forces a rebuild of the image in case the Ceph version changed
|
||||
.PHONY: check-ceph-version
|
||||
check-ceph-version:
|
||||
@grep -wq '$(CEPH_VERSION)' $(BUILDFILE) 2>/dev/null || $(RM) $(BUILDFILE)
|
||||
|
||||
check: check-revive check-format
|
||||
|
||||
check-format:
|
||||
|
Loading…
Reference in New Issue
Block a user