From 4bf9515566f261cc97929caa57e86ea0e25c8814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= Date: Thu, 15 Feb 2024 00:49:31 +0100 Subject: [PATCH 1/2] chore(ci): do not fail fast main tests in different Go versions (#2210) * chore(ci): do not fail fast main tests in different Go versions * chore: revert fail-fast condition for the main job --- .github/workflows/ci.yml | 4 ++-- modulegen/_template/ci.yml.tmpl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d2302a66a4..2c7b90777c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,7 +52,7 @@ jobs: uses: ./.github/workflows/ci-test-go.yml with: go-version: ${{ matrix.go-version }} - fail-fast: true + fail-fast: false platform: "ubuntu-latest" project-directory: "." rootless-docker: false @@ -72,7 +72,7 @@ jobs: uses: ./.github/workflows/ci-test-go.yml with: go-version: ${{ matrix.go-version }} - fail-fast: true + fail-fast: false platform: "ubuntu-latest" project-directory: "." rootless-docker: true diff --git a/modulegen/_template/ci.yml.tmpl b/modulegen/_template/ci.yml.tmpl index 38162c4845..defba6beb8 100644 --- a/modulegen/_template/ci.yml.tmpl +++ b/modulegen/_template/ci.yml.tmpl @@ -52,7 +52,7 @@ jobs: uses: ./.github/workflows/ci-test-go.yml with: go-version: {{ "${{ matrix.go-version }}" }} - fail-fast: true + fail-fast: false platform: "ubuntu-latest" project-directory: "." rootless-docker: false @@ -72,7 +72,7 @@ jobs: uses: ./.github/workflows/ci-test-go.yml with: go-version: {{ "${{ matrix.go-version }}" }} - fail-fast: true + fail-fast: false platform: "ubuntu-latest" project-directory: "." rootless-docker: true From 1f628e25935b2d0adbc9b5344d6ff35000165f85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= Date: Thu, 15 Feb 2024 01:35:46 +0100 Subject: [PATCH 2/2] fix: wait more time in test (#2211) --- docker_files_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker_files_test.go b/docker_files_test.go index 065f87443f..d6eb15b804 100644 --- a/docker_files_test.go +++ b/docker_files_test.go @@ -81,7 +81,7 @@ func TestCopyFileToRunningContainer(t *testing.T) { require.NoError(t, err) // Give some time to the wait script to catch the hello script being created - err = wait.ForLog("done").WithStartupTimeout(200*time.Millisecond).WaitUntilReady(ctx, container) + err = wait.ForLog("done").WithStartupTimeout(2*time.Second).WaitUntilReady(ctx, container) require.NoError(t, err) require.NoError(t, container.Terminate(ctx))