From 4643ecd8bae213d70f337af011dfb7e732538d7b Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Fri, 4 Jun 2021 14:42:39 +0200 Subject: [PATCH 1/2] upgrade go-paths-helper to 1.6.0 --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 4af7602abc3..891f2cf6d52 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.14 require ( github.com/arduino/board-discovery v0.0.0-20180823133458-1ba29327fb0c - github.com/arduino/go-paths-helper v1.5.0 + github.com/arduino/go-paths-helper v1.6.0 github.com/arduino/go-properties-orderedmap v1.3.0 github.com/arduino/go-timeutils v0.0.0-20171220113728-d1dd9e313b1b github.com/arduino/go-win32-utils v0.0.0-20180330194947-ed041402e83b diff --git a/go.sum b/go.sum index fa688ad2e28..1d6f002bee4 100644 --- a/go.sum +++ b/go.sum @@ -18,6 +18,8 @@ github.com/arduino/go-paths-helper v1.4.0 h1:ilnseAdxmN1bFnLxxXHRtcdmt9jBf3O4jtY github.com/arduino/go-paths-helper v1.4.0/go.mod h1:V82BWgAAp4IbmlybxQdk9Bpkz8M4Qyx+RAFKaG9NuvU= github.com/arduino/go-paths-helper v1.5.0 h1:RVo189hD+GhUS1rQ3gixwK1nSbvVR8MGIGa7Gxv2bdM= github.com/arduino/go-paths-helper v1.5.0/go.mod h1:V82BWgAAp4IbmlybxQdk9Bpkz8M4Qyx+RAFKaG9NuvU= +github.com/arduino/go-paths-helper v1.6.0 h1:S7/d7DqB9XlnvF9KrgSiGmo2oWKmYW6O/DTjj3Bijx4= +github.com/arduino/go-paths-helper v1.6.0/go.mod h1:V82BWgAAp4IbmlybxQdk9Bpkz8M4Qyx+RAFKaG9NuvU= github.com/arduino/go-properties-orderedmap v1.3.0 h1:4No/vQopB36e7WUIk6H6TxiSEJPiMrVOCZylYmua39o= github.com/arduino/go-properties-orderedmap v1.3.0/go.mod h1:DKjD2VXY/NZmlingh4lSFMEYCVubfeArCsGPGDwb2yk= github.com/arduino/go-timeutils v0.0.0-20171220113728-d1dd9e313b1b h1:9hDi4F2st6dbLC3y4i02zFT5quS4X6iioWifGlVwfy4= From 61eb04a66dae85bc526ec9a59c4b1656b21da864 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Fri, 4 Jun 2021 14:53:44 +0200 Subject: [PATCH 2/2] Fixed tests for new go-path library release --- arduino/builder/builder_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arduino/builder/builder_test.go b/arduino/builder/builder_test.go index 3463e503b17..44cf1e73771 100644 --- a/arduino/builder/builder_test.go +++ b/arduino/builder/builder_test.go @@ -36,11 +36,11 @@ func tmpDirOrDie() string { } func TestGenBuildPath(t *testing.T) { - want := filepath.Join(os.TempDir(), "arduino-sketch-ACBD18DB4CC2F85CEDEF654FCCC4A4D8") - assert.Equal(t, want, builder.GenBuildPath(paths.New("foo")).String()) + want := paths.TempDir().Join("arduino-sketch-ACBD18DB4CC2F85CEDEF654FCCC4A4D8") + assert.True(t, builder.GenBuildPath(paths.New("foo")).EquivalentTo(want)) - want = filepath.Join(os.TempDir(), "arduino-sketch-D41D8CD98F00B204E9800998ECF8427E") - assert.Equal(t, want, builder.GenBuildPath(nil).String()) + want = paths.TempDir().Join("arduino-sketch-D41D8CD98F00B204E9800998ECF8427E") + assert.True(t, builder.GenBuildPath(nil).EquivalentTo(want)) } func TestEnsureBuildPathExists(t *testing.T) {