Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/act.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
5 changes: 3 additions & 2 deletions pkg/workspace/provider_update_extended_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
})
Expand Down
10 changes: 1 addition & 9 deletions pkg/workspace/provider_update_preservation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"encoding/hex"
"encoding/json"
"net/http"
"net/http/httptest"
"os"
"path/filepath"
"runtime"
Expand All @@ -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{
Expand Down
Loading