Skip to content

Commit

Permalink
Merge pull request #1095 from mackerelio/remove-old-rpm-packaging
Browse files Browse the repository at this point in the history
Remove old rpm packaging
  • Loading branch information
yseto committed Aug 16, 2023
2 parents 52d5a1e + 7baeffe commit cbd69a9
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 1,008 deletions.
16 changes: 0 additions & 16 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,6 @@ updates:
time: "01:00"
timezone: Asia/Tokyo
open-pull-requests-limit: 10
# TODO when remove rpm-v1, deb-v1 task on Makefile, remove below lines
- package-ecosystem: gomod
directory: "mackerel-plugin-mongodb/"
schedule:
interval: weekly
time: "01:00"
timezone: Asia/Tokyo
open-pull-requests-limit: 10
# TODO when remove rpm-v1, deb-v1 task on Makefile, remove below lines
- package-ecosystem: gomod
directory: "mackerel-plugin-mysql/"
schedule:
interval: weekly
time: "01:00"
timezone: Asia/Tokyo
open-pull-requests-limit: 10
- package-ecosystem: github-actions
directory: "/"
schedule:
Expand Down
19 changes: 1 addition & 18 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,6 @@ build:
$(MAKE) $(BINDIR)/$$i; \
done

.PHONY: build-for-packaging
build-for-packaging:
for i in `cat packaging/plugin-lists`; do \
$(MAKE) $(BINDIR)/$$i; \
done

build/mackerel-plugin: $(patsubst %,depends_on,$(GOOS)$(GOARCH))
mkdir -p build
CGO_ENABLED=0 go build -ldflags="-s -w -X main.gitcommit=$(CURRENT_REVISION)" \
Expand Down Expand Up @@ -56,18 +50,7 @@ lint:
golangci-lint run

.PHONY: rpm
rpm: rpm-v1 rpm-v2

.PHONY: rpm-v1
rpm-v1:
$(MAKE) build-for-packaging GOOS=linux GOARCH=386
rpmbuild --define "_sourcedir `pwd`" --define "_bindir build/linux/386" \
--define "_version ${VERSION}" --define "buildarch noarch" \
--target noarch -bb packaging/rpm/mackerel-agent-plugins.spec
$(MAKE) build-for-packaging GOOS=linux GOARCH=amd64
rpmbuild --define "_sourcedir `pwd`" --define "_bindir build/linux/amd64" \
--define "_version ${VERSION}" --define "buildarch x86_64" \
--target x86_64 -bb packaging/rpm/mackerel-agent-plugins.spec
rpm: rpm-v2

.PHONY: rpm-v2
rpm-v2: rpm-v2-x86 rpm-v2-arm
Expand Down
52 changes: 0 additions & 52 deletions packaging/plugin-lists

This file was deleted.

0 comments on commit cbd69a9

Please sign in to comment.