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

Remove dependabot version updates #5577

Merged
merged 6 commits into from
May 16, 2024
Merged

Remove dependabot version updates #5577

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
48d646f
Remove dependabot.yml file to disable version updates from Dependabot
XSAM May 15, 2024
3e4d526
Remove dbotconf tool
XSAM May 15, 2024
7a845fc
Remove dependabot in workflows
XSAM May 15, 2024
c1f8e66
Fix go.sum
XSAM May 15, 2024
0e8796c
Merge remote-tracking branch 'upstream' into remove-dependabot-versio…
XSAM May 15, 2024
37c5183
Merge branch 'main' into remove-dependabot-version-updates
pellared May 16, 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
678 changes: 0 additions & 678 deletions .github/dependabot.yml
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: Generate
run: make generate
- name: Run linters
run: make dependabot-check license-check lint vanity-import-check
run: make license-check lint vanity-import-check
- name: Build
run: make build
- name: Check clean repository
Expand Down Expand Up @@ -170,4 +170,3 @@ jobs:
run: |
echo ${{ needs.integration.result }}
test ${{ needs.integration.result }} == "success"
26 changes: 0 additions & 26 deletions .github/workflows/create-dependabot-pr.yml
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions .github/workflows/dependabot.yml
View file
Open in desktop

This file was deleted.

54 changes: 0 additions & 54 deletions .github/workflows/scripts/dependabot-pr.sh
View file
Open in desktop

This file was deleted.

18 changes: 3 additions & 15 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ TIMEOUT = 60
.DEFAULT_GOAL := precommit

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

# Tools

Expand Down Expand Up @@ -51,9 +51,6 @@ $(TOOLS)/porto: PACKAGE=github.com/jcchavezs/porto/cmd/porto
MULTIMOD = $(TOOLS)/multimod
$(MULTIMOD): PACKAGE=go.opentelemetry.io/build-tools/multimod

DBOTCONF = $(TOOLS)/dbotconf
$(TOOLS)/dbotconf: PACKAGE=go.opentelemetry.io/build-tools/dbotconf

CROSSLINK = $(TOOLS)/crosslink
$(CROSSLINK): PACKAGE=go.opentelemetry.io/build-tools/crosslink

Expand All @@ -69,7 +66,7 @@ $(GOJSONSCHEMA): PACKAGE=github.com/atombender/go-jsonschema
GOVULNCHECK = $(TOOLS)/govulncheck
$(GOVULNCHECK): PACKAGE=golang.org/x/vuln/cmd/govulncheck

tools: $(GOLANGCI_LINT) $(MISSPELL) $(GOCOVMERGE) $(STRINGER) $(PORTO) $(MULTIMOD) $(DBOTCONF) $(CROSSLINK) $(GOTMPL) $(GORELEASE) $(GOJSONSCHEMA) $(GOVULNCHECK)
tools: $(GOLANGCI_LINT) $(MISSPELL) $(GOCOVMERGE) $(STRINGER) $(PORTO) $(MULTIMOD) $(CROSSLINK) $(GOTMPL) $(GORELEASE) $(GOJSONSCHEMA) $(GOVULNCHECK)

# Generate

Expand Down Expand Up @@ -189,15 +186,6 @@ registry-links-check:
echo "WARNING: registry link check failed for the following packages:"; echo "$${checkRes}"; \
fi

DEPENDABOT_CONFIG = .github/dependabot.yml
.PHONY: dependabot-check
dependabot-check: | $(DBOTCONF)
@$(DBOTCONF) verify $(DEPENDABOT_CONFIG) || ( echo "(run: make dependabot-generate)"; exit 1 )

.PHONY: dependabot-generate
dependabot-generate: | $(DBOTCONF)
@$(DBOTCONF) generate > $(DEPENDABOT_CONFIG)

.PHONY: check-clean-work-tree
check-clean-work-tree:
@if ! git diff --quiet; then \
Expand Down
1 change: 0 additions & 1 deletion tools/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ require (
github.com/jcchavezs/porto v0.6.0
github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad
go.opentelemetry.io/build-tools/crosslink v0.13.0
go.opentelemetry.io/build-tools/dbotconf v0.13.0
go.opentelemetry.io/build-tools/gotmpl v0.13.0
go.opentelemetry.io/build-tools/multimod v0.13.0
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842
Expand Down
2 changes: 0 additions & 2 deletions tools/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,8 +486,6 @@ go.opentelemetry.io/build-tools v0.13.0 h1:0I3jJQ2zcJU8k4ZjyHNqUBX2Len1UvBIOzVP4
go.opentelemetry.io/build-tools v0.13.0/go.mod h1:PEtg5iWjNI9WAlKXP/xll/hgbq/Cp4Ma4T1ssKB2T0Q=
go.opentelemetry.io/build-tools/crosslink v0.13.0 h1:R0V89bTYzoJpasiOIYiQo6txL/ZTzMdEuthJ4gLUTF8=
go.opentelemetry.io/build-tools/crosslink v0.13.0/go.mod h1:aYIwOj9b3Nmgm6nIZZk28tF/JjpicI8xenEVUeoVNp0=
go.opentelemetry.io/build-tools/dbotconf v0.13.0 h1:yu/2zZn96+wfdEY/rg/LPH+ScodwAhPylQKQO0YpWmk=
go.opentelemetry.io/build-tools/dbotconf v0.13.0/go.mod h1:5qJOERSYF2p4tOXoV02oBsdspvax2OCWGbUqgnYoB+8=
go.opentelemetry.io/build-tools/gotmpl v0.13.0 h1:JSNKw7dg2RNTxVREYL0nlmdL6eH22xKGj6s1V2gAC+Y=
go.opentelemetry.io/build-tools/gotmpl v0.13.0/go.mod h1:oNosRsW9ExQDrRd2YTd4U20Jt5AD9CG+Ef3EPyjOTE4=
go.opentelemetry.io/build-tools/multimod v0.13.0 h1:HGAP3zCM8vOTNJSQbjQ5VbKZSctIZxppPBxRTzye7ic=
Expand Down
1 change: 0 additions & 1 deletion tools/tools.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (
_ "github.com/jcchavezs/porto/cmd/porto"
_ "github.com/wadey/gocovmerge"
_ "go.opentelemetry.io/build-tools/crosslink"
_ "go.opentelemetry.io/build-tools/dbotconf"
_ "go.opentelemetry.io/build-tools/gotmpl"
_ "go.opentelemetry.io/build-tools/multimod"
_ "golang.org/x/exp/cmd/gorelease"
Expand Down