From b4c4cfbf9a694d00d0bebc17c8044ac7730e243a Mon Sep 17 00:00:00 2001 From: Salim Afiune Maya Date: Mon, 30 Oct 2023 15:28:36 -0700 Subject: [PATCH 1/4] fix(ci): windows integration tests Signed-off-by: Salim Afiune Maya --- integration/help_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration/help_test.go b/integration/help_test.go index 2ebacca8e..77be8f43f 100644 --- a/integration/help_test.go +++ b/integration/help_test.go @@ -89,7 +89,7 @@ func TestHelpAll(t *testing.T) { } } canon, _ := helpCanon.ReadFile(filePath) - assert.Equal(t, string(canon), out.String()) + assert.Equal(t, strings.ReplaceAll(string(canon), "\r", ""), out.String()) }) } } From 7890730f7b02d54ee4fefe78832a51594e0ce234 Mon Sep 17 00:00:00 2001 From: Salim Afiune Maya Date: Mon, 30 Oct 2023 15:29:33 -0700 Subject: [PATCH 2/4] chore: run on windows Signed-off-by: Salim Afiune Maya --- .github/workflows/windows-integration.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/windows-integration.yml b/.github/workflows/windows-integration.yml index 4d4057b30..2538b322e 100644 --- a/.github/workflows/windows-integration.yml +++ b/.github/workflows/windows-integration.yml @@ -3,6 +3,7 @@ on: branches: - main - release + - afiune/windows jobs: windows-integration-tests: From aecd9bfef259da539d94935c744a529f783db6d6 Mon Sep 17 00:00:00 2001 From: Salim Afiune Maya Date: Mon, 30 Oct 2023 16:01:50 -0700 Subject: [PATCH 3/4] fix(ci): more windows integration tests Signed-off-by: Salim Afiune Maya --- integration/help_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/integration/help_test.go b/integration/help_test.go index 77be8f43f..1781d7ccb 100644 --- a/integration/help_test.go +++ b/integration/help_test.go @@ -84,7 +84,7 @@ func TestHelpAll(t *testing.T) { if runtime.GOOS == "windows" { canon, err := helpCanon.ReadFile(windowsFilePath) if err == nil { - assert.Equal(t, string(canon), out.String()) + assert.Equal(t, strings.ReplaceAll(string(canon), "\r", ""), out.String()) return } } @@ -129,7 +129,7 @@ func TestNoCommandProvided(t *testing.T) { out, err, exitcode := LaceworkCLI() canon, _ := helpCanon.ReadFile("test_resources/help/no-command-provided") assert.Equal(t, - string(canon), + strings.ReplaceAll(string(canon), "\r", ""), out.String(), "the main help message changed, please update") assert.Empty(t, From 1e8928f371780393940ffaa2acc76c1fe98a02a6 Mon Sep 17 00:00:00 2001 From: Salim Afiune Maya Date: Mon, 30 Oct 2023 16:42:30 -0700 Subject: [PATCH 4/4] Revert "chore: run on windows" This reverts commit 7890730f7b02d54ee4fefe78832a51594e0ce234. --- .github/workflows/windows-integration.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/windows-integration.yml b/.github/workflows/windows-integration.yml index 2538b322e..4d4057b30 100644 --- a/.github/workflows/windows-integration.yml +++ b/.github/workflows/windows-integration.yml @@ -3,7 +3,6 @@ on: branches: - main - release - - afiune/windows jobs: windows-integration-tests: