Skip to content

Commit 981fd38

Browse files
committed
Merge branch 'devel' into updater
2 parents 781d8ae + f5f5180 commit 981fd38

File tree

646 files changed

+165317
-3
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

646 files changed

+165317
-3
lines changed

.drone.sec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
eyJhbGciOiJSU0EtT0FFUCIsImVuYyI6IkExMjhHQ00ifQ.js55JcNOTOEYUK7TvkYbNUbvZvoKkze6nB0ql2b3ZWkMn6LGRdlfo3e7ktMiRf8e9RAffm86SQSEMorTw78h8iFmub7JI0Z8Xwm1A960SmkW-ULLrzE0uT6il7_pYzjOAxboUiH0ToCElvsTYEUBicc7p4a3gIhgZAezd1w52JIYxzbFQ0ca0fws3KH3H4iR6-N0d7Cc5xEXFIzHgH_OhJUXYiaCW-g5GLgbPQPu29Ofv3-_sZzXTJj4VSjvgRNzkudJieM5KjN_5L9KU6wSJyGECVsTd-kaM0yOesl9NbWq-6SMORIK43kBEgu679OWuMzJ6HbbW6Bk5I8XQASp0w.FvNQmCS3b0mq8MGN.uS9nMU1WjTWxIvkOr41zAGp6OY7MzxWQ2KteBaRm9hE3XDSWvOAwVO7i6BJOQNUX--SMCBs6tdhYyaC-x7PSGze0Ki33LU7pPc-yBhbLUdzGrxYLm1JF_IQ5QlVK2YRk5nFRSIimzylsPEkGHCd-nQciHC_m0Wetzldb-d49MNw6wZFsby8MQKVQJoWUVXM7LM-jZ5tmAmzxV1S0Py6LqUT7AAGL2RNax22YsNaOY214KTiSnIrT8eo3zmvzi28CdsapOIYxCFP8Z_JUAkjYAuow5ysxFkVvEGxr9d-W8TCyL36Sa4GgfEVvtzpcKpVmhzMllIXiXVh8ZdLJ_EuWomNSV_9veIy_ULmKo8B8tB6Uv2nlnFqGAxaf5DNYcqqQj4isHpEWFSR0ZIGU5ksoH_bY0pzQsf3wwii3KlzOJg.7WbHe_TOAdzgMW16sBvzIg

.drone.sec.example

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
environment:
2+
DOCKER_USERNAME: ""
3+
DOCKER_PASSWORD: ""
4+
DOCKER_EMAIL: ""
5+
SLACK_WEBHOOK: ""
6+
SLACK_CHANNEL: ""
7+
GITHUB_API_KEY: ""

.drone.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
build:
2+
image: arduino/golang-linux-32
3+
commands:
4+
- apt-get update && apt-get install libgtk-3-dev libappindicator3-dev
5+
- GOOS=linux GOARCH=386 CC=gcc CXX=gcc CGO_ENABLED=1 go build -o artifacts/linux-386/arduino-create-agent
6+
- cp config.ini artifacts/linux-386
7+
build:
8+
image: arduino/golang-cross
9+
auth_config:
10+
username: $$DOCKER_USERNAME
11+
password: $$DOCKER_PASSWORD
12+
email: $$DOCKER_EMAIL
13+
commands:
14+
- apt-get update && apt-get install libgtk-3-dev libappindicator3-dev zip
15+
# Linux amd64
16+
- GOOS=linux GOARCH=amd64 CC=gcc CXX=gcc CGO_ENABLED=1 go build -o artifacts/linux-amd64/arduino-create-agent
17+
- cp config.ini artifacts/linux-amd64
18+
# Darwin amd64
19+
- GOOS=darwin GOARCH=amd64 CC=o64-clang CXX=o64-clang CGO_ENABLED=1 go build -o artifacts/osx/arduino-create-agent
20+
- cp config.ini artifacts/osx
21+
# Windows 386
22+
- GOOS=windows GOARCH=386 CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-gcc CGO_ENABLED=1 go build -o artifacts/windows/arduino-create-agent.exe -ldflags -H=windowsgui
23+
- cp config.ini artifacts/windows
24+
- zip -r arduino-create-agent.zip artifacts/*
25+
notify:
26+
slack:
27+
webhook_url: $$SLACK_WEBHOOK
28+
channel: $$SLACK_CHANNEL
29+
username: drone
30+
publish:
31+
github_release:
32+
api_key: $$GITHUB_API_KEY
33+
files:
34+
- arduino-create-agent.zip
35+
checksum:
36+
- md5
37+
when:
38+
branch: [master, devel, test]

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ serial-port-json-server
55

66
snapshot/*
77
public/
8+
artifacts*

README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ The history has been rewritten to keep the repo small (thus removing all binarie
1616
Please use the current latest version:
1717

1818
* [Windows dev](http://downloads.arduino.cc/CreateBridge/staging/ArduinoCreateAgent-1.0-windows-installer.exe)
19-
* [MacOSX dev](http://downloads.arduino.cc/CreateBridge/staging/ArduinoCreateAgent-1.0-osx-installer.dmg)
19+
* [MacOSX dev](http://downloads.arduino.cc/CreateBridge/staging/ArduinoCreateAgent-1.0-osx-installer.dmg)
2020
* [Linux x64 dev](http://downloads.arduino.cc/CreateBridge/staging/ArduinoCreateAgent-1.0-linux-x64-installer.run)
2121

2222
## Compiling
@@ -91,3 +91,7 @@ By making a contribution to this project, I certify that:
9191
maintained indefinitely and may be redistributed consistent with
9292
this project or the open source license(s) involved.
9393
```
94+
95+
## Creating a release
96+
Just create a new release on github, and our drone server will build and upload
97+
the compiled binaries for every architecture in a zip file in the release itself.

compile_webidebridge.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,11 @@ compilePlatform()
8181
rm -rf $NAME*
8282
}
8383

84+
rm -rf snapshot/linux_amd64
85+
rm -rf snapshot/linux_arm
86+
rm -rf snapshot/darwin_amd64
87+
rm -rf snapshot/windows_386
88+
8489
extractVersionFromMain
8590
compilePlatform darwin amd64 o64-clang 1
8691
#compilePlatformLinux linux 386 gcc

main.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ var (
4343
port string
4444
portSSL string
4545
origins = flag.String("origins", "", "Allowed origin list for CORS")
46+
address = flag.String("address", "127.0.0.1", "The address where to listen. Defaults to localhost")
4647
)
4748

4849
type NullWriter int
@@ -237,7 +238,7 @@ func main() {
237238
for i < end {
238239
i = i + 1
239240
portSSL = ":" + strconv.Itoa(i)
240-
if err := r.RunTLS(portSSL, filepath.Join(dest, "cert.pem"), filepath.Join(dest, "key.pem")); err != nil {
241+
if err := r.RunTLS(*address+portSSL, filepath.Join(dest, "cert.pem"), filepath.Join(dest, "key.pem")); err != nil {
241242
log.Printf("Error trying to bind to port: %v, so exiting...", err)
242243
continue
243244
} else {
@@ -255,7 +256,7 @@ func main() {
255256
for i < end {
256257
i = i + 1
257258
port = ":" + strconv.Itoa(i)
258-
if err := r.Run(port); err != nil {
259+
if err := r.Run(*address + port); err != nil {
259260
log.Printf("Error trying to bind to port: %v, so exiting...", err)
260261
continue
261262
} else {

vendor/github.com/Sirupsen/logrus/CHANGELOG.md

Lines changed: 41 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Sirupsen/logrus/LICENSE

Lines changed: 21 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)