Skip to content

Commit e0a8e66

Browse files
committed
Define version during build
This is required for the correct output from `arduino-lint --version` with release versions of the tool.
1 parent 9817150 commit e0a8e66

File tree

2 files changed

+22
-10
lines changed

2 files changed

+22
-10
lines changed

Diff for: DistTasks.yml

+15-8
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ tasks:
2929
3030
vars:
3131
PLATFORM_DIR: "{{ .PROJECT_NAME }}_windows_386"
32-
BUILD_COMMAND: "go build -o {{ .DIST_DIR }}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }}.exe {{ .LDFLAGS }}"
32+
BUILD_COMMAND: "go build -o {{ .DIST_DIR }}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }}.exe {{ .DIST_LDFLAGS }}"
3333
BUILD_PLATFORM: "windows/386"
3434
CONTAINER_TAG: "{{ .GO_VERSION }}-main"
3535
PACKAGE_PLATFORM: "Windows_32bit"
@@ -51,7 +51,7 @@ tasks:
5151
5252
vars:
5353
PLATFORM_DIR: "{{ .PROJECT_NAME }}_windows_amd64"
54-
BUILD_COMMAND: "go build -o {{ .DIST_DIR }}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }}.exe {{ .LDFLAGS }}"
54+
BUILD_COMMAND: "go build -o {{ .DIST_DIR }}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }}.exe {{ .DIST_LDFLAGS }}"
5555
BUILD_PLATFORM: "windows/amd64"
5656
CONTAINER_TAG: "{{ .GO_VERSION }}-main"
5757
PACKAGE_PLATFORM: "Windows_64bit"
@@ -73,7 +73,7 @@ tasks:
7373
7474
vars:
7575
PLATFORM_DIR: "{{ .PROJECT_NAME }}_linux_amd32"
76-
BUILD_COMMAND: "go build -o {{ .DIST_DIR }}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }} {{ .LDFLAGS }}"
76+
BUILD_COMMAND: "go build -o {{ .DIST_DIR }}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }} {{ .DIST_LDFLAGS }}"
7777
BUILD_PLATFORM: "linux/386"
7878
CONTAINER_TAG: "{{ .GO_VERSION }}-main"
7979
PACKAGE_PLATFORM: "Linux_32bit"
@@ -95,7 +95,7 @@ tasks:
9595
9696
vars:
9797
PLATFORM_DIR: "{{ .PROJECT_NAME }}_linux_amd64"
98-
BUILD_COMMAND: "go build -o {{ .DIST_DIR }}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }} {{ .LDFLAGS }}"
98+
BUILD_COMMAND: "go build -o {{ .DIST_DIR }}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }} {{ .DIST_LDFLAGS }}"
9999
BUILD_PLATFORM: "linux/amd64"
100100
CONTAINER_TAG: "{{ .GO_VERSION }}-main"
101101
PACKAGE_PLATFORM: "Linux_64bit"
@@ -117,7 +117,7 @@ tasks:
117117
118118
vars:
119119
PLATFORM_DIR: "{{ .PROJECT_NAME }}_linux_arm_7"
120-
BUILD_COMMAND: "go build -o {{ .DIST_DIR }}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }} {{ .LDFLAGS }}"
120+
BUILD_COMMAND: "go build -o {{ .DIST_DIR }}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }} {{ .DIST_LDFLAGS }}"
121121
BUILD_PLATFORM: "linux/armv7"
122122
CONTAINER_TAG: "{{ .GO_VERSION }}-arm"
123123
PACKAGE_PLATFORM: "Linux_ARMv7"
@@ -139,7 +139,7 @@ tasks:
139139
140140
vars:
141141
PLATFORM_DIR: "{{ .PROJECT_NAME }}_linux_arm_6"
142-
BUILD_COMMAND: "go build -o {{ .DIST_DIR }}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }} {{ .LDFLAGS }}"
142+
BUILD_COMMAND: "go build -o {{ .DIST_DIR }}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }} {{ .DIST_LDFLAGS }}"
143143
BUILD_PLATFORM: "linux/armv6"
144144
CONTAINER_TAG: "{{ .GO_VERSION }}-arm"
145145
PACKAGE_PLATFORM: "Linux_ARMv6"
@@ -161,7 +161,7 @@ tasks:
161161
162162
vars:
163163
PLATFORM_DIR: "{{ .PROJECT_NAME }}_linux_arm_6"
164-
BUILD_COMMAND: "go build -o {{ .DIST_DIR }}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }} {{ .LDFLAGS }}"
164+
BUILD_COMMAND: "go build -o {{ .DIST_DIR }}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }} {{ .DIST_LDFLAGS }}"
165165
BUILD_PLATFORM: "linux/arm64"
166166
CONTAINER_TAG: "{{ .GO_VERSION }}-arm"
167167
PACKAGE_PLATFORM: "Linux_ARM64"
@@ -183,7 +183,7 @@ tasks:
183183
184184
vars:
185185
PLATFORM_DIR: "{{ .PROJECT_NAME }}_osx_darwin_amd64"
186-
BUILD_COMMAND: "go build -o {{ .DIST_DIR }}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }} {{ .LDFLAGS }}"
186+
BUILD_COMMAND: "go build -o {{ .DIST_DIR }}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }} {{ .DIST_LDFLAGS }}"
187187
BUILD_PLATFORM: "darwin/amd64"
188188
CONTAINER_TAG: "{{ .GO_VERSION }}-darwin"
189189
PACKAGE_PLATFORM: "macOS_64bit"
@@ -194,6 +194,13 @@ vars:
194194
sh: echo "`git describe --tags --abbrev=0`"
195195
TIMESTAMP_SHORT:
196196
sh: echo "{{now | date "20060102"}}"
197+
DIST_LDFLAGS: >-
198+
-ldflags
199+
'
200+
-X {{ .CONFIGURATION_PACKAGE }}.version={{.VERSION}}
201+
-X {{ .CONFIGURATION_PACKAGE }}.commit={{.COMMIT}}
202+
-X {{ .CONFIGURATION_PACKAGE }}.buildTimestamp={{.TIMESTAMP}}
203+
'
197204
CONTAINER: "docker.elastic.co/beats-dev/golang-crossbuild"
198205
GO_VERSION: "1.14.7"
199206
CHECKSUM_FILE: "{{ .VERSION }}-{{ .TIMESTAMP_SHORT }}-checksums.txt"

Diff for: Taskfile.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -278,8 +278,13 @@ vars:
278278
sh: echo "$(git log -n 1 --format=%h)"
279279
TIMESTAMP:
280280
sh: echo "$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
281-
LDFLAGS: >
282-
-ldflags '-X github.com/arduino/arduino-lint/internal/configuration.commit={{.COMMIT}} -X github.com/arduino/arduino-lint/internal/configuration.buildTimestamp={{.TIMESTAMP}}'
281+
CONFIGURATION_PACKAGE: "github.com/arduino/{{ .PROJECT_NAME }}/internal/configuration"
282+
LDFLAGS: >-
283+
-ldflags
284+
'
285+
-X {{ .CONFIGURATION_PACKAGE }}.commit={{.COMMIT}}
286+
-X {{ .CONFIGURATION_PACKAGE }}.buildTimestamp={{.TIMESTAMP}}
287+
'
283288
GOFLAGS: "-timeout 10m -v -coverpkg=./... -covermode=atomic"
284289

285290
GOLINTFLAGS: "-min_confidence 0.8 -set_exit_status"

0 commit comments

Comments
 (0)