Skip to content

Commit 2afd35d

Browse files
umbynosumbynos
authored
Merge branch 'devel' into umbynos/installers
2 parents de9cf7f + 75865e6 commit 2afd35d

File tree

6 files changed

+101
-8
lines changed

6 files changed

+101
-8
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
---
2+
name: 🐛 Bug report
3+
about: Create a report to help us improve
4+
---
5+
6+
## Bug Report
7+
8+
### Describe the bug
9+
<!-- A clear and concise description of what the bug is.-->
10+
11+
### To Reproduce
12+
<!--Steps to reproduce the behavior:-->
13+
14+
### Expected behavior
15+
<!--A clear and concise description of what you expected to happen.-->
16+
17+
## Environment (please complete the following information):
18+
- OS [e.g. Windows]:
19+
- OS version
20+
- Browser [e.g. chrome, safari]:
21+
- Browser Version:
22+
- Agent Version [e.g. 1.0.0]:
23+
24+
## Additional context
25+
<!--Add any other context about the problem here.-->

‎.github/pull_request_template.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
**Please check if the PR fulfills these requirements**
2+
3+
- [ ] The PR has no duplicates (please search among the [Pull Requests](https://github.com/arduino/arduino-create-agent/pulls)
4+
before creating one)
5+
- [ ] Tests for the changes have been added (for bug fixes / features)
6+
7+
* **What kind of change does this PR introduce?**
8+
<!-- Bug fix, feature, ... -->
9+
10+
- **What is the current behavior?**
11+
<!-- You can also link to an open issue here -->
12+
13+
* **What is the new behavior?**
14+
<!-- if this is a feature change -->
15+
16+
- **Does this PR introduce a breaking change?**
17+
<!-- What changes might users need to make in their workflow or application due to this PR? -->
18+
19+
* **Other information**:
20+
<!-- Any additional information that could help the review process -->

‎.github/workflows/test.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,22 @@ jobs:
4747

4848
- name: Build the Agent
4949
run: task build
50+
if: matrix.operating-system != 'windows-latest'
51+
52+
- name: Build the Agent for win
53+
run: task build-win
54+
if: matrix.operating-system == 'windows-latest'
5055

5156
- name: Run unit tests
5257
run: task test-unit
5358

59+
- name: Upload artifacts
60+
uses: actions/upload-artifact@v2
61+
with:
62+
name: arduino-create-agent-${{ matrix.operating-system }}
63+
path: arduino-create-agent*
64+
if-no-files-found: error
65+
5466
# - name: Send unit tests coverage to Codecov
5567
# if: >
5668
# matrix.operating-system == 'ubuntu-latest' &&

‎Taskfile.yml

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@ tasks:
77
cmds:
88
- go build -v -i {{.LDFLAGS}}
99

10+
build-win:
11+
desc: Build the project for win
12+
cmds:
13+
- go get github.com/akavel/rsrc
14+
- rsrc -arch=386 -manifest=manifest.xml
15+
- go build -v -i {{.WIN_LDFLAGS}}
16+
- rm rsrc.syso
17+
1018
test:
1119
desc: Run the full testsuite, `legacy` will be skipped
1220
cmds:
@@ -39,17 +47,25 @@ vars:
3947
DEFAULT_TARGETS:
4048
sh: echo `go list ./... | grep -v 'arduino-create-agent/gen/' | tr '\n' ' '`
4149
# build vars
50+
WIN_FLAGS: -H=windowsgui
4251
COMMIT:
4352
sh: echo ${TRAVIS_COMMIT:-`git log -n 1 --format=%h`}
53+
TAG:
54+
sh: echo `git describe --tags --abbrev=0`
4455
LDFLAGS: >
45-
-ldflags '-X github.com/arduino/arduino-create-agent/version.commit={{.COMMIT}}'
56+
-ldflags '-X main.version={{.TAG}}
57+
-X main.git_revision={{.COMMIT}}'
58+
WIN_LDFLAGS: >
59+
-ldflags '-X main.version={{.TAG}}
60+
-X main.git_revision={{.COMMIT}}
61+
{{.WIN_FLAGS}}'
4662
# test vars
4763
GOFLAGS: "-timeout 10m -v -coverpkg=./... -covermode=atomic"
48-
TEST_VERSIONSTRING: "0.0.0-test.preview"
64+
TEST_VERSIONSTRING: "0.0.0-alpha"
4965
TEST_COMMIT: "deadbeef"
5066
TEST_LDFLAGS: >
51-
-ldflags '-X github.com/arduino/arduino-create-agent/version.versionString={{.TEST_VERSIONSTRING}}
52-
-X github.com/arduino/arduino-create-agent/version.commit={{.TEST_COMMIT}}'
67+
-ldflags '-X main.version={{.TEST_VERSIONSTRING}}
68+
-X main.git_revision={{.TEST_COMMIT}}'
5369
# check-lint vars
5470
GOLINTBIN:
5571
sh: go list -f {{"{{"}}".Target{{"}}"}}" golang.org/x/lint/golint
@@ -58,4 +74,4 @@ vars:
5874
# DOCS_VERSION: dev
5975
# DOCS_ALIAS: ""
6076
# DOCS_REMOTE: "origin"
61-
PRETTIER: [email protected]
77+
PRETTIER: [email protected]

‎go.mod

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ module github.com/arduino/arduino-create-agent
33
go 1.14
44

55
require (
6+
github.com/akavel/rsrc v0.9.0 // indirect
67
github.com/blang/semver v3.5.1+incompatible
78
github.com/codeclysm/extract v2.0.0+incompatible
89
github.com/creack/goselect v0.0.0-20180501195510-58854f77ee8d
@@ -56,10 +57,11 @@ require (
5657
go.bug.st/downloader v0.0.0-20181116113543-9b8976a44d87
5758
go.bug.st/serial.v1 v0.0.0-20180827123349-5f7892a7bb45
5859
goa.design/goa v1.0.1-0.20190116060309-40843d63b0e4
59-
golang.org/x/crypto v0.0.0-20181112202954-3d3f9f413869
60-
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a
60+
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550
61+
golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect
62+
golang.org/x/net v0.0.0-20190620200207-3b0461eec859
6163
golang.org/x/sys v0.0.0-20200107162124-548cf772de50
62-
golang.org/x/tools v0.0.0-20190116231616-b258f6da2383
64+
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7
6365
gopkg.in/Knetic/govaluate.v3 v3.0.0
6466
gopkg.in/go-playground/validator.v8 v8.18.1
6567
gopkg.in/h2non/filetype.v1 v1.0.5

‎go.sum

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
github.com/akavel/rsrc v0.9.0 h1:HwUDC0+tMFWqN4D5G+o5siGD4oVsC3jn6zM8ocjc3nY=
2+
github.com/akavel/rsrc v0.9.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c=
13
github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
24
github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
35
github.com/codeclysm/extract v2.0.0+incompatible h1:+b4WsD7YuZ5u3iW5T5TWbO764zUyEpQZSH5tZbjAxXQ=
@@ -113,14 +115,30 @@ goa.design/goa v1.0.1-0.20190116060309-40843d63b0e4/go.mod h1:NnzBwdNktihbNek+pP
113115
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
114116
golang.org/x/crypto v0.0.0-20181112202954-3d3f9f413869 h1:kkXA53yGe04D0adEYJwEVQjeBppL01Exg+fnMjfUraU=
115117
golang.org/x/crypto v0.0.0-20181112202954-3d3f9f413869/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
118+
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
119+
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8=
120+
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
121+
golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k=
122+
golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
123+
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
116124
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a h1:gOpx8G595UYyvj8UK4+OFyY4rx037g3fmfhe5SasG3U=
117125
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
126+
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
127+
golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI=
128+
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
129+
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
118130
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
131+
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
132+
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
119133
golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
120134
golang.org/x/sys v0.0.0-20190919044723-0c1ff786ef13/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
121135
golang.org/x/sys v0.0.0-20200107162124-548cf772de50 h1:YvQ10rzcqWXLlJZ3XCUoO25savxmscf4+SC+ZqiCHhA=
122136
golang.org/x/sys v0.0.0-20200107162124-548cf772de50/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
137+
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
123138
golang.org/x/tools v0.0.0-20190116231616-b258f6da2383/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
139+
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7 h1:EBZoQjiKKPaLbPrbpssUfuHtwM6KV/vb4U85g/cigFY=
140+
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
141+
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
124142
gopkg.in/Knetic/govaluate.v3 v3.0.0/go.mod h1:csKLBORsPbafmSCGTEh3U7Ozmsuq8ZSIlKk1bcqph0E=
125143
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
126144
gopkg.in/go-playground/validator.v8 v8.18.1 h1:F8SLY5Vqesjs1nI1EL4qmF1PQZ1sitsmq0rPYXLyfGU=

0 commit comments

Comments
 (0)