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

[chore] Run generate before lint #3819

Merged
merged 6 commits into from
May 17, 2023
Merged

[chore] Run generate before lint #3819

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d0d3916
Run generate before lint
pellared May 17, 2023
1945b0d
Fix step name
pellared May 17, 2023
835354e
Update Makefile
pellared May 17, 2023
e37088f
Update Makefile
pellared May 17, 2023
8cd5047
only go generate
pellared May 17, 2023
4671e9f
Merge branch 'main' into generate-before-lint
MrAlias May 17, 2023
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
4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,10 @@ jobs:
with:
path: ~/.tools
key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('./internal/tools/**') }}
- name: Run go generate and vanity-import-fix
run: make generate vanity-import-fix
- name: Run linters
run: make dependabot-check license-check lint vanity-import-check
run: make dependabot-check license-check lint
- name: Build
run: make build
- name: Check clean repository
Expand Down
14 changes: 9 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ TIMEOUT = 60
.DEFAULT_GOAL := precommit

.PHONY: precommit ci
precommit: dependabot-generate license-check misspell go-mod-tidy vanity-import-fix golangci-lint-fix test-default
ci: dependabot-check license-check lint vanity-import-check build test-default check-clean-work-tree test-coverage
precommit: generate vanity-import-fix dependabot-generate license-check misspell go-mod-tidy golangci-lint-fix test-default
ci: generate vanity-import-fix dependabot-check license-check lint build test-default check-clean-work-tree test-coverage

# Tools

Expand Down Expand Up @@ -70,9 +70,9 @@ $(CROSSLINK): PACKAGE=go.opentelemetry.io/build-tools/crosslink

tools: $(GOLANGCI_LINT) $(MISSPELL) $(GOCOVMERGE) $(STRINGER) $(PORTO) $(MULTIMOD) $(DBOTCONF) $(CROSSLINK)

# Build
# Generate

.PHONY: generate build
.PHONY: generate

generate: $(OTEL_GO_MOD_DIRS:%=generate/%)
generate/%: DIR=$*
Expand All @@ -81,7 +81,11 @@ generate/%: | $(STRINGER)
&& cd $(DIR) \
&& PATH="$(TOOLS):$${PATH}" $(GO) generate ./...

build: generate $(OTEL_GO_MOD_DIRS:%=build/%) $(OTEL_GO_MOD_DIRS:%=build-tests/%)
# Build

.PHONY: build

build: $(OTEL_GO_MOD_DIRS:%=build/%) $(OTEL_GO_MOD_DIRS:%=build-tests/%)
build/%: DIR=$*
build/%:
@echo "$(GO) build $(DIR)/..." \
Expand Down