Skip to content

Commit 2889722

Browse files
per1234per1234
committed
Make templating compliant with the taskfile style guide
From https://taskfile.dev/#/styleguide?id=dont-wrap-vars-in-spaces-when-templating > Don't pad inside taskfile templates
1 parent 8647a96 commit 2889722

File tree

2 files changed

+89
-89
lines changed

2 files changed

+89
-89
lines changed

‎DistTasks.yml

+81-81
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ version: "3"
2020
vars:
2121
CONTAINER: "docker.elastic.co/beats-dev/golang-crossbuild"
2222
GO_VERSION: "1.14.7"
23-
CHECKSUM_FILE: "{{ .VERSION }}-checksums.txt"
23+
CHECKSUM_FILE: "{{.VERSION}}-checksums.txt"
2424

2525
tasks:
2626
all:
@@ -37,176 +37,176 @@ tasks:
3737

3838
Windows_32bit:
3939
desc: Builds Windows 32 bit binaries
40-
dir: "{{ .DIST_DIR }}"
40+
dir: "{{.DIST_DIR}}"
4141
cmds:
4242
- |
4343
docker run -v `pwd`/..:/home/build -w /home/build \
4444
-e CGO_ENABLED=1 \
45-
{{ .CONTAINER }}:{{ .CONTAINER_TAG }} \
46-
--build-cmd "{{ .BUILD_COMMAND }}" \
47-
-p "{{ .BUILD_PLATFORM }}"
45+
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
46+
--build-cmd "{{.BUILD_COMMAND}}" \
47+
-p "{{.BUILD_PLATFORM}}"
4848
49-
zip {{ .PACKAGE_NAME}} {{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }}.exe ../LICENSE.txt -j
50-
sha256sum {{ .PACKAGE_NAME }} >> {{ .CHECKSUM_FILE }}
49+
zip {{.PACKAGE_NAME}} {{.PLATFORM_DIR}}/{{.PROJECT_NAME}}.exe ../LICENSE.txt -j
50+
sha256sum {{.PACKAGE_NAME}} >> {{.CHECKSUM_FILE}}
5151
5252
vars:
53-
PLATFORM_DIR: "{{ .PROJECT_NAME }}_windows_386"
54-
BUILD_COMMAND: "go build -o {{ .DIST_DIR }}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }}.exe {{ .LDFLAGS }}"
53+
PLATFORM_DIR: "{{.PROJECT_NAME}}_windows_386"
54+
BUILD_COMMAND: "go build -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}}.exe {{.LDFLAGS}}"
5555
BUILD_PLATFORM: "windows/386"
56-
CONTAINER_TAG: "{{ .GO_VERSION }}-main"
56+
CONTAINER_TAG: "{{.GO_VERSION}}-main"
5757
PACKAGE_PLATFORM: "Windows_32bit"
58-
PACKAGE_NAME: "{{ .PROJECT_NAME }}_{{ .VERSION }}_{{ .PACKAGE_PLATFORM }}.zip"
58+
PACKAGE_NAME: "{{.PROJECT_NAME}}_{{.VERSION}}_{{.PACKAGE_PLATFORM}}.zip"
5959

6060
Windows_64bit:
6161
desc: Builds Windows 64 bit binaries
62-
dir: "{{ .DIST_DIR }}"
62+
dir: "{{.DIST_DIR}}"
6363
cmds:
6464
- |
6565
docker run -v `pwd`/..:/home/build -w /home/build \
6666
-e CGO_ENABLED=1 \
67-
{{ .CONTAINER }}:{{ .CONTAINER_TAG }} \
68-
--build-cmd "{{ .BUILD_COMMAND }}" \
69-
-p "{{ .BUILD_PLATFORM }}"
67+
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
68+
--build-cmd "{{.BUILD_COMMAND}}" \
69+
-p "{{.BUILD_PLATFORM}}"
7070
71-
zip {{ .PACKAGE_NAME}} {{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }}.exe ../LICENSE.txt -j
72-
sha256sum {{ .PACKAGE_NAME }} >> {{ .CHECKSUM_FILE }}
71+
zip {{.PACKAGE_NAME}} {{.PLATFORM_DIR}}/{{.PROJECT_NAME}}.exe ../LICENSE.txt -j
72+
sha256sum {{.PACKAGE_NAME}} >> {{.CHECKSUM_FILE}}
7373
7474
vars:
75-
PLATFORM_DIR: "{{ .PROJECT_NAME }}_windows_amd64"
76-
BUILD_COMMAND: "go build -o {{ .DIST_DIR }}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }}.exe {{ .LDFLAGS }}"
75+
PLATFORM_DIR: "{{.PROJECT_NAME}}_windows_amd64"
76+
BUILD_COMMAND: "go build -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}}.exe {{.LDFLAGS}}"
7777
BUILD_PLATFORM: "windows/amd64"
78-
CONTAINER_TAG: "{{ .GO_VERSION }}-main"
78+
CONTAINER_TAG: "{{.GO_VERSION}}-main"
7979
PACKAGE_PLATFORM: "Windows_64bit"
80-
PACKAGE_NAME: "{{ .PROJECT_NAME }}_{{ .VERSION }}_{{ .PACKAGE_PLATFORM }}.zip"
80+
PACKAGE_NAME: "{{.PROJECT_NAME}}_{{.VERSION}}_{{.PACKAGE_PLATFORM}}.zip"
8181

8282
Linux_32bit:
8383
desc: Builds Linux 32 bit binaries
84-
dir: "{{ .DIST_DIR }}"
84+
dir: "{{.DIST_DIR}}"
8585
cmds:
8686
- |
8787
docker run -v `pwd`/..:/home/build -w /home/build \
8888
-e CGO_ENABLED=1 \
89-
{{ .CONTAINER }}:{{ .CONTAINER_TAG }} \
90-
--build-cmd "{{ .BUILD_COMMAND }}" \
91-
-p "{{ .BUILD_PLATFORM }}"
89+
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
90+
--build-cmd "{{.BUILD_COMMAND}}" \
91+
-p "{{.BUILD_PLATFORM}}"
9292
93-
tar cz -C {{ .PLATFORM_DIR }} {{ .PROJECT_NAME }} -C ../.. LICENSE.txt -f {{ .PACKAGE_NAME }}
94-
sha256sum {{ .PACKAGE_NAME }} >> {{ .CHECKSUM_FILE }}
93+
tar cz -C {{.PLATFORM_DIR}} {{.PROJECT_NAME}} -C ../.. LICENSE.txt -f {{.PACKAGE_NAME}}
94+
sha256sum {{.PACKAGE_NAME}} >> {{.CHECKSUM_FILE}}
9595
9696
vars:
97-
PLATFORM_DIR: "{{ .PROJECT_NAME }}_linux_amd32"
98-
BUILD_COMMAND: "go build -o {{ .DIST_DIR }}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }} {{ .LDFLAGS }}"
97+
PLATFORM_DIR: "{{.PROJECT_NAME}}_linux_amd32"
98+
BUILD_COMMAND: "go build -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}} {{.LDFLAGS}}"
9999
BUILD_PLATFORM: "linux/386"
100-
CONTAINER_TAG: "{{ .GO_VERSION }}-main"
100+
CONTAINER_TAG: "{{.GO_VERSION}}-main"
101101
PACKAGE_PLATFORM: "Linux_32bit"
102-
PACKAGE_NAME: "{{ .PROJECT_NAME }}_{{ .VERSION }}_{{ .PACKAGE_PLATFORM }}.tar.gz"
102+
PACKAGE_NAME: "{{.PROJECT_NAME}}_{{.VERSION}}_{{.PACKAGE_PLATFORM}}.tar.gz"
103103

104104
Linux_64bit:
105105
desc: Builds Linux 64 bit binaries
106-
dir: "{{ .DIST_DIR }}"
106+
dir: "{{.DIST_DIR}}"
107107
cmds:
108108
- |
109109
docker run -v `pwd`/..:/home/build -w /home/build \
110110
-e CGO_ENABLED=1 \
111-
{{ .CONTAINER }}:{{ .CONTAINER_TAG }} \
112-
--build-cmd "{{ .BUILD_COMMAND }}" \
113-
-p "{{ .BUILD_PLATFORM }}"
111+
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
112+
--build-cmd "{{.BUILD_COMMAND}}" \
113+
-p "{{.BUILD_PLATFORM}}"
114114
115-
tar cz -C {{ .PLATFORM_DIR }} {{ .PROJECT_NAME }} -C ../.. LICENSE.txt -f {{ .PACKAGE_NAME }}
116-
sha256sum {{ .PACKAGE_NAME }} >> {{ .CHECKSUM_FILE }}
115+
tar cz -C {{.PLATFORM_DIR}} {{.PROJECT_NAME}} -C ../.. LICENSE.txt -f {{.PACKAGE_NAME}}
116+
sha256sum {{.PACKAGE_NAME}} >> {{.CHECKSUM_FILE}}
117117
118118
vars:
119-
PLATFORM_DIR: "{{ .PROJECT_NAME }}_linux_amd64"
120-
BUILD_COMMAND: "go build -o {{ .DIST_DIR }}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }} {{ .LDFLAGS }}"
119+
PLATFORM_DIR: "{{.PROJECT_NAME}}_linux_amd64"
120+
BUILD_COMMAND: "go build -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}} {{.LDFLAGS}}"
121121
BUILD_PLATFORM: "linux/amd64"
122-
CONTAINER_TAG: "{{ .GO_VERSION }}-main"
122+
CONTAINER_TAG: "{{.GO_VERSION}}-main"
123123
PACKAGE_PLATFORM: "Linux_64bit"
124-
PACKAGE_NAME: "{{ .PROJECT_NAME }}_{{ .VERSION }}_{{ .PACKAGE_PLATFORM }}.tar.gz"
124+
PACKAGE_NAME: "{{.PROJECT_NAME}}_{{.VERSION}}_{{.PACKAGE_PLATFORM}}.tar.gz"
125125

126126
Linux_ARMv7:
127127
desc: Builds Linux ARMv7 binaries
128-
dir: "{{ .DIST_DIR }}"
128+
dir: "{{.DIST_DIR}}"
129129
cmds:
130130
- |
131131
docker run -v `pwd`/..:/home/build -w /home/build \
132132
-e CGO_ENABLED=1 \
133-
{{ .CONTAINER }}:{{ .CONTAINER_TAG }} \
134-
--build-cmd "{{ .BUILD_COMMAND }}" \
135-
-p "{{ .BUILD_PLATFORM }}"
133+
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
134+
--build-cmd "{{.BUILD_COMMAND}}" \
135+
-p "{{.BUILD_PLATFORM}}"
136136
137-
tar cz -C {{ .PLATFORM_DIR }} {{ .PROJECT_NAME }} -C ../.. LICENSE.txt -f {{ .PACKAGE_NAME }}
138-
sha256sum {{ .PACKAGE_NAME }} >> {{ .CHECKSUM_FILE }}
137+
tar cz -C {{.PLATFORM_DIR}} {{.PROJECT_NAME}} -C ../.. LICENSE.txt -f {{.PACKAGE_NAME}}
138+
sha256sum {{.PACKAGE_NAME}} >> {{.CHECKSUM_FILE}}
139139
140140
vars:
141-
PLATFORM_DIR: "{{ .PROJECT_NAME }}_linux_arm_7"
142-
BUILD_COMMAND: "go build -o {{ .DIST_DIR }}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }} {{ .LDFLAGS }}"
141+
PLATFORM_DIR: "{{.PROJECT_NAME}}_linux_arm_7"
142+
BUILD_COMMAND: "go build -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}} {{.LDFLAGS}}"
143143
BUILD_PLATFORM: "linux/armv7"
144-
CONTAINER_TAG: "{{ .GO_VERSION }}-arm"
144+
CONTAINER_TAG: "{{.GO_VERSION}}-arm"
145145
PACKAGE_PLATFORM: "Linux_ARMv7"
146-
PACKAGE_NAME: "{{ .PROJECT_NAME }}_{{ .VERSION }}_{{ .PACKAGE_PLATFORM }}.tar.gz"
146+
PACKAGE_NAME: "{{.PROJECT_NAME}}_{{.VERSION}}_{{.PACKAGE_PLATFORM}}.tar.gz"
147147

148148
Linux_ARMv6:
149149
desc: Builds Linux ARMv6 binaries
150-
dir: "{{ .DIST_DIR }}"
150+
dir: "{{.DIST_DIR}}"
151151
cmds:
152152
- |
153153
docker run -v `pwd`/..:/home/build -w /home/build \
154154
-e CGO_ENABLED=1 \
155-
{{ .CONTAINER }}:{{ .CONTAINER_TAG }} \
156-
--build-cmd "{{ .BUILD_COMMAND }}" \
157-
-p "{{ .BUILD_PLATFORM }}"
155+
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
156+
--build-cmd "{{.BUILD_COMMAND}}" \
157+
-p "{{.BUILD_PLATFORM}}"
158158
159-
tar cz -C {{ .PLATFORM_DIR }} {{ .PROJECT_NAME }} -C ../.. LICENSE.txt -f {{ .PACKAGE_NAME }}
160-
sha256sum {{ .PACKAGE_NAME }} >> {{ .CHECKSUM_FILE }}
159+
tar cz -C {{.PLATFORM_DIR}} {{.PROJECT_NAME}} -C ../.. LICENSE.txt -f {{.PACKAGE_NAME}}
160+
sha256sum {{.PACKAGE_NAME}} >> {{.CHECKSUM_FILE}}
161161
162162
vars:
163-
PLATFORM_DIR: "{{ .PROJECT_NAME }}_linux_arm_6"
164-
BUILD_COMMAND: "go build -o {{ .DIST_DIR }}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }} {{ .LDFLAGS }}"
163+
PLATFORM_DIR: "{{.PROJECT_NAME}}_linux_arm_6"
164+
BUILD_COMMAND: "go build -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}} {{.LDFLAGS}}"
165165
BUILD_PLATFORM: "linux/armv6"
166-
CONTAINER_TAG: "{{ .GO_VERSION }}-arm"
166+
CONTAINER_TAG: "{{.GO_VERSION}}-arm"
167167
PACKAGE_PLATFORM: "Linux_ARMv6"
168-
PACKAGE_NAME: "{{ .PROJECT_NAME }}_{{ .VERSION }}_{{ .PACKAGE_PLATFORM }}.tar.gz"
168+
PACKAGE_NAME: "{{.PROJECT_NAME}}_{{.VERSION}}_{{.PACKAGE_PLATFORM}}.tar.gz"
169169

170170
Linux_ARM64:
171171
desc: Builds Linux ARM64 binaries
172-
dir: "{{ .DIST_DIR }}"
172+
dir: "{{.DIST_DIR}}"
173173
cmds:
174174
- |
175175
docker run -v `pwd`/..:/home/build -w /home/build \
176176
-e CGO_ENABLED=1 \
177-
{{ .CONTAINER }}:{{ .CONTAINER_TAG }} \
178-
--build-cmd "{{ .BUILD_COMMAND }}" \
179-
-p "{{ .BUILD_PLATFORM }}"
177+
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
178+
--build-cmd "{{.BUILD_COMMAND}}" \
179+
-p "{{.BUILD_PLATFORM}}"
180180
181-
tar cz -C {{ .PLATFORM_DIR }} {{ .PROJECT_NAME }} -C ../.. LICENSE.txt -f {{ .PACKAGE_NAME }}
182-
sha256sum {{ .PACKAGE_NAME }} >> {{ .CHECKSUM_FILE }}
181+
tar cz -C {{.PLATFORM_DIR}} {{.PROJECT_NAME}} -C ../.. LICENSE.txt -f {{.PACKAGE_NAME}}
182+
sha256sum {{.PACKAGE_NAME}} >> {{.CHECKSUM_FILE}}
183183
184184
vars:
185-
PLATFORM_DIR: "{{ .PROJECT_NAME }}_linux_arm_6"
186-
BUILD_COMMAND: "go build -o {{ .DIST_DIR }}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }} {{ .LDFLAGS }}"
185+
PLATFORM_DIR: "{{.PROJECT_NAME}}_linux_arm_6"
186+
BUILD_COMMAND: "go build -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}} {{.LDFLAGS}}"
187187
BUILD_PLATFORM: "linux/arm64"
188-
CONTAINER_TAG: "{{ .GO_VERSION }}-arm"
188+
CONTAINER_TAG: "{{.GO_VERSION}}-arm"
189189
PACKAGE_PLATFORM: "Linux_ARM64"
190-
PACKAGE_NAME: "{{ .PROJECT_NAME }}_{{ .VERSION }}_{{ .PACKAGE_PLATFORM }}.tar.gz"
190+
PACKAGE_NAME: "{{.PROJECT_NAME}}_{{.VERSION}}_{{.PACKAGE_PLATFORM}}.tar.gz"
191191

192192
macOS_64bit:
193193
desc: Builds Mac OS X 64 bit binaries
194-
dir: "{{ .DIST_DIR }}"
194+
dir: "{{.DIST_DIR}}"
195195
cmds:
196196
- |
197197
docker run -v `pwd`/..:/home/build -w /home/build \
198198
-e CGO_ENABLED=1 \
199-
{{ .CONTAINER }}:{{ .CONTAINER_TAG }} \
200-
--build-cmd "{{ .BUILD_COMMAND }}" \
201-
-p "{{ .BUILD_PLATFORM }}"
199+
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
200+
--build-cmd "{{.BUILD_COMMAND}}" \
201+
-p "{{.BUILD_PLATFORM}}"
202202
203-
tar cz -C {{ .PLATFORM_DIR }} {{ .PROJECT_NAME }} -C ../.. LICENSE.txt -f {{ .PACKAGE_NAME }}
204-
sha256sum {{ .PACKAGE_NAME }} >> {{ .CHECKSUM_FILE }}
203+
tar cz -C {{.PLATFORM_DIR}} {{.PROJECT_NAME}} -C ../.. LICENSE.txt -f {{.PACKAGE_NAME}}
204+
sha256sum {{.PACKAGE_NAME}} >> {{.CHECKSUM_FILE}}
205205
206206
vars:
207-
PLATFORM_DIR: "{{ .PROJECT_NAME }}_osx_darwin_amd64"
208-
BUILD_COMMAND: "go build -o {{ .DIST_DIR }}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }} {{ .LDFLAGS }}"
207+
PLATFORM_DIR: "{{.PROJECT_NAME}}_osx_darwin_amd64"
208+
BUILD_COMMAND: "go build -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}} {{.LDFLAGS}}"
209209
BUILD_PLATFORM: "darwin/amd64"
210-
CONTAINER_TAG: "{{ .GO_VERSION }}-darwin"
210+
CONTAINER_TAG: "{{.GO_VERSION}}-darwin"
211211
PACKAGE_PLATFORM: "macOS_64bit"
212-
PACKAGE_NAME: "{{ .PROJECT_NAME }}_{{ .VERSION }}_{{ .PACKAGE_PLATFORM }}.tar.gz"
212+
PACKAGE_NAME: "{{.PROJECT_NAME}}_{{.VERSION}}_{{.PACKAGE_PLATFORM}}.tar.gz"

‎Taskfile.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ vars:
1919
sh: echo "{{now | date "20060102"}}"
2020
TAG:
2121
sh: echo "$(git tag --points-at=HEAD 2> /dev/null | head -n1)"
22-
VERSION: "{{ if .NIGHTLY }}nightly-{{ .TIMESTAMP_SHORT }}{{ else if .TAG }}{{ .TAG }}{{ else }}snapshot{{ end }}"
23-
CONFIGURATION_PACKAGE: "github.com/arduino/{{ .PROJECT_NAME }}/internal/configuration"
22+
VERSION: "{{if .NIGHTLY}}nightly-{{.TIMESTAMP_SHORT}}{{else if .TAG}}{{.TAG}}{{else}}snapshot{{end}}"
23+
CONFIGURATION_PACKAGE: "github.com/arduino/{{.PROJECT_NAME}}/internal/configuration"
2424
LDFLAGS: >-
2525
-ldflags
2626
'
27-
-X {{ .CONFIGURATION_PACKAGE }}.version={{.VERSION}}
28-
-X {{ .CONFIGURATION_PACKAGE }}.commit={{.COMMIT}}
29-
-X {{ .CONFIGURATION_PACKAGE }}.buildTimestamp={{.TIMESTAMP}}
27+
-X {{.CONFIGURATION_PACKAGE}}.version={{.VERSION}}
28+
-X {{.CONFIGURATION_PACKAGE}}.commit={{.COMMIT}}
29+
-X {{.CONFIGURATION_PACKAGE}}.buildTimestamp={{.TIMESTAMP}}
3030
'
3131
GOFLAGS: "-timeout 10m -v -coverpkg=./... -covermode=atomic"
3232
DOCS_VERSION: dev
@@ -63,7 +63,7 @@ tasks:
6363
go:test-unit:
6464
desc: Run unit tests
6565
cmds:
66-
- go test -short -run '{{ default ".*" .TEST_REGEX }}' {{ default "-v" .GOFLAGS }} -coverprofile=coverage_unit.txt {{ default .DEFAULT_GO_PACKAGES .GO_PACKAGES }}
66+
- go test -short -run '{{default ".*" .TEST_REGEX}}' {{default "-v" .GOFLAGS}} -coverprofile=coverage_unit.txt {{default .DEFAULT_GO_PACKAGES .GO_PACKAGES}}
6767

6868
test-integration:
6969
desc: Run integration tests
@@ -396,10 +396,10 @@ tasks:
396396
desc: Check for commonly misspelled words
397397
cmds:
398398
- poetry install --no-root
399-
- poetry run codespell {{ .CODESPELL_SKIP_OPTION }} {{ .CODESPELL_IGNORE_WORDS_OPTION }}
399+
- poetry run codespell {{.CODESPELL_SKIP_OPTION}} {{.CODESPELL_IGNORE_WORDS_OPTION}}
400400

401401
correct-spelling:
402402
desc: Correct commonly misspelled words where possible
403403
cmds:
404404
- poetry install --no-root
405-
- poetry run codespell --write-changes {{ .CODESPELL_SKIP_OPTION }} {{ .CODESPELL_IGNORE_WORDS_OPTION }}
405+
- poetry run codespell --write-changes {{.CODESPELL_SKIP_OPTION}} {{.CODESPELL_IGNORE_WORDS_OPTION}}

0 commit comments

Comments
 (0)