Skip to content

Commit 8b2503d

Browse files
author
Your Name
committed
commit Copyright
1 parent a98675a commit 8b2503d

File tree

3 files changed

+23
-33
lines changed

3 files changed

+23
-33
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: 7 additions & 31 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,38 +114,15 @@ 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
129-
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-
135-
This software is released under the GNU General Public License version 3,
136-
which covers the main part of arduino-app-cli.
137-
The terms of this license can be found at:
138-
https://www.gnu.org/licenses/gpl-3.0.en.html
139-
140-
You can be released from the requirements of the above licenses by purchasing
141-
a commercial license. Buying such a license is mandatory if you want to
142-
modify or otherwise use the software for commercial activities involving the
143-
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-
150126
arduino-app-cli:build:local:
151127
desc: "Build the arduino-app-cli locally"
152128
cmds:
@@ -214,7 +190,7 @@ tasks:
214190
TMP_PATH="$(mktemp -d)"
215191
216192
echo "Cloning examples into temporary directory ${TMP_PATH}..."
217-
git clone --depth 1 https://github.com/bcmi-labs/app-bricks-example.git "${TMP_PATH}"
193+
git clone --depth 1 https://github.com/arduino/app-bricks-example.git "${TMP_PATH}"
218194
219195
echo "Installing examples to ${DEST_PATH}examples"
220196
rm -rf "${DEST_PATH}examples"
@@ -229,7 +205,7 @@ tasks:
229205
desc: This generates the models and bricks index. Also updates the corresponding testdata.
230206
vars:
231207
sed_replacement: s#runnerVersion = \".*#runnerVersion = \"{{.RUNNER_VERSION}}\"#
232-
TMPDIR: '{{trimSuffix "/" .TMPDIR| default "/tmp"}}/generate-assets'
208+
TMPDIR: '{{trimSuffix "/" (env "TMPDIR")| default "/tmp"}}/generate-assets'
233209
SEMVER_TAG: "{{.RUNNER_VERSION}}"
234210
OUTPUT_DIR: "{{.TMPDIR}}/{{.SEMVER_TAG}}"
235211
ASSETS_DIR: debian/arduino-app-cli/home/arduino/.local/share/arduino-app-cli/assets
@@ -240,7 +216,7 @@ tasks:
240216
cmds:
241217
- |
242218
# 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
219+
gh release download -R arduino/app-bricks-py "release/{{.SEMVER_TAG}}" -p '*.whl' -D "{{.TMPDIR}}" --clobber
244220
unzip -o "{{.TMPDIR}}/arduino_app_bricks-{{.SEMVER_TAG}}-py3-none-any.whl" -d "{{.OUTPUT_DIR}}"
245221
- |
246222
# 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)