Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[mdatagen] update crosslink to avoid replace statements #9310

Merged
merged 2 commits into from
Jan 22, 2024
Merged

[mdatagen] update crosslink to avoid replace statements #9310

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65e7b03
[mdatagen] update crosslink to avoid replace statements
Jan 17, 2024
eddc4f2
tidy
Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
[mdatagen] update crosslink to avoid replace statements 
This fixes #9281

Signed-off-by: Alex Boten <[email protected]>
  • Loading branch information
Alex Boten committed Jan 17, 2024
commit 65e7b0344388188cb457d72de1ec9b2d0a0768b9
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ checklinks:
.PHONY: crosslink
crosslink: $(CROSSLINK)
@echo "Executing crosslink"
$(CROSSLINK) --root=$(shell pwd) --prune
$(CROSSLINK) --root=$(shell pwd) --prune --skip cmd/mdatagen/go.mod

FILENAME?=$(shell git branch --show-current)
.PHONY: chlog-new
Expand Down
18 changes: 0 additions & 18 deletions cmd/mdatagen/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,21 +67,3 @@ retract (
v0.76.1
v0.65.0
)

replace go.opentelemetry.io/collector/featuregate => ../../featuregate

replace go.opentelemetry.io/collector/component => ../../component

replace go.opentelemetry.io/collector => ../..

replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry

replace go.opentelemetry.io/collector/confmap => ../../confmap

replace go.opentelemetry.io/collector/consumer => ../../consumer

replace go.opentelemetry.io/collector/pdata => ../../pdata

replace go.opentelemetry.io/collector/semconv => ../../semconv

replace go.opentelemetry.io/collector/receiver => ../../receiver
2 changes: 1 addition & 1 deletion internal/tools/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
github.com/pavius/impi v0.0.3
go.opentelemetry.io/build-tools/checkfile v0.12.0
go.opentelemetry.io/build-tools/chloggen v0.12.0
go.opentelemetry.io/build-tools/crosslink v0.12.0
go.opentelemetry.io/build-tools/crosslink v0.12.1-0.20240117214312-6a6b657017ef
go.opentelemetry.io/build-tools/multimod v0.12.0
go.opentelemetry.io/build-tools/semconvgen v0.12.0
golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3
Expand Down
6 changes: 3 additions & 3 deletions internal/tools/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading