Skip to content

Commit 03b8be8

Browse files
committed
Merge pull request #103 from mackerelio/refactoring-release-process
Refactoring the release process
2 parents 0534f55 + 1b123ed commit 03b8be8

File tree

6 files changed

+316
-291
lines changed

6 files changed

+316
-291
lines changed

.travis.yml

Lines changed: 30 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,17 @@ language: go
22
go:
33
- 1.5
44
env:
5-
- PATH=/home/travis/gopath/bin:$PATH DEBIAN_FRONTEND=noninteractive
5+
global:
6+
- PATH=~/gopath/bin:$PATH
7+
- DEBIAN_FRONTEND=noninteractive
8+
- secure: eVK4VPUaQNF1a3CMUz/5jWaNY0+Wj10HnscPhcvmnH+IUJ+B6n2W4M5ht5WXEmx5EnKgLIZveL9CtPJTTsW4lE1RO03xfuVoe8+dElUSlKLJEHIDKm7koYgFEURWZXRcMAMqW2yj3y7D34fnwP4Evt/HuV8ZtWktMtJUzLr12oFxQDS0RC7II5nh8BiqSGCkKC8QJ6qQzbjZavBQ8M70Y4WWPArYHzwcSQjOLxhQmGCyx9JI7/nIqSosldFwqiFTh+UH3x7Pntt1Ji6Ra0rAuGFN28nQc8ISxfytwAgV4h7ubAWPUom2rXdUpHVvWZXoxDJr8YYq4rGRmyuLl/gBUfv72l/u8wIlMo5gRB2vJXHwKAaogSheGtdVwv7BwPSvjA6oOz5imqkhIm5kNgyrXaBglF7fornPiJNVgv2lMzuLB3GgqjYxhfipFahJT99x91/xd6kZ5OSSUVYkTx/0JwkEmGXyOJNzynC22VNHj6u1T41hkRHHSUjzrNBwNhMEcXDy75VaJukKMi9YyyHgehitWUFnGq0rakMz3tQxeO8K6YVQqjD7NWPiHh1vh4vWYRn2/T7ewTksW1h+/ETJR98YYsjpHnuQSJh6gGj6i4jKKy04hWagVciJ3Jr4i6ouA8ggKoEMzEB9KXd44yJoXk/ozk5VOXPithyp8NuA5BA=
69
sudo: false
710
addons:
811
apt:
912
packages:
10-
- rpm
11-
- devscripts
12-
- debhelper
13+
- rpm
14+
- devscripts
15+
- debhelper
1316
install:
1417
- go get github.com/mitchellh/gox
1518
- mkdir -p ~/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
@@ -19,19 +22,31 @@ script:
1922
- make all
2023
after_script:
2124
- goveralls -coverprofile=.profile.cov
22-
after_success:
23-
- tool/travis/autotag.sh
25+
before_deploy:
26+
- go get github.com/aktau/github-release
27+
- mkdir -p ~/bin
28+
- git clone https://github.com/github/hub.git && cd hub && script/build -o ~/bin/hub
29+
&& cd ..
30+
- echo $TRAVIS_BRANCH
31+
- git config --add remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*'
32+
- git fetch
33+
- git checkout master || git checkout -b master origin/master
34+
- git checkout $TRAVIS_BRANCH
35+
- git fetch --depth=100 || true
36+
- git fetch --tags --depth=100 || true
2437
deploy:
25-
provider: releases
26-
api_key:
27-
secure: vmMQz+IjJ/LUa9SHAlLKyg4raSqkEBIRzqnjS1LK7ZjtcAROo6Pn0lUcC4qMZ96/VvNMdLyGndCOBXsdE2VBCY5goTI7uIW1oxbLM3qOMNQQldG1bOY34bjkiiDU15WLUsKKPEC2RdgwG1aAAsqcUDAeyRABYVBANSn9jylQnBC2b2mQMYUtVA1O9jl3Qg64Cy6MUUirE/SuKp/cnE3AakcQt54pNVsnM54bIyrbGhqThLj7p7uLJEm58oRWR7TTUSgmk/Rbj4aJSC4k5lzN9iL/Fr5AgnpEQQUg3ishE+5yqSW7f/PRqXC6ZI9p6XS7bhS8N178ImzouIsoKWltblsgUhfvE6ONyMpi1+RG+6Lp3HlpLuq0Pz/efEpcaSDg6lXDIvMBC2sA5pbPok6Yx4tJOSv8adWu9t0yGVJezYaqbN/071K9m3cM4YTQK4L39b2FxQ2ZrUhee8HZy5rDO8iqx2vgM+NXATz2L5Tjjzd4aqfIDX8R3PVImBci7se/wmamDUpOrcfSjrI2dzEQGBzBfIFIhCaCQSuEjpZqBKdcOztkn1uev7a0AAUeZ7my+uQNpAMO7/AapM7LLugmkLM06FgrHKWDPQP/T92MPyvmC04nNraetAVijVYLQnlK5+TdEMvkKHuY5afLp5mEzX+7jTSmjyaUNrbANs8bH/8=
28-
file:
29-
- "/home/travis/rpmbuild/RPMS/noarch/mackerel-check-plugins-0.5.2-1.noarch.rpm"
30-
- "/home/travis/gopath/src/github.com/mackerelio/go-check-plugins/packaging/mackerel-check-plugins_0.5.2-1_all.deb"
38+
- provider: script
39+
script: tool/releng --task=upload-to-github-release -v
40+
skip_cleanup: true
41+
on:
42+
branch: master
43+
- provider: script
44+
script: tool/releng --task=create-pullrequest --current-branch=$TRAVIS_BRANCH --package-name=mackerel-check-plugins
45+
-v
46+
skip_cleanup: true
3147
on:
32-
repo: mackerelio/go-check-plugins
3348
all_branches: true
34-
tags: true
49+
condition: "$TRAVIS_BRANCH =~ ^bump-version-.*$"
3550
notifications:
3651
slack:
37-
secure: gsM+oW5k6hQnL16ubkj0Iu7b3kSeUUGCErwWa8AIBdfk6DUYBxfFNkJkHJ+N44YJPuk/ijaTk8fzQ0HqD9H+Fegkv/KPMnJ00QxOD4XWv4URFACuGQgC2xB4G8OBg7StHPN68KroQn1ryNNoAwiZih///PGJyxb4uU/FrpA8iLATBoGoaEv8OrGkkwIepvtuHeRzyMPAjNvNO6evI0d/+Xn0YLRLtufdznHG3UHc/FJ306QkMz5hbP4iZqyNFlj6sFlvvovsozTqgGYYqKz2QbMzvR3l7xuFWiV6qa6zegy6sWp9pBWykQMm528R3pVDSu/f775shORLS4DaSV7ZM3Gw963gIgfdmcqLi6KP8j+NqqyveUAq5C6JOaVDTKwJg+b2yL6TYYEQ4Lz7WiOLLmjj9V+9+i5oy852FfQEG/en9+jnPDuWDI0ILKTW8EqcQfCf46mtV0TiWY4if5iYAVUOl2O5Jam9LTX9YSeRA0qq9022tJ60GpIvX9vskO2SXTdAAQRRqM5dliOYblo0H3AmBQWTixH+AgcOP0nzAugIRX07Kpni9GfOL5bW3lBVJo1502DZWLdKoF1ulS/nHfWdz9TwuocX8hOko/H3yNH8Lt9DyodgXgWDwtYuHeuXxw7gTcaPX4K3wGgshnaBZXrryWH6u7UPT8hFePqsD58=
52+
secure: W4637ZIl5Gbwm93btsfysyvZpVw3GVMni1y7ea8lj4XFEyNV9aoW0OIkCjWIL9MrkxnkCcnhTKfOAPuFoqFYXXRJFkYCU9GYRsENqwvk9ev2xNyQ9OPIdNqVFcgzA4qiX97JwiuvkaDauRLsWKpdZUtMugrMEsnt1hH6E6uJ5CyVtuun9O5SyICet9tzyLyFpefrhKT8LJiwYDzT9PX6vaL2FCxDgservpPon4YkIkbaZcfURbkd0Gkm3IW5HSVAzAesEspDPAAbMp0ZKF6YPXk1kCuAttNcXoNfRyxIWD02qYTVvVLMVI9DbcDGzAeBPYaZ0vLFtCTwPWx342GqAVDy1sZ5xqYwwqpeVwPA7GdCARl3PgP1q04j4Dd6ZUMn5vM+HdMGtbKcT2vks/t9D8ozrX2F/SyTAVCVqt4xEBSVus4U8a7oK+JQXphnV++8ltDfyXoSdv4oQjHDmpZurcbEgmzWBFuenQK8CKM71voEZZSxhu4/7TksoXuo0zzxhopR9u9B/Y+/74azGBv3VW/JfzJ5gzi08Y56YA80pLHjbxJeykKzv4lR+c+WAWGxVhBD9xN4OKcer3ohDbTfhs0rDf270DOSYx3bstnvQ87NcNbJ1sPRwRhK8rbzvwtLnGUjMNK1kNRcr2rQmmJYlR3DH/hfHHEvAQPeseN90Ek=

Makefile

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
TARGET_OSARCH="linux/amd64"
2+
CURRENT_VERSION = $(shell git log --merges --oneline | perl -ne 'if(m/^.+Merge pull request \#[0-9]+ from .+\/bump-version-([0-9\.]+)/){print $$1;exit}')
3+
4+
check-variables:
5+
echo "CURRENT_VERSION: ${CURRENT_VERSION}"
26

37
all: clean test build rpm deb
48

@@ -28,13 +32,17 @@ build: deps
2832
for i in check-*; do \
2933
gox -ldflags "-s -w" \
3034
-osarch=$(TARGET_OSARCH) -output build/$$i \
31-
github.com/mackerelio/go-check-plugins/$$i; \
35+
`pwd | sed -e "s|${GOPATH}/src/||"`/$$i; \
3236
done
3337

3438
rpm: build
35-
rpmbuild --define "_sourcedir `pwd`" -ba packaging/rpm/mackerel-check-plugins.spec
39+
TARGET_OSARCH="linux/386" make build
40+
rpmbuild --define "_sourcedir `pwd`" --define "_version ${CURRENT_VERSION}" --define "buildarch noarch" -bb packaging/rpm/mackerel-check-plugins.spec
41+
TARGET_OSARCH="linux/amd64" make build
42+
rpmbuild --define "_sourcedir `pwd`" --define "_version ${CURRENT_VERSION}" --define "buildarch x86_64" -bb packaging/rpm/mackerel-check-plugins.spec
3643

37-
deb: build
44+
deb: deps
45+
TARGET_OSARCH="linux/386" make build
3846
cp build/check-* packaging/deb/debian/
3947
cd packaging/deb && debuild --no-tgz-check -rfakeroot -uc -us
4048

@@ -45,7 +53,4 @@ clean:
4553
fi
4654
go clean
4755

48-
release:
49-
tool/releng
50-
5156
.PHONY: all test deps devel-deps lint cover build rpm deb clean release

packaging/rpm/mackerel-check-plugins.spec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
%define __oldtargetdir /usr/local/bin
55

66
Name: mackerel-check-plugins
7-
Version: 0.5.2
7+
Version: %{_version}
88
Release: 1
99
License: Commercial
1010
Summary: macekrel.io check plugins
1111
URL: https://mackerel.io
1212
Group: Hatena
1313
Packager: Hatena
14-
BuildArch: noarch
14+
BuildArch: %{buildarch}
1515
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
1616

1717
%description

tool/autotag

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

0 commit comments

Comments
 (0)