@@ -32,15 +32,13 @@ CONTAINER_REPOSITORY=docker.io
3232
3333# Per container overrides for the repository resolution.
3434WEAVER_CONTAINER_REPOSITORY =$(CONTAINER_REPOSITORY )
35- SEMCONVGEN_CONTAINER_REPOSITORY =$(CONTAINER_REPOSITORY )
3635OPA_CONTAINER_REPOSITORY =$(CONTAINER_REPOSITORY )
3736LYCHEE_CONTAINER_REPOSITORY =$(CONTAINER_REPOSITORY )
3837
3938# Versioned, non-qualified references to containers used in this Makefile.
4039# These are parsed from dependencies.Dockerfile so dependabot will autoupdate
4140# the versions of docker files we use.
4241VERSIONED_WEAVER_CONTAINER_NO_REPO =$(shell cat dependencies.Dockerfile | awk '$$4=="weaver" {print $$2}')
43- VERSIONED_SEMCONVGEN_CONTAINER_NO_REPO =$(shell cat dependencies.Dockerfile | awk '$$4=="semconvgen" {print $$2}')
4442VERSIONED_OPA_CONTAINER_NO_REPO =$(shell cat dependencies.Dockerfile | awk '$$4=="opa" {print $$2}')
4543VERSIONED_LYCHEE_CONTAINER_NO_REPO =$(shell cat dependencies.Dockerfile | awk '$$4=="lychee" {print $$2}')
4644
@@ -53,11 +51,10 @@ VERSIONED_LYCHEE_CONTAINER_NO_REPO=$(shell cat dependencies.Dockerfile | awk '$$
5351# Error: short-name "otel/weaver:v1.2.3" did not resolve to an alias
5452# and no unqualified-search registries are defined in "/etc/containers/registries.conf"
5553WEAVER_CONTAINER =$(WEAVER_CONTAINER_REPOSITORY ) /$(VERSIONED_WEAVER_CONTAINER_NO_REPO )
56- SEMCONVGEN_CONTAINER =$(SEMCONVGEN_CONTAINER_REPOSITORY ) /$(VERSIONED_SEMCONVGEN_CONTAINER_NO_REPO )
5754OPA_CONTAINER =$(OPA_CONTAINER_REPOSITORY ) /$(VERSIONED_OPA_CONTAINER_NO_REPO )
5855LYCHEE_CONTAINER =$(LYCHEE_CONTAINER_REPOSITORY ) /$(VERSIONED_LYCHEE_CONTAINER_NO_REPO )
5956
60- CHECK_TARGETS =install-tools markdownlint misspell table-check compatibility-check \
57+ CHECK_TARGETS =install-tools markdownlint misspell table-check \
6158 schema-check check-file-and-folder-names-in-docs
6259
6360# Determine if "docker" is actually podman
@@ -332,9 +329,3 @@ test-policies:
332329 /policies \
333330 /policies_test
334331
335- # TODO: This is now duplicative with weaver policy checks. We can remove
336- # once github action requirements are updated.
337- .PHONY : compatibility-check
338- compatibility-check :
339- $(DOCKER_RUN ) --rm $(DOCKER_USER_IS_HOST_USER_ARG ) -v $(PWD ) /model:/source -v $(PWD ) /docs:/spec --pull=always \
340- $(SEMCONVGEN_CONTAINER ) --continue-on-validation-errors -f /source compatibility --previous-version $(LATEST_RELEASED_SEMCONV_VERSION )
0 commit comments