| Message ID | 20190917185537.25417-1-jsnow@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | tests/docker: fix typo for debian9-mxe | expand |
On 9/17/19 8:55 PM, John Snow wrote: > We spelled it debian-9-mxe, but the image is debian9-mxe. Oops I missed that, good catch. Fixes: 44d5a8bf5d2 Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > Signed-off-by: John Snow <jsnow@redhat.com> > --- > tests/docker/Makefile.include | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include > index 50a400b573..7eac1516f6 100644 > --- a/tests/docker/Makefile.include > +++ b/tests/docker/Makefile.include > @@ -7,7 +7,7 @@ DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles > DOCKER_DEPRECATED_IMAGES := debian > # we don't run tests on intermediate images (used as base by another image) > DOCKER_PARTIAL_IMAGES := debian debian8 debian9 debian10 debian-sid > -DEBIAN_PARTIAL_IMAGES += debian8-mxe debian-9-mxe debian-ports debian-bootstrap > +DEBIAN_PARTIAL_IMAGES += debian8-mxe debian9-mxe debian-ports debian-bootstrap > DOCKER_IMAGES := $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))) > DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES)) > # Use a global constant ccache directory to speed up repetitive builds >
John Snow <jsnow@redhat.com> writes: > We spelled it debian-9-mxe, but the image is debian9-mxe. > > Signed-off-by: John Snow <jsnow@redhat.com> I'll merge this fix with the other typo fix while I'm at it. Thanks. > --- > tests/docker/Makefile.include | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include > index 50a400b573..7eac1516f6 100644 > --- a/tests/docker/Makefile.include > +++ b/tests/docker/Makefile.include > @@ -7,7 +7,7 @@ DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles > DOCKER_DEPRECATED_IMAGES := debian > # we don't run tests on intermediate images (used as base by another image) > DOCKER_PARTIAL_IMAGES := debian debian8 debian9 debian10 debian-sid > -DEBIAN_PARTIAL_IMAGES += debian8-mxe debian-9-mxe debian-ports debian-bootstrap > +DEBIAN_PARTIAL_IMAGES += debian8-mxe debian9-mxe debian-ports debian-bootstrap > DOCKER_IMAGES := $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))) > DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES)) > # Use a global constant ccache directory to speed up repetitive builds -- Alex Bennée
On 9/18/19 7:35 AM, Alex Bennée wrote: > > John Snow <jsnow@redhat.com> writes: > >> We spelled it debian-9-mxe, but the image is debian9-mxe. >> >> Signed-off-by: John Snow <jsnow@redhat.com> > > I'll merge this fix with the other typo fix while I'm at it. Thanks. > ACK thanks!
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 50a400b573..7eac1516f6 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -7,7 +7,7 @@ DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles DOCKER_DEPRECATED_IMAGES := debian # we don't run tests on intermediate images (used as base by another image) DOCKER_PARTIAL_IMAGES := debian debian8 debian9 debian10 debian-sid -DEBIAN_PARTIAL_IMAGES += debian8-mxe debian-9-mxe debian-ports debian-bootstrap +DEBIAN_PARTIAL_IMAGES += debian8-mxe debian9-mxe debian-ports debian-bootstrap DOCKER_IMAGES := $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))) DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES)) # Use a global constant ccache directory to speed up repetitive builds
We spelled it debian-9-mxe, but the image is debian9-mxe. Signed-off-by: John Snow <jsnow@redhat.com> --- tests/docker/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)