Skip to content

Commit a902549

Browse files
authored
Merge pull request mackerelio#695 from mackerelio/stop-build-apt-v1
Stop build for apt v1
2 parents 60e5487 + e7625ae commit a902549

File tree

10 files changed

+10
-1221
lines changed

10 files changed

+10
-1221
lines changed

.github/workflows/test.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ name: test
44
on:
55
push:
66
branches:
7-
- master
7+
- master
88
tags:
9-
- v*
9+
- v*
1010
pull_request:
1111
env:
1212
DEBIAN_FRONTEND: noninteractive
@@ -64,10 +64,10 @@ jobs:
6464
needs: test
6565
runs-on: ubuntu-latest
6666
steps:
67-
- uses: shogo82148/actions-goveralls@v1
68-
with:
69-
github-token: ${{ secrets.GITHUB_TOKEN }}
70-
parallel-finished: true
67+
- uses: shogo82148/actions-goveralls@v1
68+
with:
69+
github-token: ${{ secrets.GITHUB_TOKEN }}
70+
parallel-finished: true
7171
build:
7272
needs: test
7373
runs-on: ubuntu-latest
@@ -114,8 +114,8 @@ jobs:
114114
with:
115115
directory: artifacts/
116116
github-token: ${{ secrets.GITHUB_TOKEN }}
117-
tag-prefix: 'refs/tags/v'
118-
bump-up-branch-prefix: 'bump-version-'
117+
tag-prefix: "refs/tags/v"
118+
bump-up-branch-prefix: "bump-version-"
119119
- uses: 8398a7/action-slack@v3
120120
with:
121121
status: ${{ job.status }}

Makefile

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -81,18 +81,7 @@ rpm-v2-arm:
8181
--target aarch64 -bb packaging/rpm/mackerel-check-plugins-v2.spec
8282

8383
.PHONY: deb
84-
deb: deb-v1 deb-v2
85-
86-
.PHONY: deb-v1
87-
deb-v1:
88-
make build GOOS=linux GOARCH=386
89-
for i in `cat packaging/deb/debian/source/include-binaries`; do \
90-
cp build/`basename $$i` packaging/deb/debian/; \
91-
done
92-
cd packaging/deb && debuild --no-tgz-check -rfakeroot -uc -us
93-
94-
.PHONY: deb-v2
95-
deb-v2: deb-v2-x86 deb-v2-arm
84+
deb: deb-v2-x86 deb-v2-arm
9685

9786
.PHONY: deb-v2-x86
9887
deb-v2-x86:

packaging/deb/debian/changelog

Lines changed: 0 additions & 1135 deletions
This file was deleted.

packaging/deb/debian/compat

Lines changed: 0 additions & 1 deletion
This file was deleted.

packaging/deb/debian/control

Lines changed: 0 additions & 9 deletions
This file was deleted.

packaging/deb/debian/copyright

Lines changed: 0 additions & 1 deletion
This file was deleted.

packaging/deb/debian/rules

Lines changed: 0 additions & 24 deletions
This file was deleted.

packaging/deb/debian/source/format

Lines changed: 0 additions & 1 deletion
This file was deleted.

packaging/deb/debian/source/include-binaries

Lines changed: 0 additions & 27 deletions
This file was deleted.

tool/update-docs.pl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,7 @@ sub update_packaging_specs {
5353
$content =~ s/for i in.*?;\s*do/$for_in/ms;
5454
$content;
5555
};
56-
replace $_, $replace_sub for ("packaging/rpm/$PACKAGE_NAME*.spec", "packaging/deb*/debian/rules");
57-
58-
path('packaging/deb/debian/source/include-binaries')->spew(join("\n", map { "debian/$PLUGIN_PREFIX$_" } @plugins) . "\n");
56+
replace $_, $replace_sub for ("packaging/rpm/$PACKAGE_NAME*.spec", "packaging/deb-v2/debian/rules");
5957
}
6058

6159
sub load_packaging_confg {

0 commit comments

Comments
 (0)