diff --git a/.github/workflows/check-go-dependencies-task.yml b/.github/workflows/check-go-dependencies-task.yml index 2c792b607..2a78cbba5 100644 --- a/.github/workflows/check-go-dependencies-task.yml +++ b/.github/workflows/check-go-dependencies-task.yml @@ -3,7 +3,7 @@ name: Check Go Dependencies env: # See: https://github.com/actions/setup-go/tree/v3#readme - GO_VERSION: "1.14" + GO_VERSION: "1.19" # See: https://docs.github.com/actions/using-workflows/events-that-trigger-workflows on: diff --git a/.github/workflows/publish-go-tester-task.yml b/.github/workflows/publish-go-tester-task.yml index 8b3ef4a69..8732887e4 100644 --- a/.github/workflows/publish-go-tester-task.yml +++ b/.github/workflows/publish-go-tester-task.yml @@ -30,7 +30,7 @@ on: repository_dispatch: env: - GO_VERSION: "1.14" + GO_VERSION: "1.19" jobs: run-determination: @@ -116,14 +116,13 @@ jobs: # the manifest is required by windows GUI apps, otherwise the binary will crash with: "Unable to create main window: TTM_ADDTOOL failed" (for reference https://github.com/lxn/walk/issues/28) # rsrc will produce a *.syso file that should get automatically recognized by go build command and linked into an executable. - name: Download tool to embed manifest in win binary - run: go get github.com/akavel/rsrc + run: go install github.com/akavel/rsrc@latest if: runner.os == 'Windows' # building the agent for win requires a different task because of an extra flag - name: Build the Agent for win32 env: GOARCH: 386 # 32bit architecture (for support) - GO386: 387 # support old instruction sets without MMX (used in the Pentium 4) (will be deprecated in GO > 1.15 https://golang.org/doc/go1.15) run: task go:build-win if: runner.os == 'Windows' && matrix.arch == '-386' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 45ec5151f..59d086a03 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,6 +20,8 @@ env: INSTALLER_CERT_MAC_PATH: "/tmp/ArduinoCerts2020.p12" AC_USERNAME: ${{ secrets.AC_USERNAME }} # used by gon AC_PASSWORD: ${{ secrets.AC_PASSWORD }} # used by gon + # See: https://github.com/actions/setup-go/tree/v3#readme + GO_VERSION: "1.19" jobs: # The build job is responsible for: configuring the environment, testing and compiling process @@ -64,7 +66,7 @@ jobs: - name: Install Go uses: actions/setup-go@v3 with: - go-version: "1.14" + go-version: ${{ env.GO_VERSION }} # dependencies used for compiling the GUI - name: Install Dependencies (Linux) @@ -72,13 +74,7 @@ jobs: if: matrix.os == 'ubuntu-20.04' - name: Install Go deps - # Since 10/23/2019 pwsh is the default shell - # on Windows, but pwsh fails to install protoc-gen-go so - # we force bash as default shell for all OSes in this task - run: | - go get github.com/golangci/govet - go get golang.org/x/lint/golint - go get -u github.com/sanbornm/go-selfupdate/... + run: go install github.com/sanbornm/go-selfupdate/...@latest - name: Install Taskfile uses: arduino/setup-task@v1 @@ -98,14 +94,13 @@ jobs: # the manifest is required by windows GUI apps, otherwise the binary will crash with: "Unable to create main window: TTM_ADDTOOL failed" (for reference https://github.com/lxn/walk/issues/28) # rsrc will produce a *.syso file that should get automatically recognized by go build command and linked into an executable. - name: Download tool to embed manifest in win binary - run: go get github.com/akavel/rsrc + run: go install github.com/akavel/rsrc@latest if: matrix.os == 'windows-2019' # building the agent for win requires a different task because of an extra flag - name: Build the Agent for win32 env: GOARCH: 386 # 32bit architecture (for support) - GO386: 387 # support old instruction sets without MMX (used in the Pentium 4) (will be deprecated in GO > 1.15 https://golang.org/doc/go1.15) run: task go:build-win if: matrix.os == 'windows-2019' && matrix.arch == '-386' diff --git a/.github/workflows/test-go-integration-task.yml b/.github/workflows/test-go-integration-task.yml index 36f2b2622..7e357d588 100644 --- a/.github/workflows/test-go-integration-task.yml +++ b/.github/workflows/test-go-integration-task.yml @@ -3,7 +3,7 @@ name: Test Integration env: # See: https://github.com/actions/setup-go/tree/v2#readme - GO_VERSION: "1.14" + GO_VERSION: "1.19" # See: https://github.com/actions/setup-python/tree/v2#available-versions-of-python PYTHON_VERSION: "3.9" diff --git a/.github/workflows/test-go-task.yml b/.github/workflows/test-go-task.yml index fe20d9af5..a2fbb29c4 100644 --- a/.github/workflows/test-go-task.yml +++ b/.github/workflows/test-go-task.yml @@ -3,7 +3,7 @@ name: Test Go env: # See: https://github.com/actions/setup-go/tree/v2#readme - GO_VERSION: "1.14" + GO_VERSION: "1.19" # See: https://docs.github.com/en/free-pro-team@latest/actions/reference/events-that-trigger-workflows on: diff --git a/.licenses/arduino-create-agent/go/github.com/ugorji/go/codec.dep.yml b/.licenses/arduino-create-agent/go/github.com/ugorji/go/codec.dep.yml index 4ee4e68aa..eb52f1cb0 100644 --- a/.licenses/arduino-create-agent/go/github.com/ugorji/go/codec.dep.yml +++ b/.licenses/arduino-create-agent/go/github.com/ugorji/go/codec.dep.yml @@ -1,17 +1,17 @@ --- name: github.com/ugorji/go/codec -version: v1.2.7 +version: v1.1.6 type: go summary: Package codec provides a High Performance, Feature-Rich Idiomatic Go 1.4+ codec/encoding library for binc, msgpack, cbor, json. homepage: https://pkg.go.dev/github.com/ugorji/go/codec license: mit licenses: -- sources: LICENSE +- sources: go@v1.1.6/LICENSE text: | The MIT License (MIT) - Copyright (c) 2012-2020 Ugorji Nwoke. + Copyright (c) 2012-2015 Ugorji Nwoke. All rights reserved. Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/.licenses/arduino-create-agent/go/golang.org/x/crypto/curve25519/internal/field.dep.yml b/.licenses/arduino-create-agent/go/golang.org/x/crypto/poly1305.dep.yml similarity index 93% rename from .licenses/arduino-create-agent/go/golang.org/x/crypto/curve25519/internal/field.dep.yml rename to .licenses/arduino-create-agent/go/golang.org/x/crypto/poly1305.dep.yml index 195f634b2..845af3986 100644 --- a/.licenses/arduino-create-agent/go/golang.org/x/crypto/curve25519/internal/field.dep.yml +++ b/.licenses/arduino-create-agent/go/golang.org/x/crypto/poly1305.dep.yml @@ -1,9 +1,10 @@ --- -name: golang.org/x/crypto/curve25519/internal/field +name: golang.org/x/crypto/poly1305 version: v0.0.0-20210711020723-a769d52b0f97 type: go -summary: Package field implements fast arithmetic modulo 2^255-19. -homepage: https://pkg.go.dev/golang.org/x/crypto/curve25519/internal/field +summary: Package poly1305 implements Poly1305 one-time message authentication code + as specified in https://cr.yp.to/mac/poly1305-20050329.pdf. +homepage: https://pkg.go.dev/golang.org/x/crypto/poly1305 license: bsd-3-clause licenses: - sources: crypto@v0.0.0-20210711020723-a769d52b0f97/LICENSE diff --git a/go.mod b/go.mod index b5f732c70..f71006df3 100644 --- a/go.mod +++ b/go.mod @@ -1,45 +1,77 @@ module github.com/arduino/arduino-create-agent -go 1.14 +go 1.19 require ( github.com/andela/gin-cors v0.0.0-20160928171741-e8c3436a37e2 github.com/arduino/arduino-cli v0.0.0-20210422154105-5aa424818026 github.com/blang/semver v3.5.1+incompatible github.com/codeclysm/extract/v3 v3.0.2 - github.com/davidmz/go-pageant v1.0.1 // indirect - github.com/dimfeld/httppath v0.0.0-20170720192232-ee938bf73598 // indirect - github.com/dimfeld/httptreemux v5.0.1+incompatible // indirect github.com/getlantern/systray v1.1.0 github.com/gin-gonic/gin v1.8.1 github.com/go-ini/ini v1.62.0 - github.com/google/gxui v0.0.0-20151028112939-f85e0a97b3a4 // indirect - github.com/googollee/go-engine.io v0.0.0-20180829091931-e2f255711dcb // indirect github.com/googollee/go-socket.io v0.0.0-20181101151912-c8aeb1ed9b49 - github.com/h2non/filetype v1.1.0 // indirect - github.com/juju/errors v0.0.0-20200330140219-3fe23663418f // indirect github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 github.com/kr/binarydist v0.1.0 - github.com/manveru/faker v0.0.0-20171103152722-9fbc68a78c4d // indirect - github.com/manveru/gobdd v0.0.0-20131210092515-f1a17fdd710b // indirect github.com/mattn/go-shellwords v1.0.12 - github.com/miekg/dns v1.1.35 // indirect github.com/mitchellh/go-homedir v1.1.0 - github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/oleksandr/bonjour v0.0.0-20160508152359-5dcf00d8b228 github.com/pkg/errors v0.9.1 - github.com/pkg/sftp v1.12.0 // indirect github.com/sfreiberg/simplessh v0.0.0-20180301191542-495cbb862a9c github.com/sirupsen/logrus v1.8.1 github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c github.com/stretchr/testify v1.8.1 github.com/xrash/smetrics v0.0.0-20170218160415-a3153f7040e9 - github.com/zach-klippenstein/goregen v0.0.0-20160303162051-795b5e3961ea // indirect go.bug.st/downloader v0.0.0-20181116113543-9b8976a44d87 go.bug.st/serial v1.3.0 goa.design/goa v1.0.1-0.20190116060309-40843d63b0e4 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069 gopkg.in/inconshreveable/go-update.v0 v0.0.0-20150814200126-d8b0b1d421aa +) + +require ( + github.com/creack/goselect v0.1.2 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/davidmz/go-pageant v1.0.1 // indirect + github.com/dimfeld/httppath v0.0.0-20170720192232-ee938bf73598 // indirect + github.com/dimfeld/httptreemux v5.0.1+incompatible // indirect + github.com/getlantern/context v0.0.0-20190109183933-c447772a6520 // indirect + github.com/getlantern/errors v0.0.0-20190325191628-abdb3e3e36f7 // indirect + github.com/getlantern/golog v0.0.0-20190830074920-4ef2e798c2d7 // indirect + github.com/getlantern/hex v0.0.0-20190417191902-c6586a6fe0b7 // indirect + github.com/getlantern/hidden v0.0.0-20190325191715-f02dbb02be55 // indirect + github.com/getlantern/ops v0.0.0-20190325191751-d70cb0d6f85f // indirect + github.com/gin-contrib/sse v0.1.0 // indirect + github.com/go-playground/locales v0.14.0 // indirect + github.com/go-playground/universal-translator v0.18.0 // indirect + github.com/go-playground/validator/v10 v10.10.0 // indirect + github.com/go-stack/stack v1.8.0 // indirect + github.com/goccy/go-json v0.9.7 // indirect + github.com/google/gxui v0.0.0-20151028112939-f85e0a97b3a4 // indirect + github.com/googollee/go-engine.io v0.0.0-20180829091931-e2f255711dcb // indirect + github.com/gorilla/websocket v1.4.0 // indirect + github.com/h2non/filetype v1.1.0 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/juju/errors v0.0.0-20200330140219-3fe23663418f // indirect + github.com/kr/fs v0.1.0 // indirect + github.com/leodido/go-urn v1.2.1 // indirect + github.com/manveru/faker v0.0.0-20171103152722-9fbc68a78c4d // indirect + github.com/manveru/gobdd v0.0.0-20131210092515-f1a17fdd710b // indirect + github.com/mattn/go-isatty v0.0.14 // indirect + github.com/miekg/dns v1.1.35 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c // indirect + github.com/pelletier/go-toml/v2 v2.0.1 // indirect + github.com/pkg/sftp v1.12.0 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/ugorji/go v1.1.6 // indirect + github.com/zach-klippenstein/goregen v0.0.0-20160303162051-795b5e3961ea // indirect + golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 // indirect + golang.org/x/text v0.3.6 // indirect + google.golang.org/protobuf v1.28.0 // indirect gopkg.in/ini.v1 v1.62.0 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 2ce2aafb9..482a94949 100644 --- a/go.sum +++ b/go.sum @@ -228,7 +228,6 @@ github.com/oleksandr/bonjour v0.0.0-20160508152359-5dcf00d8b228/go.mod h1:MGuVJ1 github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c h1:rp5dCmg/yLR3mgFuSOe4oEnDDmGLROTvMragMUXpTQw= github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c/go.mod h1:X07ZCGwUbLaax7L0S3Tw4hpejzu63ZrrQiUe6W0hcy0= github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo= -github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml/v2 v2.0.1 h1:8e3L2cCQzLFi2CR4g7vGFuFxX7Jl1kKX8gW+iV0GUKU= github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo= @@ -304,10 +303,8 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= -github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo= -github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= -github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= -github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY= +github.com/ugorji/go v1.1.6 h1:zoJUBK8kLIUDNJ9LGB04qOQRfoDRoWBBpl0X7pZyi5I= +github.com/ugorji/go v1.1.6/go.mod h1:RaaajvHwnCbhlqWLTIB78hyPWp24YUXhQ3YXM7Hg7os= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4= diff --git a/icon/icondarwin.go b/icon/icondarwin.go index 9719c39b3..2eb38dd59 100644 --- a/icon/icondarwin.go +++ b/icon/icondarwin.go @@ -1,5 +1,4 @@ //go:build darwin -// +build darwin // File generated by 2goarray v0.1.0 (http://github.com/cratonica/2goarray) diff --git a/icon/iconlinux.go b/icon/iconlinux.go index 7b42eb1f2..27df134ce 100644 --- a/icon/iconlinux.go +++ b/icon/iconlinux.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux // File generated by 2goarray v0.1.0 (http://github.com/cratonica/2goarray) diff --git a/icon/iconwin.go b/icon/iconwin.go index d75f4280c..104f4725a 100644 --- a/icon/iconwin.go +++ b/icon/iconwin.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows // File generated by 2goarray v0.1.0 (http://github.com/cratonica/2goarray) diff --git a/icon/make_icon.bat b/icon/make_icon.bat index 93ada6c1b..15dc48423 100644 --- a/icon/make_icon.bat +++ b/icon/make_icon.bat @@ -17,12 +17,12 @@ GOTO DONE :INSTALL ECHO Installing 2goarray... -go get github.com/cratonica/2goarray +go install github.com/cratonica/2goarray@latest IF ERRORLEVEL 1 GOTO GETFAIL GOTO POSTINSTALL :GETFAIL -ECHO Failure running go get github.com/cratonica/2goarray. Ensure that go and git are in PATH +ECHO Failure running go install github.com/cratonica/2goarray@latest. Ensure that go and git are in PATH GOTO DONE :NOGO diff --git a/icon/make_icon.sh b/icon/make_icon.sh index 7e48c0216..77bf6f6d2 100755 --- a/icon/make_icon.sh +++ b/icon/make_icon.sh @@ -7,9 +7,9 @@ fi if [ ! -e "$GOPATH/bin/2goarray" ]; then echo "Installing 2goarray..." - go get github.com/cratonica/2goarray + go install github.com/cratonica/2goarray@latest if [ $? -ne 0 ]; then - echo Failure executing go get github.com/cratonica/2goarray + echo Failure executing go install github.com/cratonica/2goarray@latest exit fi fi diff --git a/redirect_stderr_unix.go b/redirect_stderr_unix.go index 77c16dc44..ed3e3f988 100644 --- a/redirect_stderr_unix.go +++ b/redirect_stderr_unix.go @@ -16,7 +16,6 @@ // Log the panic under unix to the log file //go:build !windows -// +build !windows package main diff --git a/redirect_stderr_win.go b/redirect_stderr_win.go index c9debd902..19279c756 100644 --- a/redirect_stderr_win.go +++ b/redirect_stderr_win.go @@ -5,7 +5,6 @@ // https://play.golang.org/p/kLtct7lSUg //go:build windows -// +build windows package main diff --git a/systray/systray_fake.go b/systray/systray_fake.go index b66c8fa3e..f86b516e0 100644 --- a/systray/systray_fake.go +++ b/systray/systray_fake.go @@ -14,7 +14,6 @@ // along with this program. If not, see . //go:build cli -// +build cli // Systray_fake gets compiled when the tag 'cli' is present. This is useful to build an agent without trayicon functionalities package systray diff --git a/systray/systray_real.go b/systray/systray_real.go index 0ed0d7dea..ff7a0769b 100644 --- a/systray/systray_real.go +++ b/systray/systray_real.go @@ -14,7 +14,6 @@ // along with this program. If not, see . //go:build !cli -// +build !cli // Systray_real gets compiled when the tag 'cli' is missing. This is the default case