Skip to content

Commit

Permalink
use the .opam.locked file for installing the switch dependencies
Browse files Browse the repository at this point in the history 
fixes mirage#1415
  • Loading branch information
@hannesm
hannesm committed Jul 6, 2023
1 parent 58507e0 commit 596c9b7
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion lib/functoria/makefile.ml
View file
Expand Up @@ -135,7 +135,7 @@ pull:: $(MIRAGE_DIR)/$(UNIKERNEL_NAME).opam.locked
@@echo " ↳ fetch monorepo dependencies in the duniverse folder"
@@env OPAMVAR_monorepo="opam-monorepo" $(OPAM) monorepo pull -l $< -r $(abspath $(BUILD_DIR))

install-switch:: $(MIRAGE_DIR)/$(UNIKERNEL_NAME).opam
install-switch:: $(MIRAGE_DIR)/$(UNIKERNEL_NAME).opam.locked
@@echo " ↳ opam install switch dependencies"
@@$(OPAM) install $< --deps-only --yes%a%a

Expand Down
6 changes: 3 additions & 3 deletions test/functoria/query/run.t
View file
Expand Up @@ -94,7 +94,7 @@ Query Makefile
@echo " ↳ fetch monorepo dependencies in the duniverse folder"
@env OPAMVAR_monorepo="opam-monorepo" $(OPAM) monorepo pull -l $< -r $(abspath $(BUILD_DIR))

install-switch:: $(MIRAGE_DIR)/$(UNIKERNEL_NAME).opam
install-switch:: $(MIRAGE_DIR)/$(UNIKERNEL_NAME).opam.locked
@echo " ↳ opam install switch dependencies"
@$(OPAM) install $< --deps-only --yes
@$(MAKE) -s depext-lockfile
Expand Down Expand Up @@ -150,7 +150,7 @@ Query Makefile without depexts
@echo " ↳ fetch monorepo dependencies in the duniverse folder"
@env OPAMVAR_monorepo="opam-monorepo" $(OPAM) monorepo pull -l $< -r $(abspath $(BUILD_DIR))

install-switch:: $(MIRAGE_DIR)/$(UNIKERNEL_NAME).opam
install-switch:: $(MIRAGE_DIR)/$(UNIKERNEL_NAME).opam.locked
@echo " ↳ opam install switch dependencies"
@$(OPAM) install $< --deps-only --yes --no-depexts

Expand Down Expand Up @@ -211,7 +211,7 @@ Query Makefile with depext
@echo " ↳ fetch monorepo dependencies in the duniverse folder"
@env OPAMVAR_monorepo="opam-monorepo" $(OPAM) monorepo pull -l $< -r $(abspath $(BUILD_DIR))

install-switch:: $(MIRAGE_DIR)/$(UNIKERNEL_NAME).opam
install-switch:: $(MIRAGE_DIR)/$(UNIKERNEL_NAME).opam.locked
@echo " ↳ opam install switch dependencies"
@$(OPAM) install $< --deps-only --yes
@$(MAKE) -s depext-lockfile
Expand Down
2 changes: 1 addition & 1 deletion test/mirage/query/run-dash_in_name.t
View file
Expand Up @@ -72,7 +72,7 @@ Query makefile
@echo " ↳ fetch monorepo dependencies in the duniverse folder"
@env OPAMVAR_monorepo="opam-monorepo" $(OPAM) monorepo pull -l $< -r $(abspath $(BUILD_DIR))

install-switch:: $(MIRAGE_DIR)/$(UNIKERNEL_NAME).opam
install-switch:: $(MIRAGE_DIR)/$(UNIKERNEL_NAME).opam.locked
@echo " ↳ opam install switch dependencies"
@$(OPAM) install $< --deps-only --yes
@$(MAKE) -s depext-lockfile
Expand Down
6 changes: 3 additions & 3 deletions test/mirage/query/run-hvt.t
View file
Expand Up @@ -111,7 +111,7 @@ Query Makefile
@echo " ↳ fetch monorepo dependencies in the duniverse folder"
@env OPAMVAR_monorepo="opam-monorepo" $(OPAM) monorepo pull -l $< -r $(abspath $(BUILD_DIR))

install-switch:: $(MIRAGE_DIR)/$(UNIKERNEL_NAME).opam
install-switch:: $(MIRAGE_DIR)/$(UNIKERNEL_NAME).opam.locked
@echo " ↳ opam install switch dependencies"
@$(OPAM) install $< --deps-only --yes
@$(MAKE) -s depext-lockfile
Expand Down Expand Up @@ -166,7 +166,7 @@ Query Makefile without depexts
@echo " ↳ fetch monorepo dependencies in the duniverse folder"
@env OPAMVAR_monorepo="opam-monorepo" $(OPAM) monorepo pull -l $< -r $(abspath $(BUILD_DIR))

install-switch:: $(MIRAGE_DIR)/$(UNIKERNEL_NAME).opam
install-switch:: $(MIRAGE_DIR)/$(UNIKERNEL_NAME).opam.locked
@echo " ↳ opam install switch dependencies"
@$(OPAM) install $< --deps-only --yes --no-depexts

Expand Down Expand Up @@ -226,7 +226,7 @@ Query Makefile with depext
@echo " ↳ fetch monorepo dependencies in the duniverse folder"
@env OPAMVAR_monorepo="opam-monorepo" $(OPAM) monorepo pull -l $< -r $(abspath $(BUILD_DIR))

install-switch:: $(MIRAGE_DIR)/$(UNIKERNEL_NAME).opam
install-switch:: $(MIRAGE_DIR)/$(UNIKERNEL_NAME).opam.locked
@echo " ↳ opam install switch dependencies"
@$(OPAM) install $< --deps-only --yes
@$(MAKE) -s depext-lockfile
Expand Down
6 changes: 3 additions & 3 deletions test/mirage/query/run.t
View file
Expand Up @@ -110,7 +110,7 @@ Query Makefile
@echo " ↳ fetch monorepo dependencies in the duniverse folder"
@env OPAMVAR_monorepo="opam-monorepo" $(OPAM) monorepo pull -l $< -r $(abspath $(BUILD_DIR))

install-switch:: $(MIRAGE_DIR)/$(UNIKERNEL_NAME).opam
install-switch:: $(MIRAGE_DIR)/$(UNIKERNEL_NAME).opam.locked
@echo " ↳ opam install switch dependencies"
@$(OPAM) install $< --deps-only --yes
@$(MAKE) -s depext-lockfile
Expand Down Expand Up @@ -166,7 +166,7 @@ Query Makefile without depexts
@echo " ↳ fetch monorepo dependencies in the duniverse folder"
@env OPAMVAR_monorepo="opam-monorepo" $(OPAM) monorepo pull -l $< -r $(abspath $(BUILD_DIR))

install-switch:: $(MIRAGE_DIR)/$(UNIKERNEL_NAME).opam
install-switch:: $(MIRAGE_DIR)/$(UNIKERNEL_NAME).opam.locked
@echo " ↳ opam install switch dependencies"
@$(OPAM) install $< --deps-only --yes --no-depexts

Expand Down Expand Up @@ -227,7 +227,7 @@ Query Makefile with depext
@echo " ↳ fetch monorepo dependencies in the duniverse folder"
@env OPAMVAR_monorepo="opam-monorepo" $(OPAM) monorepo pull -l $< -r $(abspath $(BUILD_DIR))

install-switch:: $(MIRAGE_DIR)/$(UNIKERNEL_NAME).opam
install-switch:: $(MIRAGE_DIR)/$(UNIKERNEL_NAME).opam.locked
@echo " ↳ opam install switch dependencies"
@$(OPAM) install $< --deps-only --yes
@$(MAKE) -s depext-lockfile
Expand Down

0 comments on commit 596c9b7

Please sign in to comment.