Skip to content

Commit 96ed175

Browse files
author
Your Name
committed
commit Copyright
1 parent a98675a commit 96ed175

File tree

3 files changed

+27
-28
lines changed

3 files changed

+27
-28
lines changed

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,4 @@ build/
3535
/apps
3636

3737
# debian packaging files
38-
/debian/arduino-app-cli/home/arduino/.local/share/arduino-app-cli/examples
39-
/debian/arduino-app-cli/usr/share/doc/arduino-app-cli/copyright
38+
/debian/arduino-app-cli/home/arduino/.local/share/arduino-app-cli/examples

Taskfile.yml

Lines changed: 11 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ vars:
88
GOLANGCI_LINT_VERSION: v2.4.0
99
GOIMPORTS_VERSION: v0.29.0
1010
DPRINT_VERSION: 0.48.0
11-
EXAMPLE_VERSION: "0.4.8"
12-
RUNNER_VERSION: "0.4.8"
11+
EXAMPLE_VERSION: "0.5.0"
12+
RUNNER_VERSION: "0.5.0"
1313
VERSION: # if version is not passed we hack the semver by encoding the commit as pre-release
1414
sh: echo "${VERSION:-0.0.0-$(git rev-parse --short HEAD)}"
1515

@@ -101,7 +101,6 @@ tasks:
101101
desc: Build debian package
102102
deps:
103103
- build-deb:clone-examples
104-
- build-deb:copyright
105104
cmds:
106105
- docker build --build-arg BINARY_NAME=arduino-app-cli --build-arg DEB_NAME=arduino-app-cli --build-arg VERSION={{ .VERSION }} --build-arg ARCH={{ .ARCH }} --build-arg RELEASE={{ .RELEASE }} --output=./build -f debian/Dockerfile .
107106
vars:
@@ -115,42 +114,28 @@ tasks:
115114
echo "Runner version set as: {{ .EXAMPLE_VERSION }}"
116115
TMP_PATH="$(mktemp -d)"
117116
DEST_PATH="debian/arduino-app-cli/home/arduino/.local/share/arduino-app-cli/"
118-
echo "Cloning bcmi-labs/app-bricks-example into temporary directory ${TMP_PATH}..."
119-
git clone --depth 1 --branch "{{ .EXAMPLE_VERSION }}" https://github.com/bcmi-labs/app-bricks-example "${TMP_PATH}"
117+
echo "Cloning arduino/app-bricks-example into temporary directory ${TMP_PATH}..."
118+
git clone --depth 1 --branch "{{ .EXAMPLE_VERSION }}" https://github.com/arduino/app-bricks-examples "${TMP_PATH}"
120119
rm -rf "${DEST_PATH}/examples"
121120
mkdir -p "${DEST_PATH}"
122121
mv "${TMP_PATH}/examples" "${DEST_PATH}"
123122
rm -rf "${TMP_PATH}/examples"
124123
echo "Examples successfully cloned."
125124
silent: false
126125

127-
build-deb:copyright:
128-
desc: Add dependency licenses to debian copyright file
126+
arduino-app-cli:build:local:
127+
desc: "Build the arduino-app-cli locally"
129128
cmds:
130-
- mkdir -p debian/arduino-app-cli/usr/share/doc/arduino-app-cli
131-
- |
132-
cat > debian/arduino-app-cli/usr/share/doc/arduino-app-cli/copyright <<EOF
133-
Copyright 2025 ARDUINO SA (http://www.arduino.cc/)
134-
129+
- go build -v -o Copyright 2025 ARDUINO SA (http://www.arduino.cc/)
135130
This software is released under the GNU General Public License version 3,
136131
which covers the main part of arduino-app-cli.
137132
The terms of this license can be found at:
138133
https://www.gnu.org/licenses/gpl-3.0.en.html
139-
140134
You can be released from the requirements of the above licenses by purchasing
141135
a commercial license. Buying such a license is mandatory if you want to
142136
modify or otherwise use the software for commercial activities involving the
143137
Arduino software without disclosing the source code of your own applications.
144-
To purchase a commercial license, send an email to license@arduino.cc.
145-
146-
---
147-
148-
EOF
149-
150-
arduino-app-cli:build:local:
151-
desc: "Build the arduino-app-cli locally"
152-
cmds:
153-
- go build -v -o ./build/arduino-app-cli ./cmd/arduino-app-cli
138+
To purchase a commercial license, send an email to license@arduino.cc../build/arduino-app-cli ./cmd/arduino-app-cli
154139

155140
arduino-app-cli:release:
156141
desc: Create a tag on the current commit and push it to the remote to create the release
@@ -214,7 +199,7 @@ tasks:
214199
TMP_PATH="$(mktemp -d)"
215200
216201
echo "Cloning examples into temporary directory ${TMP_PATH}..."
217-
git clone --depth 1 https://github.com/bcmi-labs/app-bricks-example.git "${TMP_PATH}"
202+
git clone --depth 1 https://github.com/arduino/app-bricks-example.git "${TMP_PATH}"
218203
219204
echo "Installing examples to ${DEST_PATH}examples"
220205
rm -rf "${DEST_PATH}examples"
@@ -229,7 +214,7 @@ tasks:
229214
desc: This generates the models and bricks index. Also updates the corresponding testdata.
230215
vars:
231216
sed_replacement: s#runnerVersion = \".*#runnerVersion = \"{{.RUNNER_VERSION}}\"#
232-
TMPDIR: '{{trimSuffix "/" .TMPDIR| default "/tmp"}}/generate-assets'
217+
TMPDIR: '{{trimSuffix "/" (env "TMPDIR")| default "/tmp"}}/generate-assets'
233218
SEMVER_TAG: "{{.RUNNER_VERSION}}"
234219
OUTPUT_DIR: "{{.TMPDIR}}/{{.SEMVER_TAG}}"
235220
ASSETS_DIR: debian/arduino-app-cli/home/arduino/.local/share/arduino-app-cli/assets
@@ -240,7 +225,7 @@ tasks:
240225
cmds:
241226
- |
242227
# Get the corresponding models and bricks release, and unzip it.
243-
gh release download -R bcmi-labs/app-bricks-py "release/{{.SEMVER_TAG}}" -p '*.whl' -D "{{.TMPDIR}}" --clobber
228+
gh release download -R arduino/app-bricks-py "release/{{.SEMVER_TAG}}" -p '*.whl' -D "{{.TMPDIR}}" --clobber
244229
unzip -o "{{.TMPDIR}}/arduino_app_bricks-{{.SEMVER_TAG}}-py3-none-any.whl" -d "{{.OUTPUT_DIR}}"
245230
- |
246231
# Copy the assets to the assets dir and testdata dir, replacing the previous version.
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
Copyright 2025 ARDUINO SA (http://www.arduino.cc/)
2+
3+
This software is released under the GNU General Public License version 3,
4+
which covers the main part of arduino-app-cli.
5+
The terms of this license can be found at:
6+
https://www.gnu.org/licenses/gpl-3.0.en.html
7+
8+
You can be released from the requirements of the above licenses by purchasing
9+
a commercial license. Buying such a license is mandatory if you want to
10+
modify or otherwise use the software for commercial activities involving the
11+
Arduino software without disclosing the source code of your own applications.
12+
To purchase a commercial license, send an email to license@arduino.cc.
13+
14+
---
15+

0 commit comments

Comments
 (0)