Skip to content

Commit ecd3080

Browse files
DistTasks: do not use crossbuild container when building without cgo
1 parent 3dca438 commit ecd3080

File tree

1 file changed

+14
-56
lines changed

1 file changed

+14
-56
lines changed

DistTasks.yml

Lines changed: 14 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -24,57 +24,41 @@ vars:
2424
tasks:
2525
Windows_32bit:
2626
desc: Builds Windows 32 bit binaries
27-
dir: "{{.DIST_DIR}}"
2827
cmds:
2928
- |
30-
docker run -v `pwd`/..:/home/build -w /home/build \
31-
-e CGO_ENABLED=0 \
32-
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
33-
--build-cmd "{{.BUILD_COMMAND}}" \
34-
-p "{{.BUILD_PLATFORM}}"
29+
CGO_ENABLED=0 GOOS=windows GOARCH=386 {{.BUILD_COMMAND}}
3530
31+
cd {{.DIST_DIR}}
3632
zip {{.PACKAGE_NAME}} {{.PLATFORM_DIR}}/{{.PROJECT_NAME}}.exe ../LICENSE.txt -j
3733
3834
vars:
3935
PLATFORM_DIR: "{{.PROJECT_NAME}}_windows_386"
4036
BUILD_COMMAND: "go build -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}}.exe {{.LDFLAGS}}"
41-
BUILD_PLATFORM: "windows/386"
42-
CONTAINER_TAG: "{{.GO_VERSION}}-main"
4337
PACKAGE_PLATFORM: "Windows_32bit"
4438
PACKAGE_NAME: "{{.PROJECT_NAME}}_{{.VERSION}}_{{.PACKAGE_PLATFORM}}.zip"
4539

4640
Windows_64bit:
4741
desc: Builds Windows 64 bit binaries
48-
dir: "{{.DIST_DIR}}"
4942
cmds:
5043
- |
51-
docker run -v `pwd`/..:/home/build -w /home/build \
52-
-e CGO_ENABLED=0 \
53-
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
54-
--build-cmd "{{.BUILD_COMMAND}}" \
55-
-p "{{.BUILD_PLATFORM}}"
44+
CGO_ENABLED=0 GOOS=windows GOARCH=amd64 {{.BUILD_COMMAND}}
5645
46+
cd {{.DIST_DIR}}
5747
zip {{.PACKAGE_NAME}} {{.PLATFORM_DIR}}/{{.PROJECT_NAME}}.exe ../LICENSE.txt -j
5848
5949
vars:
6050
PLATFORM_DIR: "{{.PROJECT_NAME}}_windows_amd64"
6151
BUILD_COMMAND: "go build -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}}.exe {{.LDFLAGS}}"
62-
BUILD_PLATFORM: "windows/amd64"
63-
CONTAINER_TAG: "{{.GO_VERSION}}-main"
6452
PACKAGE_PLATFORM: "Windows_64bit"
6553
PACKAGE_NAME: "{{.PROJECT_NAME}}_{{.VERSION}}_{{.PACKAGE_PLATFORM}}.zip"
6654

6755
Linux_32bit:
6856
desc: Builds Linux 32 bit binaries
69-
dir: "{{.DIST_DIR}}"
7057
cmds:
7158
- |
72-
docker run -v `pwd`/..:/home/build -w /home/build \
73-
-e CGO_ENABLED=0 \
74-
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
75-
--build-cmd "{{.BUILD_COMMAND}}" \
76-
-p "{{.BUILD_PLATFORM}}"
59+
CGO_ENABLED=0 GOOS=linux GOARCH=386 {{.BUILD_COMMAND}}
7760
61+
cd {{.DIST_DIR}}
7862
tar cz -C {{.PLATFORM_DIR}} {{.PROJECT_NAME}} -C ../.. LICENSE.txt -f {{.PACKAGE_NAME}}
7963
- task: build_deb
8064
vars:
@@ -84,22 +68,16 @@ tasks:
8468
vars:
8569
PLATFORM_DIR: "{{.PROJECT_NAME}}_linux_amd32"
8670
BUILD_COMMAND: "go build -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}} {{.LDFLAGS}}"
87-
BUILD_PLATFORM: "linux/386"
88-
CONTAINER_TAG: "{{.GO_VERSION}}-main"
8971
PACKAGE_PLATFORM: "Linux_32bit"
9072
PACKAGE_NAME: "{{.PROJECT_NAME}}_{{.VERSION}}_{{.PACKAGE_PLATFORM}}.tar.gz"
9173

9274
Linux_64bit:
9375
desc: Builds Linux 64 bit binaries
94-
dir: "{{.DIST_DIR}}"
9576
cmds:
9677
- |
97-
docker run -v `pwd`/..:/home/build -w /home/build \
98-
-e CGO_ENABLED=0 \
99-
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
100-
--build-cmd "{{.BUILD_COMMAND}}" \
101-
-p "{{.BUILD_PLATFORM}}"
78+
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 {{.BUILD_COMMAND}}
10279
80+
cd {{.DIST_DIR}}
10381
tar cz -C {{.PLATFORM_DIR}} {{.PROJECT_NAME}} -C ../.. LICENSE.txt -f {{.PACKAGE_NAME}}
10482
- task: build_deb
10583
vars:
@@ -109,22 +87,16 @@ tasks:
10987
vars:
11088
PLATFORM_DIR: "{{.PROJECT_NAME}}_linux_amd64"
11189
BUILD_COMMAND: "go build -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}} {{.LDFLAGS}}"
112-
BUILD_PLATFORM: "linux/amd64"
113-
CONTAINER_TAG: "{{.GO_VERSION}}-main"
11490
PACKAGE_PLATFORM: "Linux_64bit"
11591
PACKAGE_NAME: "{{.PROJECT_NAME}}_{{.VERSION}}_{{.PACKAGE_PLATFORM}}.tar.gz"
11692

11793
Linux_ARMv7:
11894
desc: Builds Linux ARMv7 binaries
119-
dir: "{{.DIST_DIR}}"
12095
cmds:
12196
- |
122-
docker run -v `pwd`/..:/home/build -w /home/build \
123-
-e CGO_ENABLED=0 \
124-
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
125-
--build-cmd "{{.BUILD_COMMAND}}" \
126-
-p "{{.BUILD_PLATFORM}}"
97+
CGO_ENABLED=0 GOOS=linux GOARM=7 GOARCH=arm {{.BUILD_COMMAND}}
12798
99+
cd {{.DIST_DIR}}
128100
tar cz -C {{.PLATFORM_DIR}} {{.PROJECT_NAME}} -C ../.. LICENSE.txt -f {{.PACKAGE_NAME}}
129101
- task: build_deb
130102
vars:
@@ -134,22 +106,16 @@ tasks:
134106
vars:
135107
PLATFORM_DIR: "{{.PROJECT_NAME}}_linux_arm_7"
136108
BUILD_COMMAND: "go build -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}} {{.LDFLAGS}}"
137-
BUILD_PLATFORM: "linux/armv7"
138-
CONTAINER_TAG: "{{.GO_VERSION}}-armhf"
139109
PACKAGE_PLATFORM: "Linux_ARMv7"
140110
PACKAGE_NAME: "{{.PROJECT_NAME}}_{{.VERSION}}_{{.PACKAGE_PLATFORM}}.tar.gz"
141111

142112
Linux_ARMv6:
143113
desc: Builds Linux ARMv6 binaries
144-
dir: "{{.DIST_DIR}}"
145114
cmds:
146115
- |
147-
docker run -v `pwd`/..:/home/build -w /home/build \
148-
-e CGO_ENABLED=0 \
149-
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
150-
--build-cmd "{{.BUILD_COMMAND}}" \
151-
-p "{{.BUILD_PLATFORM}}"
116+
CGO_ENABLED=0 GOOS=linux GOARM=6 GOARCH=arm {{.BUILD_COMMAND}}
152117
118+
cd {{.DIST_DIR}}
153119
tar cz -C {{.PLATFORM_DIR}} {{.PROJECT_NAME}} -C ../.. LICENSE.txt -f {{.PACKAGE_NAME}}
154120
- task: build_deb
155121
vars:
@@ -159,22 +125,16 @@ tasks:
159125
vars:
160126
PLATFORM_DIR: "{{.PROJECT_NAME}}_linux_arm_6"
161127
BUILD_COMMAND: "go build -buildvcs=false -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}} {{.LDFLAGS}}"
162-
BUILD_PLATFORM: "linux/armv6"
163-
CONTAINER_TAG: "{{.GO_VERSION}}-armel-debian12"
164128
PACKAGE_PLATFORM: "Linux_ARMv6"
165129
PACKAGE_NAME: "{{.PROJECT_NAME}}_{{.VERSION}}_{{.PACKAGE_PLATFORM}}.tar.gz"
166130

167131
Linux_ARM64:
168132
desc: Builds Linux ARM64 binaries
169-
dir: "{{.DIST_DIR}}"
170133
cmds:
171134
- |
172-
docker run -v `pwd`/..:/home/build -w /home/build \
173-
-e CGO_ENABLED=0 \
174-
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
175-
--build-cmd "{{.BUILD_COMMAND}}" \
176-
-p "{{.BUILD_PLATFORM}}"
135+
CGO_ENABLED=0 GOOS=linux GOARCH=arm64 {{.BUILD_COMMAND}}
177136
137+
cd {{.DIST_DIR}}
178138
tar cz -C {{.PLATFORM_DIR}} {{.PROJECT_NAME}} -C ../.. LICENSE.txt -f {{.PACKAGE_NAME}}
179139
- task: build_deb
180140
vars:
@@ -184,8 +144,6 @@ tasks:
184144
vars:
185145
PLATFORM_DIR: "{{.PROJECT_NAME}}_linux_arm_64"
186146
BUILD_COMMAND: "go build -buildvcs=false -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}} {{.LDFLAGS}}"
187-
BUILD_PLATFORM: "linux/arm64"
188-
CONTAINER_TAG: "{{.GO_VERSION}}-arm-debian12"
189147
PACKAGE_PLATFORM: "Linux_ARM64"
190148
PACKAGE_NAME: "{{.PROJECT_NAME}}_{{.VERSION}}_{{.PACKAGE_PLATFORM}}.tar.gz"
191149

0 commit comments

Comments
 (0)