diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cc45ad04..fb844266 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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: @@ -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: diff --git a/receive_test.go b/receive_test.go index 3d6cf464..2b651a5e 100644 --- a/receive_test.go +++ b/receive_test.go @@ -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{})