Skip to content

Commit a1d7e22

Browse files
committed
Removing bintray deploy and generating signatures with Travis CI
1 parent 0cf21e3 commit a1d7e22

File tree

4 files changed

+17
-39
lines changed

4 files changed

+17
-39
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
/.acbuild/
22
/build/
33
/dist/
4+
/signing.key

.travis.yml

+3-10
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,15 @@ language: generic
44
script: make && make test
55
after_success:
66
- make deploy
7+
before_deploy:
8+
- openssl aes-256-cbc -K $encrypted_e86489b6762b_key -iv $encrypted_e86489b6762b_iv -in signing.key.enc -out signing.key -d
79
deploy:
810
- provider: releases
911
api_key:
1012
secure: Eb+0GC0pGWQ4JfyMhJauLaoZ8Lycr9p95eRF9/JcBAXPn6Eo69JV+ybakRzKm1sGV9QpA+OzMFfNgRsY1zqGhgk8kBbAqT+Q+BxZDw+UGKKxA4Mgwv4Y/8O72pxcZqaIPkS8desYC0Z6bG1JYKdBIpIFZk9le9w7wIOt11xFmIljHWVe0qP4O6ksJSrhdOGxr1RTlty5Okhb8aqVgIQE7mc56npSl2CqRX7PmpADSLszSNZnXYIkTytY4n+70Nax9wPb/5xPULCwtSdJWFUxjah2aHa/W51mzT/KtHZvcfiKU4jmeybsijMRi3wrVOm1P/qbKE6XQPSLAEh+JFPdMfhG4qxObhbLTyHHJ9TDdT1ELf1g74dY+2VH+ZYm3wH0TLYNOTn/qql3y/798/+ZvhhavPvtx19gkk/HwHBgzp2PV3vfp0iQeScIszby0cXZzrieBypNERZrRI7VwTAng2gSYCrJUSDGm5IFablbRnxYz+w4Bw5DcbTYu3Z8+4cX1r57SLehRDDs7V/nu+f8l/3aSUEJgzCjLO2CxepEJBDr2gJTio43mjHjuXLp+mG3+TaSbP6RTkI72bOElaIjGw+jwceCy/A9vKlUc2gW7sH5+KuJzXfwscD5gLbTTCEHMpd3XcaofMm5Hh9fK2ntPvMd3+kcvfPvwSiQOT/8kkI=
1113
file:
1214
- dist/dit4c-helper-upload-webdav.linux.amd64.aci
13-
- dist/SHA512SUM
14-
skip_cleanup: true
15-
on:
16-
tags: true
17-
repo: dit4c/dit4c-helper-upload-webdav
18-
- provider: bintray
19-
file: dist/bintray-descriptor.json
20-
user: tjdett
21-
key:
22-
secure: "XfCXO/dXMeOL/GSVucfXKJ5huH3ahNvEZHOaAB2wXxoxmX5UWX2f3GIYuGb7KEdL59Uuv8F1GUlU7pIGYBhKEWgAMDXoAK0kYfnmobOr5acLGCJUv/e2ifpV2zCsdGqe+u+4iNDWJ3Jt8ZKXqGN5Ja9ErxEpo/F7rMa1UWh/CBlXNTlZ9ed+PY4kWXTWvc79wzv8ICJGgbSuSf0xZPPqBvjIgabyzKwMwM+oC60xbVzyI+h9wJWXShWWi05shV+alPgZ4RXxdvm4WSqijLsqj6ZvliSakBitBtSbZVPJDh7RGjsKCobQJypYKwZqnCeN2nM3n/gYqrCIqxRWdZmkU9XuDVgZAI/gw9Ok3wnNM9gU0fI7KzbTqdbPAIgYENW7SNVt0MrIJFGWWRRJYTFF3+6+OndqZZI0z9MA4k0EYK5tv0VOp5ggTh01C2RhTpnJI0qrid4V6kj4IogDdeuIQbD5R1+3w1yu9cw6Jww1Nn4itxkTdzrS3V6mF9Wx2GPy5SFnIy1s3o/3vTvUv7gFiBc5TYC0Vg1W9pkn67X1T0U28DRmkQ1AymxjEQj8KGBGOcLVi5CPf2iEjH8PPxIQpmltx+JTh0zELTNDKEPRtY0HpenVu5Y4AW4TJ/gCBSNBYZ7GhHDGWA2ZOe/srBZ+qsH8xG47qDu/iZhBaPL/TbA="
15+
- dist/dit4c-helper-upload-webdav.linux.amd64.aci.asc
2316
skip_cleanup: true
2417
on:
2518
tags: true

Makefile

+13-29
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,14 @@
1-
.DEFAULT_GOAL := dist/SHA512SUM
2-
.PHONY: clean test deploy
3-
41
NAME=dit4c-helper-upload-webdav
52
VERSION=$(shell git describe --dirty --tags)
3+
4+
.DEFAULT_GOAL := dist/$(NAME).linux.amd64.aci
5+
.PHONY: clean test deploy
6+
67
ACBUILD_VERSION=0.4.0
78
RKT_VERSION=1.17.0
89
ACBUILD=build/acbuild
910
RKT=build/rkt/rkt
10-
11-
define BINTRAY_DESCRIPTOR_JSON
12-
{
13-
"package": {
14-
"name": "$(NAME)",
15-
"repo": "releases",
16-
"subject": "dit4c"
17-
},
18-
"version": {
19-
"name": "$(VERSION)",
20-
"desc": "",
21-
"released": "$(shell date -u +%Y-%m-%d)",
22-
"vcs_tag": "$(VERSION)",
23-
"gpgSign": true
24-
},
25-
"files": [
26-
{"includePattern": "dist/(.*\\.aci)", "uploadPattern": "$(NAME)/$(VERSION)/$$1"}
27-
],
28-
"publish": true
29-
}
30-
endef
31-
export BINTRAY_DESCRIPTOR_JSON
32-
33-
dist/SHA512SUM: dist/$(NAME).linux.amd64.aci
34-
sha512sum $^ | sed -e 's/dist\///' > $@
11+
GPG=gpg2
3512

3613
dist/bintray-descriptor.json:
3714
@echo "$$BINTRAY_DESCRIPTOR_JSON" > $@
@@ -57,6 +34,13 @@ dist/$(NAME).linux.amd64.aci: build/acbuild build/client-base.aci build/jwt *.sh
5734
sudo $(ACBUILD) end
5835
sudo chown $(shell id -nu) $@
5936

37+
dist/%.aci.asc: dist/%.aci signing.key
38+
$(eval TMP_KEYRING := $(shell mktemp -p ./build))
39+
$(eval GPG_FLAGS := --batch --no-default-keyring --keyring $(TMP_KEYRING) )
40+
$(GPG) $(GPG_FLAGS) --import signing.key
41+
$(GPG) $(GPG_FLAGS) --armour --detach-sign $<
42+
rm $(TMP_KEYRING)
43+
6044
build dist:
6145
mkdir -p $@
6246

@@ -108,4 +92,4 @@ test: build/bats $(RKT) dist/$(NAME).linux.amd64.aci
10892
clean:
10993
-rm -rf build .acbuild dist
11094

111-
deploy: dist/bintray-descriptor.json
95+
deploy: dist/$(NAME).linux.amd64.aci.asc

signing.key.enc

3.97 KB
Binary file not shown.

0 commit comments

Comments
 (0)