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
7 changes: 5 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ on:
- cron: '0 8 */6 * *' # every 6 days
push:
branches:
- earthly-main
- main
- gh_test_ci
pull_request:
branches:
- earthly-main
- main

jobs:
validate:
Expand Down Expand Up @@ -102,6 +102,9 @@ jobs:
go test ./...

test-freebsd-amd64:
# TODO(jhorsts): macOS latest (v10.15) used to contain vagrant but not anymore.
# The comment can be removed when the latest fsutil is merged into this repo.
if: false
runs-on: macos-latest
timeout-minutes: 60
env:
Expand Down
2 changes: 1 addition & 1 deletion receive_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ func TestCopyDirectoryTimestamps(t *testing.T) {

eg.Go(func() error {
defer s1.(*fakeConnProto).closeSend()
return Send(ctx, s1, fs, nil)
return Send(ctx, s1, fs, nil, nil)
})
eg.Go(func() error {
return Receive(ctx, s2, dest, ReceiveOpt{})
Expand Down