Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use a local git+file pin #285

Merged
merged 2 commits into from
Oct 21, 2024
Merged

use a local git+file pin #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe82df7
use a local git+file pin, as suggested by @reynir
robur-team Oct 21, 2024
1b0b4c7
use an explicit ref for the pin (so that opam-monorepo and cirrus are…
robur-team Oct 21, 2024
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
3 changes: 0 additions & 3 deletions .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ freebsd_client_task:
mirage_script: eval `opam env` && opam install --confirm-level=unsafe-yes "mirage>=4.8.0"
configure_script: eval `opam env` && cd mirage-client && mirage configure -t hvt
depend_script: eval `opam env` && cd mirage-client && gmake depend
copy_script: rm -rf mirage-client/duniverse/miragevpn/* && cp -R dune-project miragevpn.opam src mirage mirage-client/duniverse/miragevpn/
build_script: eval `opam env` && cd mirage-client && gmake build
client_artifacts:
path: mirage-client/dist/ovpn-client.hvt
Expand All @@ -18,7 +17,6 @@ freebsd_router_task:
mirage_script: eval `opam env` && opam install --confirm-level=unsafe-yes "mirage>=4.8.0"
configure_script: eval `opam env` && cd mirage-router && mirage configure -t hvt --enable-monitoring
depend_script: eval `opam env` && cd mirage-router && gmake depend
copy_script: rm -rf mirage-router/duniverse/miragevpn/* && cp -R dune-project miragevpn.opam src mirage mirage-router/duniverse/miragevpn/
build_script: eval `opam env` && cd mirage-router && gmake build
router_artifacts:
path: mirage-router/dist/ovpn-router.hvt
Expand All @@ -29,7 +27,6 @@ freebsd_server_task:
mirage_script: eval `opam env` && opam install --confirm-level=unsafe-yes "mirage>=4.8.0"
configure_script: eval `opam env` && cd mirage-server && mirage configure -t hvt
depend_script: eval `opam env` && cd mirage-server && gmake depend
copy_script: rm -rf mirage-server/duniverse/miragevpn/* && cp -R dune-project miragevpn.opam src mirage mirage-server/duniverse/miragevpn/
build_script: eval `opam env` && cd mirage-server && gmake build
server_artifacts:
path: mirage-server/dist/ovpn-server.hvt
2 changes: 1 addition & 1 deletion mirage-client/config.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ let data = generic_kv_ro ~key:data_key "configuration"

let miragevpn_handler =
let packages =
let pin = "git+https://github.com/robur-coop/miragevpn.git" in
let pin = "git+file://" ^ Filename.dirname (Sys.getcwd ()) ^ "#HEAD" in
[
package "logs";
package ~pin ~sublibs:[ "mirage" ] "miragevpn";
Expand Down
2 changes: 1 addition & 1 deletion mirage-router/config.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ let private_ipv4 = create_ipv4 ~group:"private" private_ethernet private_arp

let miragevpn_handler =
let packages =
let pin = "git+https://github.com/robur-coop/miragevpn.git" in
let pin = "git+file://" ^ Filename.dirname (Sys.getcwd ()) ^ "#HEAD" in
[
package "logs";
package ~pin ~sublibs:[ "mirage" ] "miragevpn";
Expand Down
2 changes: 1 addition & 1 deletion mirage-server/config.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ open Mirage

let miragevpn_handler =
let packages =
let pin = "git+https://github.com/robur-coop/miragevpn.git" in
let pin = "git+file://" ^ Filename.dirname (Sys.getcwd ()) ^ "#HEAD" in
[
package "logs";
package ~pin ~sublibs:[ "mirage" ] "miragevpn";
Expand Down
Loading