Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update extract to 4.0.0 and golang to 1.23 #990

Merged
merged 3 commits into from
Aug 29, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/check-go-dependencies-task.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Check Go Dependencies

env:
# See: https://github.com/actions/setup-go/tree/v3#readme
GO_VERSION: "1.21"
GO_VERSION: "1.22"

# See: https://docs.github.com/actions/using-workflows/events-that-trigger-workflows
on:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-go-task.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Check Go

env:
# See: https://github.com/actions/setup-go/tree/main#supported-version-syntax
GO_VERSION: "1.21"
GO_VERSION: "1.22"

# See: https://docs.github.com/actions/using-workflows/events-that-trigger-workflows
on:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-go-tester-task.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ on:

env:
PROJECT_NAME: arduino-cloud-agent
GO_VERSION: "1.21"
GO_VERSION: "1.22"

jobs:
run-determination:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ env:
AC_PASSWORD: ${{ secrets.AC_PASSWORD }} # used by gon
AC_PROVIDER: ${{ secrets.AC_PROVIDER }} # used by gon
# See: https://github.com/actions/setup-go/tree/v3#readme
GO_VERSION: "1.21"
GO_VERSION: "1.22"

jobs:
# The build job is responsible for: configuring the environment, testing and compiling process
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-go-integration-task.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Test Integration

env:
# See: https://github.com/actions/setup-go/tree/v2#readme
GO_VERSION: "1.21"
GO_VERSION: "1.22"
# See: https://github.com/actions/setup-python/tree/v2#available-versions-of-python
PYTHON_VERSION: "3.9"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-go-task.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Test Go

env:
# See: https://github.com/actions/setup-go/tree/v2#readme
GO_VERSION: "1.21"
GO_VERSION: "1.22"

# See: https://docs.github.com/en/free-pro-team@latest/actions/reference/events-that-trigger-workflows
on:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
name: github.com/codeclysm/extract/v3
version: v3.1.1
name: github.com/codeclysm/extract/v4
version: v4.0.0
type: go
summary: Package extract allows to extract archives in zip, tar.gz or tar.bz2 formats
easily.
homepage: https://pkg.go.dev/github.com/codeclysm/extract/v3
homepage: https://pkg.go.dev/github.com/codeclysm/extract/v4
license: mit
licenses:
- sources: LICENSE
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: github.com/ulikunitz/xz
version: v0.5.11
version: v0.5.12
type: go
summary: Package xz supports the compression and decompression of xz files.
homepage: https://pkg.go.dev/github.com/ulikunitz/xz
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
name: github.com/ulikunitz/xz/internal/hash
version: v0.5.11
version: v0.5.12
type: go
summary: Package hash provides rolling hashes.
homepage: https://pkg.go.dev/github.com/ulikunitz/xz/internal/hash
license: bsd-3-clause
licenses:
- sources: [email protected].11/LICENSE
- sources: [email protected].12/LICENSE
text: |
Copyright (c) 2014-2022 Ulrich Kunitz
All rights reserved.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
---
name: github.com/ulikunitz/xz/internal/xlog
version: v0.5.11
version: v0.5.12
type: go
summary: Package xlog provides a simple logging package that allows to disable certain
message categories.
homepage: https://pkg.go.dev/github.com/ulikunitz/xz/internal/xlog
license: bsd-3-clause
licenses:
- sources: [email protected].11/LICENSE
- sources: [email protected].12/LICENSE
text: |
Copyright (c) 2014-2022 Ulrich Kunitz
All rights reserved.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
name: github.com/ulikunitz/xz/lzma
version: v0.5.11
version: v0.5.12
type: go
summary: Package lzma supports the decoding and encoding of LZMA streams.
homepage: https://pkg.go.dev/github.com/ulikunitz/xz/lzma
license: bsd-3-clause
licenses:
- sources: [email protected].11/LICENSE
- sources: [email protected].12/LICENSE
text: |
Copyright (c) 2014-2022 Ulrich Kunitz
All rights reserved.
Expand Down
8 changes: 5 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
module github.com/arduino/arduino-create-agent

go 1.21
go 1.22

toolchain go1.22.3

require (
fyne.io/systray v1.10.0
Expand All @@ -9,7 +11,7 @@ require (
github.com/arduino/go-serial-utils v0.1.2
github.com/arduino/pluggable-discovery-protocol-handler/v2 v2.2.0
github.com/blang/semver v3.5.1+incompatible
github.com/codeclysm/extract/v3 v3.1.1
github.com/codeclysm/extract/v4 v4.0.0
github.com/gin-contrib/cors v1.7.2
github.com/gin-gonic/gin v1.10.0
github.com/go-ini/ini v1.62.0
Expand Down Expand Up @@ -71,7 +73,7 @@ require (
github.com/tevino/abool v1.2.0 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/ugorji/go v1.1.6 // indirect
github.com/ulikunitz/xz v0.5.11 // indirect
github.com/ulikunitz/xz v0.5.12 // indirect
golang.org/x/arch v0.8.0 // indirect
golang.org/x/crypto v0.23.0 // indirect
golang.org/x/mod v0.17.0 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/
github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg=
github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
github.com/codeclysm/extract/v3 v3.1.1 h1:iHZtdEAwSTqPrd+1n4jfhr1qBhUWtHlMTjT90+fJVXg=
github.com/codeclysm/extract/v3 v3.1.1/go.mod h1:ZJi80UG2JtfHqJI+lgJSCACttZi++dHxfWuPaMhlOfQ=
github.com/codeclysm/extract/v4 v4.0.0 h1:H87LFsUNaJTu2e/8p/oiuiUsOK/TaPQ5wxsjPnwPEIY=
github.com/codeclysm/extract/v4 v4.0.0/go.mod h1:SFju1lj6as7FvUgalpSct7torJE0zttbJUWtryPRG6s=
github.com/creack/goselect v0.1.2 h1:2DNy14+JPjRBgPzAd1thbQp4BSIihxcBf0IXhQXDRa0=
github.com/creack/goselect v0.1.2/go.mod h1:a/NhLweNvqIYMuxcMOuWY516Cimucms3DglDzQP3hKY=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
Expand Down Expand Up @@ -155,8 +155,8 @@ github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS
github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
github.com/ugorji/go v1.1.6 h1:zoJUBK8kLIUDNJ9LGB04qOQRfoDRoWBBpl0X7pZyi5I=
github.com/ugorji/go v1.1.6/go.mod h1:RaaajvHwnCbhlqWLTIB78hyPWp24YUXhQ3YXM7Hg7os=
github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8=
github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc=
github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
github.com/xrash/smetrics v0.0.0-20170218160415-a3153f7040e9 h1:w8V9v0qVympSF6GjdjIyeqR7+EVhAF9CBQmkmW7Zw0w=
github.com/xrash/smetrics v0.0.0-20170218160415-a3153f7040e9/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
go.bug.st/serial v1.6.1 h1:VSSWmUxlj1T/YlRo2J104Zv3wJFrjHIl/T3NeruWAHY=
Expand Down
2 changes: 1 addition & 1 deletion updater/updater_darwin.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"strings"

"github.com/arduino/go-paths-helper"
"github.com/codeclysm/extract/v3"
"github.com/codeclysm/extract/v4"
"github.com/sirupsen/logrus"
log "github.com/sirupsen/logrus"
)
Expand Down
2 changes: 1 addition & 1 deletion v2/pkgs/tools.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import (
"github.com/arduino/arduino-create-agent/index"
"github.com/arduino/arduino-create-agent/utilities"
"github.com/blang/semver"
"github.com/codeclysm/extract/v3"
"github.com/codeclysm/extract/v4"
)

// public vars to allow override in the tests
Expand Down
Loading