From 698f3aebbe06cc50176973f395d086e95a165034 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Tue, 14 Mar 2023 17:04:13 +0100 Subject: [PATCH 1/2] Update relaxed-semver library --- .licenses/go/go.bug.st/relaxed-semver.dep.yml | 2 +- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.licenses/go/go.bug.st/relaxed-semver.dep.yml b/.licenses/go/go.bug.st/relaxed-semver.dep.yml index bc044af9547..81aae03b99a 100644 --- a/.licenses/go/go.bug.st/relaxed-semver.dep.yml +++ b/.licenses/go/go.bug.st/relaxed-semver.dep.yml @@ -1,6 +1,6 @@ --- name: go.bug.st/relaxed-semver -version: v0.9.0 +version: v0.9.1-0.20230314155704-b3598a6a660a type: go summary: homepage: https://pkg.go.dev/go.bug.st/relaxed-semver diff --git a/go.mod b/go.mod index 76735088430..23effb2e1eb 100644 --- a/go.mod +++ b/go.mod @@ -35,7 +35,7 @@ require ( github.com/stretchr/testify v1.8.0 go.bug.st/cleanup v1.0.0 go.bug.st/downloader/v2 v2.1.1 - go.bug.st/relaxed-semver v0.9.0 + go.bug.st/relaxed-semver v0.9.1-0.20230314155704-b3598a6a660a go.bug.st/serial v1.3.2 golang.org/x/crypto v0.7.0 golang.org/x/text v0.8.0 diff --git a/go.sum b/go.sum index ef0ec2dcbc5..ddfceb8b9ca 100644 --- a/go.sum +++ b/go.sum @@ -357,8 +357,8 @@ go.bug.st/cleanup v1.0.0 h1:XVj1HZxkBXeq3gMT7ijWUpHyIC1j8XAoNSyQ06CskgA= go.bug.st/cleanup v1.0.0/go.mod h1:EqVmTg2IBk4znLbPD28xne3abjsJftMdqqJEjhn70bk= go.bug.st/downloader/v2 v2.1.1 h1:nyqbUizo3E2IxCCm4YFac4FtSqqFpqWP+Aae5GCMuw4= go.bug.st/downloader/v2 v2.1.1/go.mod h1:VZW2V1iGKV8rJL2ZEGIDzzBeKowYv34AedJz13RzVII= -go.bug.st/relaxed-semver v0.9.0 h1:qt0T8W70VCurvsbxRK25fQwiTOFjkzwC/fDOpyPnchQ= -go.bug.st/relaxed-semver v0.9.0/go.mod h1:ug0/W/RPYUjliE70Ghxg77RDHmPxqpo7SHV16ijss7Q= +go.bug.st/relaxed-semver v0.9.1-0.20230314155704-b3598a6a660a h1:A/remezl8Ij2BTFsluluSVdozePONy1R1qeduQlghCU= +go.bug.st/relaxed-semver v0.9.1-0.20230314155704-b3598a6a660a/go.mod h1:lPVGdtzbQ9/2fv6iXqIXWHOj6cMTUJ/l/Lu1w+sgdio= go.bug.st/serial v1.3.2 h1:6BFZZd/wngoL5PPYYTrFUounF54SIkykHpT98eq6zvk= go.bug.st/serial v1.3.2/go.mod h1:jDkjqASf/qSjmaOxHSHljwUQ6eHo/ZX/bxJLQqSlvZg= go.bug.st/testifyjson v1.1.1 h1:nHotIMK151LF3vYsU/b2RaoVaWCgrf2kvQeGNoZkGaA= From dc8b452df6fe97c9044475f810a7d04c188c0bcb Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Tue, 14 Mar 2023 17:09:59 +0100 Subject: [PATCH 2/2] Added test --- internal/integrationtest/lib/lib_test.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/internal/integrationtest/lib/lib_test.go b/internal/integrationtest/lib/lib_test.go index f1e14eac9c2..91277e7b736 100644 --- a/internal/integrationtest/lib/lib_test.go +++ b/internal/integrationtest/lib/lib_test.go @@ -541,6 +541,18 @@ func TestInstall(t *testing.T) { _, stderr, err := cli.Run("lib", "install", "MD_Parola@3.2.0") require.Error(t, err) require.Contains(t, string(stderr), "No valid dependencies solution found: dependency 'MD_MAX72xx' is not available") + + // Test installing a library with a "relaxed" version + // https://github.com/arduino/arduino-cli/issues/1727 + _, _, err = cli.Run("lib", "install", "ILI9341_t3@1.0") + require.NoError(t, err) + stdout, _, err := cli.Run("lib", "list", "--format", "json") + require.NoError(t, err) + requirejson.Parse(t, stdout).Query(`.[] | select(.library.name == "ILI9341_t3") | .library.version`).MustEqual(`"1.0.0"`) + _, _, err = cli.Run("lib", "install", "ILI9341_t3@1") + require.NoError(t, err) + _, _, err = cli.Run("lib", "install", "ILI9341_t3@1.0.0") + require.NoError(t, err) } func TestInstallLibraryWithDependencies(t *testing.T) {