From 357fd5a14c67a1e25176f573a9868181aae209c1 Mon Sep 17 00:00:00 2001 From: Samuel K Date: Sun, 8 Nov 2026 00:52:47 -0600 Subject: [PATCH] fix(ci): resolve mise verification disk cleanup and provider test warnings --- .github/workflows/act.yml | 2 +- .github/workflows/pr-ci.yml | 4 ++-- pkg/workspace/provider_update_extended_test.go | 5 +++-- pkg/workspace/provider_update_preservation_test.go | 10 +--------- 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/.github/workflows/act.yml b/.github/workflows/act.yml index 2c3c042109..3e4ec40099 100644 --- a/.github/workflows/act.yml +++ b/.github/workflows/act.yml @@ -21,7 +21,7 @@ jobs: node-version: "26" - name: setup mise tools - uses: jdx/mise-action@7a4e45a543138629540c9a1616d08632b893e492 # v5 + uses: jdx/mise-action@b44d12e7d0d8ee7461bb893e1b1993500433185b # v5.2.7 - name: install goreleaser uses: goreleaser/goreleaser-action@f06c13b6b1a9625abc9e6e439d9c05a8f2190e94 # v7 diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml index 75ad4c2008..a4e0bfa57d 100644 --- a/.github/workflows/pr-ci.yml +++ b/.github/workflows/pr-ci.yml @@ -79,7 +79,7 @@ jobs: steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 - - uses: jdx/mise-action@7a4e45a543138629540c9a1616d08632b893e492 # v5 + - uses: jdx/mise-action@b44d12e7d0d8ee7461bb893e1b1993500433185b # v5.2.7 - run: prek run --all-files @@ -575,11 +575,11 @@ jobs: timeout-minutes: ${{ matrix.job_timeout_minutes }} steps: - uses: jlumbroso/free-disk-space@ceedf095f4ec1a097402bc6bd80831f2e1a6fde6 # v2.0.0 - background: true if: matrix.free_disk_space && matrix.os == 'linux' with: docker-images: false swap-storage: false + large-packages: false - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 diff --git a/pkg/workspace/provider_update_extended_test.go b/pkg/workspace/provider_update_extended_test.go index c48abce5d9..64c2b3ba5a 100644 --- a/pkg/workspace/provider_update_extended_test.go +++ b/pkg/workspace/provider_update_extended_test.go @@ -232,9 +232,10 @@ func (f *preservationFixture) assertFailedPreservation() { func ownedProviderUpdateServer(t *testing.T, handler http.HandlerFunc) *httptest.Server { t.Helper() - server := httptest.NewServer(handler) + server := httptest.NewUnstartedServer(handler) + server.Config.SetKeepAlivesEnabled(false) + server.Start() t.Cleanup(func() { - server.CloseClientConnections() server.Close() t.Log("owned HTTP server closed and joined") }) diff --git a/pkg/workspace/provider_update_preservation_test.go b/pkg/workspace/provider_update_preservation_test.go index d57c590c99..f95ed31af7 100644 --- a/pkg/workspace/provider_update_preservation_test.go +++ b/pkg/workspace/provider_update_preservation_test.go @@ -6,7 +6,6 @@ import ( "encoding/hex" "encoding/json" "net/http" - "net/http/httptest" "os" "path/filepath" "runtime" @@ -23,16 +22,9 @@ import ( func TestProviderUpdateFailedDownloadPreservesExisting(t *testing.T) { f := newFailedDownloadFixture(t) var requests atomic.Int64 - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + server := ownedProviderUpdateServer(t, func(w http.ResponseWriter, r *http.Request) { requests.Add(1) http.Error(w, "owned replacement artifact deliberately unavailable", http.StatusNotFound) - })) - t.Cleanup(func() { - server.CloseClientConnections() - server.Close() - t.Log( - "owned HTTP server closed and handlers joined; t.TempDir cleanup removes isolated provider/config/workspace state", - ) }) digest := sha256.Sum256([]byte(f.directory + " never served replacement")) replacement := &provider.ProviderConfig{