Skip to content

Commit e065d84

Browse files
authored
(chore) Remove build-tools from semconv build. (#2241)
1 parent 86cad42 commit e065d84

File tree

3 files changed

+1
-21
lines changed

3 files changed

+1
-21
lines changed

.github/workflows/checks.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,3 @@ jobs:
126126
- name: verify semantic conventions yaml definitions
127127
run: make test-policies
128128

129-
# TODO: Remove this once policies-check is the only enforcement on github.
130-
semantic-conventions-compatibility:
131-
runs-on: ubuntu-latest
132-
steps:
133-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
134-
- name: verify semantic convention compatibility with latest released version
135-
run: make compatibility-check

Makefile

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,13 @@ CONTAINER_REPOSITORY=docker.io
3232

3333
# Per container overrides for the repository resolution.
3434
WEAVER_CONTAINER_REPOSITORY=$(CONTAINER_REPOSITORY)
35-
SEMCONVGEN_CONTAINER_REPOSITORY=$(CONTAINER_REPOSITORY)
3635
OPA_CONTAINER_REPOSITORY=$(CONTAINER_REPOSITORY)
3736
LYCHEE_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.
4241
VERSIONED_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}')
4442
VERSIONED_OPA_CONTAINER_NO_REPO=$(shell cat dependencies.Dockerfile | awk '$$4=="opa" {print $$2}')
4543
VERSIONED_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"
5553
WEAVER_CONTAINER=$(WEAVER_CONTAINER_REPOSITORY)/$(VERSIONED_WEAVER_CONTAINER_NO_REPO)
56-
SEMCONVGEN_CONTAINER=$(SEMCONVGEN_CONTAINER_REPOSITORY)/$(VERSIONED_SEMCONVGEN_CONTAINER_NO_REPO)
5754
OPA_CONTAINER=$(OPA_CONTAINER_REPOSITORY)/$(VERSIONED_OPA_CONTAINER_NO_REPO)
5855
LYCHEE_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)

dependencies.Dockerfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,5 @@ FROM otel/weaver:v0.15.0@sha256:1cf1c72eaed57dad813c2e359133b8a15bd4facf305aae5b
88
# OPA is used to test policies enforced by weaver.
99
FROM openpolicyagent/opa:1.4.2@sha256:35a093d9ae828373cf88f68ecaa8189ab26287468074a3b78f0601d9c8b7a4f5 AS opa
1010

11-
# Semconv gen is used for backwards compatibility checks.
12-
# TODO(jsuereth): Remove this when no longer used.
13-
FROM otel/semconvgen:0.25.0@sha256:9df7b8cbaa732277d64d0c0a8604d96bb6f5a36d0e96338cba5dced720c16485 AS semconvgen
14-
1511
# Lychee is used for checking links in documentation.
1612
FROM lycheeverse/lychee:sha-2aa22f8@sha256:2e3786630482c41f9f2dd081e06d7da1c36d66996e8cf6573409b8bc418d48c4 AS lychee

0 commit comments

Comments
 (0)