Skip to content

Commit a9cf05e

Browse files
author
Jef Spaleta
authored
Merge pull request #165 from nixwiz/update_for_centos6
Update for centos6
2 parents 5eb2916 + 1f783c3 commit a9cf05e

File tree

3 files changed

+40
-10
lines changed

3 files changed

+40
-10
lines changed

.bonsai.yml

Lines changed: 34 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,53 @@
11
---
22
description: "#{repo}"
33
builds:
4-
- platform: "debian"
4+
- platform: "alpine"
55
arch: "amd64"
6-
asset_filename: "#{repo}_#{version}_debian_linux_amd64.tar.gz"
6+
asset_filename: "#{repo}_#{version}_alpine_linux_amd64.tar.gz"
77
sha_filename: "#{repo}_#{version}_sha512-checksums.txt"
88
filter:
99
- "entity.system.os == 'linux'"
1010
- "entity.system.arch == 'amd64'"
11-
- "entity.system.platform_family == 'debian'"
12-
- platform: "centos"
11+
- "entity.system.platform == 'alpine'"
12+
- "entity.system.platform_version.split('.')[0] == '3'"
13+
- platform: "alpine3.8"
1314
arch: "amd64"
14-
asset_filename: "#{repo}_#{version}_centos_linux_amd64.tar.gz"
15+
asset_filename: "#{repo}_#{version}_alpine3.8_linux_amd64.tar.gz"
16+
sha_filename: "#{repo}_#{version}_sha512-checksums.txt"
17+
filter:
18+
- "entity.system.os == 'linux'"
19+
- "entity.system.arch == 'amd64'"
20+
- "entity.system.platform == 'alpine'"
21+
- platform: "centos6"
22+
arch: "amd64"
23+
asset_filename: "#{repo}_#{version}_centos6_linux_amd64.tar.gz"
1524
sha_filename: "#{repo}_#{version}_sha512-checksums.txt"
1625
filter:
1726
- "entity.system.os == 'linux'"
1827
- "entity.system.arch == 'amd64'"
1928
- "entity.system.platform_family == 'rhel'"
20-
- platform: "alpine"
29+
- "entity.system.platform_version.split('.')[0] == '6'"
30+
- platform: "centos7"
2131
arch: "amd64"
22-
asset_filename: "#{repo}_#{version}_alpine_linux_amd64.tar.gz"
32+
asset_filename: "#{repo}_#{version}_centos7_linux_amd64.tar.gz"
33+
sha_filename: "#{repo}_#{version}_sha512-checksums.txt"
34+
filter:
35+
- "entity.system.os == 'linux'"
36+
- "entity.system.arch == 'amd64'"
37+
- "entity.system.platform_family == 'rhel'"
38+
- "entity.system.platform_version.split('.')[0] == '7'"
39+
- platform: "debian"
40+
arch: "amd64"
41+
asset_filename: "#{repo}_#{version}_debian_linux_amd64.tar.gz"
42+
sha_filename: "#{repo}_#{version}_sha512-checksums.txt"
43+
filter:
44+
- "entity.system.os == 'linux'"
45+
- "entity.system.arch == 'amd64'"
46+
- "entity.system.platform_family == 'debian'"
47+
- platform: "debian9"
48+
arch: "amd64"
49+
asset_filename: "#{repo}_#{version}_debian9_linux_amd64.tar.gz"
2350
sha_filename: "#{repo}_#{version}_sha512-checksums.txt"
2451
filter:
2552
- "entity.system.os == 'linux'"
2653
- "entity.system.arch == 'amd64'"
27-
- "entity.system.platform == 'alpine'"
28-

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
55

66
## [Unreleased]
77

8+
### Added
9+
- Updated asset build targets to support centos6
10+
- Removed centos from bonsai asset definition
11+
- Updated bundler requirement from '~> 1.7' to '~> 2.1'
12+
813
## [4.1.0] 2020-01-09
914
### Changed
1015
- Update rest-client requirement from `= 1.8.0` to `= 2.1.0` (@dependabot-preview)

sensu-plugins-elasticsearch.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Gem::Specification.new do |s| # rubocop:disable Metrics/BlockLength
3838
s.add_runtime_dependency 'rest-client', '2.1.0'
3939
s.add_runtime_dependency 'sensu-plugin', '~> 4.0'
4040

41-
s.add_development_dependency 'bundler', '~> 1.7'
41+
s.add_development_dependency 'bundler', '~> 2.1'
4242
s.add_development_dependency 'codeclimate-test-reporter', '~> 0.4'
4343
s.add_development_dependency 'github-markup', '~> 1.3'
4444
s.add_development_dependency 'kitchen-docker', '~> 2.6'

0 commit comments

Comments
 (0)