Skip to content

Commit 8a4fc62

Browse files
cmagliecmaglie
committed
Fixed tools archive build
1 parent 73c5dc9 commit 8a4fc62

File tree

1 file changed

+104
-97
lines changed

1 file changed

+104
-97
lines changed

‎DistTasks.yml

Lines changed: 104 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -28,184 +28,191 @@ tasks:
2828
- task: Linux_ARMv7
2929
- task: Linux_ARM64
3030
- task: macOS_64bit
31+
- task: checksums
32+
33+
checksums:
34+
desc: Create the checksums file
35+
dir: "{{ .DIST_DIR }}"
36+
cmds:
37+
- sha256sum serial-discovery_v1.2.0-dirty_*.* > {{ .CHECKSUM_FILE }}
3138

3239
Windows_32bit:
3340
desc: Builds Windows 32 bit binaries
34-
dir: "{{ .DIST_DIR }}"
41+
dir: "{{ .DIST_DIR }}/{{ .PLATFORM_DIR }}"
3542
cmds:
3643
- |
37-
docker run -v `pwd`/..:/home/build -w /home/build \
38-
-e CGO_ENABLED=1 \
39-
{{ .CONTAINER }}:{{ .CONTAINER_TAG }} \
40-
--build-cmd "{{ .BUILD_COMMAND }}" \
41-
-p "{{ .BUILD_PLATFORM }}"
42-
43-
zip {{ .PACKAGE_NAME}} {{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }}.exe ../LICENSE.txt -j
44-
sha256sum {{ .PACKAGE_NAME }} >> {{ .CHECKSUM_FILE }}
44+
mkdir -p {{ .PROJECT_NAME }}_{{ .VERSION }}
45+
cp ../../LICENSE.txt {{ .PROJECT_NAME }}_{{ .VERSION }}
46+
docker run -v `pwd`/../..:/home/build -w /home/build \
47+
-e CGO_ENABLED=1 \
48+
{{ .CONTAINER }}:{{ .CONTAINER_TAG }} \
49+
--build-cmd "{{ .BUILD_COMMAND }}" \
50+
-p "{{ .BUILD_PLATFORM }}"
51+
zip -r ../{{ .PACKAGE_NAME}} {{ .PROJECT_NAME }}_{{ .VERSION }}
4552
4653
vars:
47-
PLATFORM_DIR: "{{ .PROJECT_NAME }}_windows_386"
48-
BUILD_COMMAND: "go build -o {{ .DIST_DIR }}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }}.exe {{ .LDFLAGS }}"
54+
PACKAGE_PLATFORM: "Windows_32bit"
55+
PLATFORM_DIR: "{{ .PROJECT_NAME }}_{{ .VERSION }}_{{ .PACKAGE_PLATFORM }}"
56+
BUILD_COMMAND: "go build -o {{ .DIST_DIR }}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }}_{{ .VERSION }}/{{ .PROJECT_NAME }}.exe {{ .LDFLAGS }}"
4957
BUILD_PLATFORM: "windows/386"
5058
CONTAINER_TAG: "{{ .GO_VERSION }}-main"
51-
PACKAGE_PLATFORM: "Windows_32bit"
5259
PACKAGE_NAME: "{{ .PROJECT_NAME }}_{{ .VERSION }}_{{ .PACKAGE_PLATFORM }}.zip"
5360

5461
Windows_64bit:
5562
desc: Builds Windows 64 bit binaries
56-
dir: "{{ .DIST_DIR }}"
63+
dir: "{{ .DIST_DIR }}/{{ .PLATFORM_DIR }}"
5764
cmds:
5865
- |
59-
docker run -v `pwd`/..:/home/build -w /home/build \
60-
-e CGO_ENABLED=1 \
61-
{{ .CONTAINER }}:{{ .CONTAINER_TAG }} \
62-
--build-cmd "{{ .BUILD_COMMAND }}" \
63-
-p "{{ .BUILD_PLATFORM }}"
64-
65-
zip {{ .PACKAGE_NAME}} {{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }}.exe ../LICENSE.txt -j
66-
sha256sum {{ .PACKAGE_NAME }} >> {{ .CHECKSUM_FILE }}
66+
mkdir -p {{ .PROJECT_NAME }}_{{ .VERSION }}
67+
cp ../../LICENSE.txt {{ .PROJECT_NAME }}_{{ .VERSION }}
68+
docker run -v `pwd`/../..:/home/build -w /home/build \
69+
-e CGO_ENABLED=1 \
70+
{{ .CONTAINER }}:{{ .CONTAINER_TAG }} \
71+
--build-cmd "{{ .BUILD_COMMAND }}" \
72+
-p "{{ .BUILD_PLATFORM }}"
73+
zip -r ../{{ .PACKAGE_NAME}} {{ .PROJECT_NAME }}_{{ .VERSION }}
6774
6875
vars:
69-
PLATFORM_DIR: "{{ .PROJECT_NAME }}_windows_amd64"
70-
BUILD_COMMAND: "go build -o {{ .DIST_DIR }}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }}.exe {{ .LDFLAGS }}"
76+
PACKAGE_PLATFORM: "Windows_64bit"
77+
PLATFORM_DIR: "{{ .PROJECT_NAME }}_{{ .VERSION }}_{{ .PACKAGE_PLATFORM }}"
78+
BUILD_COMMAND: "go build -o {{ .DIST_DIR }}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }}_{{ .VERSION }}/{{ .PROJECT_NAME }}.exe {{ .LDFLAGS }}"
7179
BUILD_PLATFORM: "windows/amd64"
7280
CONTAINER_TAG: "{{ .GO_VERSION }}-main"
73-
PACKAGE_PLATFORM: "Windows_64bit"
7481
PACKAGE_NAME: "{{ .PROJECT_NAME }}_{{ .VERSION }}_{{ .PACKAGE_PLATFORM }}.zip"
7582

7683
Linux_32bit:
7784
desc: Builds Linux 32 bit binaries
78-
dir: "{{ .DIST_DIR }}"
85+
dir: "{{ .DIST_DIR }}/{{ .PLATFORM_DIR }}"
7986
cmds:
8087
- |
81-
docker run -v `pwd`/..:/home/build -w /home/build \
82-
-e CGO_ENABLED=1 \
83-
{{ .CONTAINER }}:{{ .CONTAINER_TAG }} \
84-
--build-cmd "{{ .BUILD_COMMAND }}" \
85-
-p "{{ .BUILD_PLATFORM }}"
86-
87-
tar cz -C {{ .PLATFORM_DIR }} {{ .PROJECT_NAME }} -C ../.. LICENSE.txt -f {{ .PACKAGE_NAME }}
88-
sha256sum {{ .PACKAGE_NAME }} >> {{ .CHECKSUM_FILE }}
88+
mkdir -p {{ .PROJECT_NAME }}_{{ .VERSION }}
89+
cp ../../LICENSE.txt {{ .PROJECT_NAME }}_{{ .VERSION }}
90+
docker run -v `pwd`/../..:/home/build -w /home/build \
91+
-e CGO_ENABLED=1 \
92+
{{ .CONTAINER }}:{{ .CONTAINER_TAG }} \
93+
--build-cmd "{{ .BUILD_COMMAND }}" \
94+
-p "{{ .BUILD_PLATFORM }}"
95+
tar cz {{ .PROJECT_NAME }}_{{ .VERSION }} -f ../{{ .PACKAGE_NAME }}
8996
9097
vars:
91-
PLATFORM_DIR: "{{ .PROJECT_NAME }}_linux_386"
92-
BUILD_COMMAND: "go build -o {{ .DIST_DIR }}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }} {{ .LDFLAGS }}"
98+
PACKAGE_PLATFORM: "Linux_32bit"
99+
PLATFORM_DIR: "{{ .PROJECT_NAME }}_{{ .VERSION }}_{{ .PACKAGE_PLATFORM }}"
100+
BUILD_COMMAND: "go build -o {{ .DIST_DIR }}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }}_{{ .VERSION }}/{{ .PROJECT_NAME }} {{ .LDFLAGS }}"
93101
BUILD_PLATFORM: "linux/386"
94102
CONTAINER_TAG: "{{ .GO_VERSION }}-main"
95-
PACKAGE_PLATFORM: "Linux_32bit"
96103
PACKAGE_NAME: "{{ .PROJECT_NAME }}_{{ .VERSION }}_{{ .PACKAGE_PLATFORM }}.tar.gz"
97104

98105
Linux_64bit:
99106
desc: Builds Linux 64 bit binaries
100-
dir: "{{ .DIST_DIR }}"
107+
dir: "{{ .DIST_DIR }}/{{ .PLATFORM_DIR }}"
101108
cmds:
102109
- |
103-
docker run -v `pwd`/..:/home/build -w /home/build \
104-
-e CGO_ENABLED=1 \
105-
{{ .CONTAINER }}:{{ .CONTAINER_TAG }} \
106-
--build-cmd "{{ .BUILD_COMMAND }}" \
107-
-p "{{ .BUILD_PLATFORM }}"
108-
109-
tar cz -C {{ .PLATFORM_DIR }} {{ .PROJECT_NAME }} -C ../.. LICENSE.txt -f {{ .PACKAGE_NAME }}
110-
sha256sum {{ .PACKAGE_NAME }} >> {{ .CHECKSUM_FILE }}
110+
mkdir -p {{ .PROJECT_NAME }}_{{ .VERSION }}
111+
cp ../../LICENSE.txt {{ .PROJECT_NAME }}_{{ .VERSION }}
112+
docker run -v `pwd`/../..:/home/build -w /home/build \
113+
-e CGO_ENABLED=1 \
114+
{{ .CONTAINER }}:{{ .CONTAINER_TAG }} \
115+
--build-cmd "{{ .BUILD_COMMAND }}" \
116+
-p "{{ .BUILD_PLATFORM }}"
117+
tar cz {{ .PROJECT_NAME }}_{{ .VERSION }} -f ../{{ .PACKAGE_NAME }}
111118
112119
vars:
113-
PLATFORM_DIR: "{{ .PROJECT_NAME }}_linux_amd64"
114-
BUILD_COMMAND: "go build -o {{ .DIST_DIR }}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }} {{ .LDFLAGS }}"
120+
PACKAGE_PLATFORM: "Linux_64bit"
121+
PLATFORM_DIR: "{{ .PROJECT_NAME }}_{{ .VERSION }}_{{ .PACKAGE_PLATFORM }}"
122+
BUILD_COMMAND: "go build -o {{ .DIST_DIR }}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }}_{{ .VERSION }}/{{ .PROJECT_NAME }} {{ .LDFLAGS }}"
115123
BUILD_PLATFORM: "linux/amd64"
116124
CONTAINER_TAG: "{{ .GO_VERSION }}-main"
117-
PACKAGE_PLATFORM: "Linux_64bit"
118125
PACKAGE_NAME: "{{ .PROJECT_NAME }}_{{ .VERSION }}_{{ .PACKAGE_PLATFORM }}.tar.gz"
119126

120127
Linux_ARMv7:
121128
desc: Builds Linux ARMv7 binaries
122-
dir: "{{ .DIST_DIR }}"
129+
dir: "{{ .DIST_DIR }}/{{ .PLATFORM_DIR }}"
123130
cmds:
124131
- |
125-
docker run -v `pwd`/..:/home/build -w /home/build \
126-
-e CGO_ENABLED=1 \
127-
{{ .CONTAINER }}:{{ .CONTAINER_TAG }} \
128-
--build-cmd "{{ .BUILD_COMMAND }}" \
129-
-p "{{ .BUILD_PLATFORM }}"
130-
131-
tar cz -C {{ .PLATFORM_DIR }} {{ .PROJECT_NAME }} -C ../.. LICENSE.txt -f {{ .PACKAGE_NAME }}
132-
sha256sum {{ .PACKAGE_NAME }} >> {{ .CHECKSUM_FILE }}
132+
mkdir -p {{ .PROJECT_NAME }}_{{ .VERSION }}
133+
cp ../../LICENSE.txt {{ .PROJECT_NAME }}_{{ .VERSION }}
134+
docker run -v `pwd`/../..:/home/build -w /home/build \
135+
-e CGO_ENABLED=1 \
136+
{{ .CONTAINER }}:{{ .CONTAINER_TAG }} \
137+
--build-cmd "{{ .BUILD_COMMAND }}" \
138+
-p "{{ .BUILD_PLATFORM }}"
139+
tar cz {{ .PROJECT_NAME }}_{{ .VERSION }} -f ../{{ .PACKAGE_NAME }}
133140
134141
vars:
135-
PLATFORM_DIR: "{{ .PROJECT_NAME }}_linux_arm_7"
136-
BUILD_COMMAND: "go build -o {{ .DIST_DIR }}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }} {{ .LDFLAGS }}"
142+
PACKAGE_PLATFORM: "Linux_ARMv7"
143+
PLATFORM_DIR: "{{ .PROJECT_NAME }}_{{ .VERSION }}_{{ .PACKAGE_PLATFORM }}"
144+
BUILD_COMMAND: "go build -o {{ .DIST_DIR }}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }}_{{ .VERSION }}/{{ .PROJECT_NAME }} {{ .LDFLAGS }}"
137145
BUILD_PLATFORM: "linux/armv7"
138146
CONTAINER_TAG: "{{ .GO_VERSION }}-arm"
139-
PACKAGE_PLATFORM: "Linux_ARMv7"
140147
PACKAGE_NAME: "{{ .PROJECT_NAME }}_{{ .VERSION }}_{{ .PACKAGE_PLATFORM }}.tar.gz"
141148

142149
Linux_ARMv6:
143150
desc: Builds Linux ARMv6 binaries
144-
dir: "{{ .DIST_DIR }}"
151+
dir: "{{ .DIST_DIR }}/{{ .PLATFORM_DIR }}"
145152
cmds:
146153
- |
147-
docker run -v `pwd`/..:/home/build -w /home/build \
148-
-e CGO_ENABLED=1 \
149-
{{ .CONTAINER }}:{{ .CONTAINER_TAG }} \
150-
--build-cmd "{{ .BUILD_COMMAND }}" \
151-
-p "{{ .BUILD_PLATFORM }}"
152-
153-
tar cz -C {{ .PLATFORM_DIR }} {{ .PROJECT_NAME }} -C ../.. LICENSE.txt -f {{ .PACKAGE_NAME }}
154-
sha256sum {{ .PACKAGE_NAME }} >> {{ .CHECKSUM_FILE }}
154+
mkdir -p {{ .PROJECT_NAME }}_{{ .VERSION }}
155+
cp ../../LICENSE.txt {{ .PROJECT_NAME }}_{{ .VERSION }}
156+
docker run -v `pwd`/../..:/home/build -w /home/build \
157+
-e CGO_ENABLED=1 \
158+
{{ .CONTAINER }}:{{ .CONTAINER_TAG }} \
159+
--build-cmd "{{ .BUILD_COMMAND }}" \
160+
-p "{{ .BUILD_PLATFORM }}"
161+
tar cz {{ .PROJECT_NAME }}_{{ .VERSION }} -f ../{{ .PACKAGE_NAME }}
155162
156163
vars:
157-
PLATFORM_DIR: "{{ .PROJECT_NAME }}_linux_arm_6"
158-
BUILD_COMMAND: "go build -o {{ .DIST_DIR }}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }} {{ .LDFLAGS }}"
164+
PACKAGE_PLATFORM: "Linux_ARMv6"
165+
PLATFORM_DIR: "{{ .PROJECT_NAME }}_{{ .VERSION }}_{{ .PACKAGE_PLATFORM }}"
166+
BUILD_COMMAND: "go build -o {{ .DIST_DIR }}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }}_{{ .VERSION }}/{{ .PROJECT_NAME }} {{ .LDFLAGS }}"
159167
BUILD_PLATFORM: "linux/armv6"
160168
CONTAINER_TAG: "{{ .GO_VERSION }}-arm"
161-
PACKAGE_PLATFORM: "Linux_ARMv6"
162169
PACKAGE_NAME: "{{ .PROJECT_NAME }}_{{ .VERSION }}_{{ .PACKAGE_PLATFORM }}.tar.gz"
163170

164171
Linux_ARM64:
165172
desc: Builds Linux ARM64 binaries
166-
dir: "{{ .DIST_DIR }}"
173+
dir: "{{ .DIST_DIR }}/{{ .PLATFORM_DIR }}"
167174
cmds:
168175
- |
169-
docker run -v `pwd`/..:/home/build -w /home/build \
170-
-e CGO_ENABLED=1 \
171-
{{ .CONTAINER }}:{{ .CONTAINER_TAG }} \
172-
--build-cmd "{{ .BUILD_COMMAND }}" \
173-
-p "{{ .BUILD_PLATFORM }}"
174-
175-
tar cz -C {{ .PLATFORM_DIR }} {{ .PROJECT_NAME }} -C ../.. LICENSE.txt -f {{ .PACKAGE_NAME }}
176-
sha256sum {{ .PACKAGE_NAME }} >> {{ .CHECKSUM_FILE }}
176+
mkdir -p {{ .PROJECT_NAME }}_{{ .VERSION }}
177+
cp ../../LICENSE.txt {{ .PROJECT_NAME }}_{{ .VERSION }}
178+
docker run -v `pwd`/../..:/home/build -w /home/build \
179+
-e CGO_ENABLED=1 \
180+
{{ .CONTAINER }}:{{ .CONTAINER_TAG }} \
181+
--build-cmd "{{ .BUILD_COMMAND }}" \
182+
-p "{{ .BUILD_PLATFORM }}"
183+
tar cz {{ .PROJECT_NAME }}_{{ .VERSION }} -f ../{{ .PACKAGE_NAME }}
177184
178185
vars:
179-
PLATFORM_DIR: "{{ .PROJECT_NAME }}_linux_arm_6"
180-
BUILD_COMMAND: "go build -o {{ .DIST_DIR }}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }} {{ .LDFLAGS }}"
186+
PACKAGE_PLATFORM: "Linux_ARM64"
187+
PLATFORM_DIR: "{{ .PROJECT_NAME }}_{{ .VERSION }}_{{ .PACKAGE_PLATFORM }}"
188+
BUILD_COMMAND: "go build -o {{ .DIST_DIR }}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }}_{{ .VERSION }}/{{ .PROJECT_NAME }} {{ .LDFLAGS }}"
181189
BUILD_PLATFORM: "linux/arm64"
182190
CONTAINER_TAG: "{{ .GO_VERSION }}-arm"
183-
PACKAGE_PLATFORM: "Linux_ARM64"
184191
PACKAGE_NAME: "{{ .PROJECT_NAME }}_{{ .VERSION }}_{{ .PACKAGE_PLATFORM }}.tar.gz"
185192

186193
macOS_64bit:
187194
desc: Builds Mac OS X 64 bit binaries
188-
dir: "{{ .DIST_DIR }}"
195+
dir: "{{ .DIST_DIR }}/{{ .PLATFORM_DIR }}"
189196
cmds:
190197
- |
191-
docker run -v `pwd`/..:/home/build -w /home/build \
192-
-e CGO_ENABLED=1 \
193-
{{ .CONTAINER }}:{{ .CONTAINER_TAG }} \
194-
--build-cmd "{{ .BUILD_COMMAND }}" \
195-
-p "{{ .BUILD_PLATFORM }}"
196-
197-
tar cz -C {{ .PLATFORM_DIR }} {{ .PROJECT_NAME }} -C ../.. LICENSE.txt -f {{ .PACKAGE_NAME }}
198-
sha256sum {{ .PACKAGE_NAME }} >> {{ .CHECKSUM_FILE }}
198+
mkdir -p {{ .PROJECT_NAME }}_{{ .VERSION }}
199+
cp ../../LICENSE.txt {{ .PROJECT_NAME }}_{{ .VERSION }}
200+
docker run -v `pwd`/../..:/home/build -w /home/build \
201+
-e CGO_ENABLED=1 \
202+
{{ .CONTAINER }}:{{ .CONTAINER_TAG }} \
203+
--build-cmd "{{ .BUILD_COMMAND }}" \
204+
-p "{{ .BUILD_PLATFORM }}"
205+
tar cz {{ .PROJECT_NAME }}_{{ .VERSION }} -f ../{{ .PACKAGE_NAME }}
199206
200207
vars:
201-
PLATFORM_DIR: "{{ .PROJECT_NAME }}_osx_darwin_amd64"
202-
BUILD_COMMAND: "go build -o {{ .DIST_DIR }}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }} {{ .LDFLAGS }}"
208+
PACKAGE_PLATFORM: "macOS_64bit"
209+
PLATFORM_DIR: "{{ .PROJECT_NAME }}_{{ .VERSION }}_{{ .PACKAGE_PLATFORM }}"
210+
BUILD_COMMAND: "go build -o {{ .DIST_DIR }}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }}_{{ .VERSION }}/{{ .PROJECT_NAME }} {{ .LDFLAGS }}"
203211
BUILD_PLATFORM: "darwin/amd64"
204212
CONTAINER_TAG: "{{ .GO_VERSION }}-darwin"
205-
PACKAGE_PLATFORM: "macOS_64bit"
206213
PACKAGE_NAME: "{{ .PROJECT_NAME }}_{{ .VERSION }}_{{ .PACKAGE_PLATFORM }}.tar.gz"
207214

208215
vars:
209216
CONTAINER: "docker.elastic.co/beats-dev/golang-crossbuild"
210217
GO_VERSION: "1.15.8"
211-
CHECKSUM_FILE: "{{ .VERSION }}-checksums.txt"
218+
CHECKSUM_FILE: "{{ .PROJECT_NAME }}_{{ .VERSION }}-checksums.txt"

0 commit comments

Comments
 (0)