Skip to content

Commit ca9e6c3

Browse files
Paolo Calaopolldo
Paolo Calao
authored andcommitted
Add license to releases
* Add license to release archive * Remove todo
1 parent 99c84a8 commit ca9e6c3

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

Diff for: .github/workflows/release-go-task.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ jobs:
104104
# This step performs the following:
105105
# 1. Repackage the signed binary replaced in place by Gon (ignoring the output zip file)
106106
# 2. Recalculate package checksum and replace it in the nnnnnn-checksums.txt file
107-
# TODO: Add again the LICENSE.txt as soon as we have it
108107
# TODO: Remember to REMOVE binaries folder as soon as it is removed from the project ({{.PROVISIONING_BINARIES_FOLDER}})
109108
run: |
110109
# GitHub's upload/download-artifact@v2 actions don't preserve file permissions,
@@ -113,7 +112,7 @@ jobs:
113112
TAG="${GITHUB_REF/refs\/tags\//}"
114113
tar -czvf "${{ env.DIST_DIR }}/${{ env.PROJECT_NAME }}_${TAG}_macOS_64bit.tar.gz" \
115114
-C ${{ env.DIST_DIR }}/${{ env.PROJECT_NAME }}_osx_darwin_amd64/ ${{ env.PROJECT_NAME }} \
116-
-C ../../ ${{ env.PROVISIONING_BINARIES_FOLDER }}
115+
-C ../../ ${{ env.PROVISIONING_BINARIES_FOLDER }} LICENSE.txt
117116
CHECKSUM="$(shasum -a 256 ${{ env.DIST_DIR }}/${{ env.PROJECT_NAME }}_${TAG}_macOS_64bit.tar.gz | cut -d " " -f 1)"
118117
perl \
119118
-pi \

Diff for: DistTasks.yml

+8-9
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ tasks:
3939
Windows_32bit:
4040
desc: Builds Windows 32 bit binaries
4141
dir: "{{.DIST_DIR}}"
42-
# TODO: Add LICENSE.txt to the archive when we have it
4342
# TODO: Remember to REMOVE binaries folder as soon as it is removed from the project
4443
cmds:
4544
- |
@@ -51,7 +50,7 @@ tasks:
5150
5251
cp {{.PLATFORM_DIR}}/{{.PROJECT_NAME}}.exe ../
5352
cd ..
54-
zip -r {{.DIST_DIR}}/{{.PACKAGE_NAME}} {{.PROJECT_NAME}}.exe {{.PROVISIONING_BINARIES_FOLDER}}
53+
zip -r {{.DIST_DIR}}/{{.PACKAGE_NAME}} {{.PROJECT_NAME}}.exe {{.PROVISIONING_BINARIES_FOLDER}} LICENSE.txt
5554
cd {{.DIST_DIR}}
5655
sha256sum {{.PACKAGE_NAME}} >> {{.CHECKSUM_FILE}}
5756
@@ -76,7 +75,7 @@ tasks:
7675
7776
cp {{.PLATFORM_DIR}}/{{.PROJECT_NAME}}.exe ../
7877
cd ..
79-
zip -r {{.DIST_DIR}}/{{.PACKAGE_NAME}} {{.PROJECT_NAME}}.exe {{.PROVISIONING_BINARIES_FOLDER}}
78+
zip -r {{.DIST_DIR}}/{{.PACKAGE_NAME}} {{.PROJECT_NAME}}.exe {{.PROVISIONING_BINARIES_FOLDER}} LICENSE.txt
8079
cd {{.DIST_DIR}}
8180
sha256sum {{.PACKAGE_NAME}} >> {{.CHECKSUM_FILE}}
8281
@@ -99,7 +98,7 @@ tasks:
9998
--build-cmd "{{.BUILD_COMMAND}}" \
10099
-p "{{.BUILD_PLATFORM}}"
101100
102-
tar cz -C {{.PLATFORM_DIR}} {{.PROJECT_NAME}} -C ../.. {{.PROVISIONING_BINARIES_FOLDER}} -f {{.PACKAGE_NAME}}
101+
tar cz -C {{.PLATFORM_DIR}} {{.PROJECT_NAME}} -C ../.. {{.PROVISIONING_BINARIES_FOLDER}} LICENSE.txt -f {{.PACKAGE_NAME}}
103102
sha256sum {{.PACKAGE_NAME}} >> {{.CHECKSUM_FILE}}
104103
105104
vars:
@@ -121,7 +120,7 @@ tasks:
121120
--build-cmd "{{.BUILD_COMMAND}}" \
122121
-p "{{.BUILD_PLATFORM}}"
123122
124-
tar cz -C {{.PLATFORM_DIR}} {{.PROJECT_NAME}} -C ../.. {{.PROVISIONING_BINARIES_FOLDER}} -f {{.PACKAGE_NAME}}
123+
tar cz -C {{.PLATFORM_DIR}} {{.PROJECT_NAME}} -C ../.. {{.PROVISIONING_BINARIES_FOLDER}} LICENSE.txt -f {{.PACKAGE_NAME}}
125124
sha256sum {{.PACKAGE_NAME}} >> {{.CHECKSUM_FILE}}
126125
127126
vars:
@@ -143,7 +142,7 @@ tasks:
143142
--build-cmd "{{.BUILD_COMMAND}}" \
144143
-p "{{.BUILD_PLATFORM}}"
145144
146-
tar cz -C {{.PLATFORM_DIR}} {{.PROJECT_NAME}} -C ../.. {{.PROVISIONING_BINARIES_FOLDER}} -f {{.PACKAGE_NAME}}
145+
tar cz -C {{.PLATFORM_DIR}} {{.PROJECT_NAME}} -C ../.. {{.PROVISIONING_BINARIES_FOLDER}} LICENSE.txt -f {{.PACKAGE_NAME}}
147146
sha256sum {{.PACKAGE_NAME}} >> {{.CHECKSUM_FILE}}
148147
149148
vars:
@@ -165,7 +164,7 @@ tasks:
165164
--build-cmd "{{.BUILD_COMMAND}}" \
166165
-p "{{.BUILD_PLATFORM}}"
167166
168-
tar cz -C {{.PLATFORM_DIR}} {{.PROJECT_NAME}} -C ../.. {{.PROVISIONING_BINARIES_FOLDER}} -f {{.PACKAGE_NAME}}
167+
tar cz -C {{.PLATFORM_DIR}} {{.PROJECT_NAME}} -C ../.. {{.PROVISIONING_BINARIES_FOLDER}} LICENSE.txt -f {{.PACKAGE_NAME}}
169168
sha256sum {{.PACKAGE_NAME}} >> {{.CHECKSUM_FILE}}
170169
171170
vars:
@@ -215,7 +214,7 @@ tasks:
215214
--build-cmd "{{.BUILD_COMMAND}}" \
216215
-p "{{.BUILD_PLATFORM}}"
217216
218-
tar cz -C {{.PLATFORM_DIR}} {{.PROJECT_NAME}} -C ../.. {{.PROVISIONING_BINARIES_FOLDER}} -f {{.PACKAGE_NAME}}
217+
tar cz -C {{.PLATFORM_DIR}} {{.PROJECT_NAME}} -C ../.. {{.PROVISIONING_BINARIES_FOLDER}} LICENSE.txt -f {{.PACKAGE_NAME}}
219218
sha256sum {{.PACKAGE_NAME}} >> {{.CHECKSUM_FILE}}
220219
221220
vars:
@@ -237,7 +236,7 @@ tasks:
237236
--build-cmd "{{.BUILD_COMMAND}}" \
238237
-p "{{.BUILD_PLATFORM}}"
239238
240-
tar cz -C {{.PLATFORM_DIR}} {{.PROJECT_NAME}} -C ../.. {{.PROVISIONING_BINARIES_FOLDER}} -f {{.PACKAGE_NAME}}
239+
tar cz -C {{.PLATFORM_DIR}} {{.PROJECT_NAME}} -C ../.. {{.PROVISIONING_BINARIES_FOLDER}} LICENSE.txt -f {{.PACKAGE_NAME}}
241240
sha256sum {{.PACKAGE_NAME}} >> {{.CHECKSUM_FILE}}
242241
243242
vars:

0 commit comments

Comments
 (0)