Skip to content

circleci: bump to Xcode 12#518

Merged
djs55 merged 18 commits intomoby:masterfrom
djs55:fix-circleci
Apr 15, 2021
Merged

circleci: bump to Xcode 12#518
djs55 merged 18 commits intomoby:masterfrom
djs55:fix-circleci

Conversation

@djs55
Copy link
Copy Markdown
Collaborator

@djs55 djs55 commented Apr 15, 2021

  • bump to Xcode 12
  • use opam version 2 (on Mac)
  • stop using the repo/darwin old opam version 1 metadata, replace it with a vpnkit.opam "lock" file like in the Dockerfile

Fixes CircleCI Mac builds!

djs55 added 18 commits April 15, 2021 11:14
Signed-off-by: David Scott <dave.scott@docker.com>
Signed-off-by: David Scott <dave@recoil.org>
Signed-off-by: David Scott <dave@recoil.org>
To hopefully fix

```
[ERROR] The compilation of vpnkit failed at "/Users/djs/.opam/opam-init/hooks/sandbox.sh build jbuilder subst".
```

Signed-off-by: David Scott <dave@recoil.org>
We attempt to use `vpnkit.opam` as a lock file, rather than maintaining
an old fork of the opam (version 1!) metadata.

Signed-off-by: David Scott <dave.scott@docker.com>
Signed-off-by: David Scott <dave@recoil.org>
Intended to fix:
```
$ dune build --profile release
File "src/bin/connect.mli", line 10, characters 29-54:
10 |   val set_port_forward_addr: Hvsock.Af_hyperv.sockaddr -> unit
                                  ^^^^^^^^^^^^^^^^^^^^^^^^^
Error: Unbound module Hvsock.Af_hyperv
```

Signed-off-by: David Scott <dave@recoil.org>
The full release of 2.0.0 is incompatible with some of our other
dependencies.

Signed-off-by: David Scott <dave@recoil.org>
Signed-off-by: David Scott <dave@recoil.org>
Signed-off-by: David Scott <dave@recoil.org>
Signed-off-by: David Scott <dave@recoil.org>
Signed-off-by: David Scott <dave@recoil.org>
This ensures all the environment variables are correctly set.

Signed-off-by: David Scott <dave@recoil.org>
Signed-off-by: David Scott <dave@recoil.org>
Signed-off-by: David Scott <dave@recoil.org>
Signed-off-by: David Scott <dave@recoil.org>
Signed-off-by: David Scott <dave@recoil.org>
@djs55
Copy link
Copy Markdown
Collaborator Author

djs55 commented Apr 15, 2021

CircleCI is green so merging!

@djs55 djs55 merged commit 25fe8ca into moby:master Apr 15, 2021
@djs55 djs55 deleted the fix-circleci branch April 15, 2021 16:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant