From 600df641c5479dac7dccef9035a78ac5ef017546 Mon Sep 17 00:00:00 2001 From: Rohan Sasne Date: Tue, 19 Sep 2023 13:32:23 -0500 Subject: [PATCH 01/14] Add --- Makefile | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Makefile b/Makefile index a441991063c..2344e972838 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,18 @@ MODULES := allometry assim.batch assim.sequential benchmark \ data.remote emulator meta.analysis \ photosynthesis priors rtm uncertainty + +BASE_RUNIVERSE := PEcAn.logger PEcAn.utils PEcAn.DB PEcAn.settings PEcAn.visualization PEcAn.qaqc \ + PEcAn.remote PEcAn.workflow + +MODELS_RUNIVERSE := PEcAn.allometry PEcAn.assim.batch PEcAnAssimSequential PEcAn.benchmark PEcAn.data.atmosphere PEcAn.data.hydrology \ + PEcAn.data.land PEcAn.data.remote PEcAn.emulator \ + PEcAn.MA PEcAn.photosynthesis PEcAn.priors PEcAnRTM PEcAn.uncertainty + +MODULES_RUNIVERSE := PEcAn.BASGRA PEcAn.BIOCRO PEcAn.CLM45 PEcAn.DALEC PEcAn.dvmdostem PEcAn.ED2 PEcAn.FATES PEcAn.GDAY PEcAn.JULES \ + PEcAn.LINKAGES PEcAn.LPJGUESS PEcAn.MAAT PEcAn.MAESPA PEcAn.PRELES PEcAn.SIBCASA PEcAn.SIPNET PEcAn.STICS PEcAn.ModelName \ + PEcAn.all + # Components not currently included in the build # (Most need more development first) # models: cable From 62ea3b60fcd4af546e7ab3d0c061ae095baaa4c9 Mon Sep 17 00:00:00 2001 From: Rohan Sasne Date: Tue, 19 Sep 2023 13:49:28 -0500 Subject: [PATCH 02/14] Add --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 2344e972838..80a195f6a7f 100644 --- a/Makefile +++ b/Makefile @@ -35,9 +35,9 @@ MODELS := $(MODELS:%=models/%) MODULES := $(MODULES:%=modules/%) ALL_PKGS := $(BASE) $(MODULES) $(MODELS) -BASE_I := $(BASE:%=.install/%) -MODELS_I := $(MODELS:%=.install/%) -MODULES_I := $(MODULES:%=.install/%) +BASE_I := $(BASE_RUNIVERSE:%=.install/%) +MODELS_I := $(MODELS_RUNIVERSE:%=.install/%) +MODULES_I := $(MODULES_RUNIVERSE:%=.install/%) ALL_PKGS_I := $(BASE_I) $(MODULES_I) $(MODELS_I) SHINY_I := $(SHINY:shiny/%=.shiny_depends/%) From cd10dd9ceff3496350867afb8abd965ee00f45c7 Mon Sep 17 00:00:00 2001 From: Rohan Sasne Date: Tue, 19 Sep 2023 13:50:54 -0500 Subject: [PATCH 03/14] Add --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 80a195f6a7f..43cd762b918 100644 --- a/Makefile +++ b/Makefile @@ -86,7 +86,8 @@ depends_R_pkg = ./scripts/time.sh "depends ${1}" ./scripts/confirm_deps.R ${1} \ $(if $(findstring modules/benchmark,$(1)),NA,TRUE) install_R_pkg = ./scripts/time.sh "install ${1}" Rscript \ -e ${SETROPTIONS} \ - -e "devtools::install('$(strip $(1))', upgrade=FALSE)" + -e "install.packages('$(strip $(1))', repos = c('https://pecanproject.r-universe.dev', 'https://cloud.r-project.org'))" + check_R_pkg = ./scripts/time.sh "check ${1}" Rscript scripts/check_with_errors.R $(strip $(1)) test_R_pkg = ./scripts/time.sh "test ${1}" Rscript \ -e "devtools::test('$(strip $(1))'," \ From e37535090ce50c8ffd271d23aeed8ce2aea4ec47 Mon Sep 17 00:00:00 2001 From: Rohan Sasne Date: Tue, 19 Sep 2023 14:02:41 -0500 Subject: [PATCH 04/14] Add --- Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 43cd762b918..a036d7f370c 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ MODULES_RUNIVERSE := PEcAn.BASGRA PEcAn.BIOCRO PEcAn.CLM45 PEcAn.DALEC PEcAn.dv SHINY := $(dir $(wildcard shiny/*/.)) SHINY := $(SHINY:%/=%) -BASE := $(BASE:%=base/%) +BASE := $(BASE_RUNIVERSE:%=base/%) MODELS := $(MODELS:%=models/%) MODULES := $(MODULES:%=modules/%) ALL_PKGS := $(BASE) $(MODULES) $(MODELS) @@ -41,19 +41,19 @@ MODULES_I := $(MODULES_RUNIVERSE:%=.install/%) ALL_PKGS_I := $(BASE_I) $(MODULES_I) $(MODELS_I) SHINY_I := $(SHINY:shiny/%=.shiny_depends/%) -BASE_C := $(BASE:%=.check/%) -MODELS_C := $(MODELS:%=.check/%) -MODULES_C := $(MODULES:%=.check/%) +BASE_C := $(BASE_RUNIVERSE:%=.check/%) +MODELS_C := $(MODELS_RUNIVERSE:%=.check/%) +MODULES_C := $(MODULES_RUNIVERSE:%=.check/%) ALL_PKGS_C := $(BASE_C) $(MODULES_C) $(MODELS_C) -BASE_T := $(BASE:%=.test/%) -MODELS_T := $(MODELS:%=.test/%) -MODULES_T := $(MODULES:%=.test/%) +BASE_T := $(BASE_RUNIVERSE:%=.test/%) +MODELS_T := $(MODELS_RUNIVERSE:%=.test/%) +MODULES_T := $(MODULES_RUNIVERSE:%=.test/%) ALL_PKGS_T := $(BASE_T) $(MODULES_T) $(MODELS_T) -BASE_D := $(BASE:%=.doc/%) -MODELS_D := $(MODELS:%=.doc/%) -MODULES_D := $(MODULES:%=.doc/%) +BASE_D := $(BASE_RUNIVERSE:%=.doc/%) +MODELS_D := $(MODELS_RUNIVERSE:%=.doc/%) +MODULES_D := $(MODULES_RUNIVERSE:%=.doc/%) ALL_PKGS_D := $(BASE_D) $(MODULES_D) $(MODELS_D) SETROPTIONS := "options(Ncpus = ${NCPUS})" From de44659d1a5be084e26d449d73465294f9fe90ce Mon Sep 17 00:00:00 2001 From: Rohan Sasne Date: Tue, 19 Sep 2023 14:37:21 -0500 Subject: [PATCH 05/14] Add --- Makefile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index a036d7f370c..29f76ae0797 100644 --- a/Makefile +++ b/Makefile @@ -31,8 +31,8 @@ SHINY := $(dir $(wildcard shiny/*/.)) SHINY := $(SHINY:%/=%) BASE := $(BASE_RUNIVERSE:%=base/%) -MODELS := $(MODELS:%=models/%) -MODULES := $(MODULES:%=modules/%) +MODELS := $(MODELS_RUNIVERSE:%=models/%) +MODULES := $(MODULES_RUNIVERSE:%=modules/%) ALL_PKGS := $(BASE) $(MODULES) $(MODELS) BASE_I := $(BASE_RUNIVERSE:%=.install/%) @@ -41,19 +41,19 @@ MODULES_I := $(MODULES_RUNIVERSE:%=.install/%) ALL_PKGS_I := $(BASE_I) $(MODULES_I) $(MODELS_I) SHINY_I := $(SHINY:shiny/%=.shiny_depends/%) -BASE_C := $(BASE_RUNIVERSE:%=.check/%) -MODELS_C := $(MODELS_RUNIVERSE:%=.check/%) -MODULES_C := $(MODULES_RUNIVERSE:%=.check/%) +BASE_C := $(BASE:%=.check/%) +MODELS_C := $(MODELS:%=.check/%) +MODULES_C := $(MODULES:%=.check/%) ALL_PKGS_C := $(BASE_C) $(MODULES_C) $(MODELS_C) -BASE_T := $(BASE_RUNIVERSE:%=.test/%) -MODELS_T := $(MODELS_RUNIVERSE:%=.test/%) -MODULES_T := $(MODULES_RUNIVERSE:%=.test/%) +BASE_T := $(BASE:%=.test/%) +MODELS_T := $(MODELS:%=.test/%) +MODULES_T := $(MODULES:%=.test/%) ALL_PKGS_T := $(BASE_T) $(MODULES_T) $(MODELS_T) -BASE_D := $(BASE_RUNIVERSE:%=.doc/%) -MODELS_D := $(MODELS_RUNIVERSE:%=.doc/%) -MODULES_D := $(MODULES_RUNIVERSE:%=.doc/%) +BASE_D := $(BASE:%=.doc/%) +MODELS_D := $(MODELS:%=.doc/%) +MODULES_D := $(MODULES:%=.doc/%) ALL_PKGS_D := $(BASE_D) $(MODULES_D) $(MODELS_D) SETROPTIONS := "options(Ncpus = ${NCPUS})" @@ -86,7 +86,7 @@ depends_R_pkg = ./scripts/time.sh "depends ${1}" ./scripts/confirm_deps.R ${1} \ $(if $(findstring modules/benchmark,$(1)),NA,TRUE) install_R_pkg = ./scripts/time.sh "install ${1}" Rscript \ -e ${SETROPTIONS} \ - -e "install.packages('$(strip $(1))', repos = c('https://pecanproject.r-universe.dev', 'https://cloud.r-project.org'))" + -e "install.packages('$(notdir $(1))', repos = c('https://pecanproject.r-universe.dev', 'https://cloud.r-project.org'))" check_R_pkg = ./scripts/time.sh "check ${1}" Rscript scripts/check_with_errors.R $(strip $(1)) test_R_pkg = ./scripts/time.sh "test ${1}" Rscript \ From 2f1ed7aaca2a79cc8b9ebad90ec219a1cb46cfc4 Mon Sep 17 00:00:00 2001 From: Rohan Sasne Date: Tue, 19 Sep 2023 14:42:21 -0500 Subject: [PATCH 06/14] Add --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 29f76ae0797..524b70ac232 100644 --- a/Makefile +++ b/Makefile @@ -82,15 +82,15 @@ files_in_dir = $(call drop_parents, $(call recurse_dir, $1)) # HACK: NA vs TRUE switch on dependencies argument is an ugly workaround for # a circular dependency between benchmark and data.land. # When this is fixed, can go back to simple `dependencies = TRUE` -depends_R_pkg = ./scripts/time.sh "depends ${1}" ./scripts/confirm_deps.R ${1} \ - $(if $(findstring modules/benchmark,$(1)),NA,TRUE) +depends_R_pkg = ./scripts/time.sh "depends ${1}" ./scripts/confirm_deps.R $(subst PEcAn.,,$(1)) \ + $(if $(findstring modules/benchmark,$(subst PEcAn.,,$(1))),NA,TRUE) install_R_pkg = ./scripts/time.sh "install ${1}" Rscript \ -e ${SETROPTIONS} \ -e "install.packages('$(notdir $(1))', repos = c('https://pecanproject.r-universe.dev', 'https://cloud.r-project.org'))" -check_R_pkg = ./scripts/time.sh "check ${1}" Rscript scripts/check_with_errors.R $(strip $(1)) +check_R_pkg = ./scripts/time.sh "check $1" Rscript scripts/check_with_errors.R $(strip $(subst PEcAn.,,$(1))) test_R_pkg = ./scripts/time.sh "test ${1}" Rscript \ - -e "devtools::test('$(strip $(1))'," \ + -e "devtools::test('$(strip $(subst PEcAn.,,$(1)))'," \ -e "stop_on_failure = TRUE," \ -e "stop_on_warning = FALSE)" # TODO: Raise bar to stop_on_warning = TRUE when we can From 7a45d9d85bdf62601650f5a931cd6bc88e696e50 Mon Sep 17 00:00:00 2001 From: Rohan Sasne Date: Tue, 19 Sep 2023 14:47:36 -0500 Subject: [PATCH 07/14] Add --- Makefile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 524b70ac232..d1cede26ef9 100644 --- a/Makefile +++ b/Makefile @@ -30,14 +30,14 @@ MODULES_RUNIVERSE := PEcAn.BASGRA PEcAn.BIOCRO PEcAn.CLM45 PEcAn.DALEC PEcAn.dv SHINY := $(dir $(wildcard shiny/*/.)) SHINY := $(SHINY:%/=%) -BASE := $(BASE_RUNIVERSE:%=base/%) -MODELS := $(MODELS_RUNIVERSE:%=models/%) -MODULES := $(MODULES_RUNIVERSE:%=modules/%) +BASE := $(BASE:%=base/%) +MODELS := $(MODELS:%=models/%) +MODULES := $(MODULES:%=modules/%) ALL_PKGS := $(BASE) $(MODULES) $(MODELS) -BASE_I := $(BASE_RUNIVERSE:%=.install/%) -MODELS_I := $(MODELS_RUNIVERSE:%=.install/%) -MODULES_I := $(MODULES_RUNIVERSE:%=.install/%) +BASE_I := $(BASE:%=.install/%) +MODELS_I := $(MODELS:%=.install/%) +MODULES_I := $(MODULES:%=.install/%) ALL_PKGS_I := $(BASE_I) $(MODULES_I) $(MODELS_I) SHINY_I := $(SHINY:shiny/%=.shiny_depends/%) @@ -82,15 +82,15 @@ files_in_dir = $(call drop_parents, $(call recurse_dir, $1)) # HACK: NA vs TRUE switch on dependencies argument is an ugly workaround for # a circular dependency between benchmark and data.land. # When this is fixed, can go back to simple `dependencies = TRUE` -depends_R_pkg = ./scripts/time.sh "depends ${1}" ./scripts/confirm_deps.R $(subst PEcAn.,,$(1)) \ - $(if $(findstring modules/benchmark,$(subst PEcAn.,,$(1))),NA,TRUE) +depends_R_pkg = ./scripts/time.sh "depends ${1}" ./scripts/confirm_deps.R ${1} \ + $(if $(findstring modules/benchmark,$(1)),NA,TRUE) install_R_pkg = ./scripts/time.sh "install ${1}" Rscript \ -e ${SETROPTIONS} \ - -e "install.packages('$(notdir $(1))', repos = c('https://pecanproject.r-universe.dev', 'https://cloud.r-project.org'))" + -e "install.packages('$(strip $(1))', repos = c('https://pecanproject.r-universe.dev', 'https://cloud.r-project.org'))" -check_R_pkg = ./scripts/time.sh "check $1" Rscript scripts/check_with_errors.R $(strip $(subst PEcAn.,,$(1))) +check_R_pkg = ./scripts/time.sh "check ${1}" Rscript scripts/check_with_errors.R $(strip $(1)) test_R_pkg = ./scripts/time.sh "test ${1}" Rscript \ - -e "devtools::test('$(strip $(subst PEcAn.,,$(1)))'," \ + -e "devtools::test('$(strip $(1))'," \ -e "stop_on_failure = TRUE," \ -e "stop_on_warning = FALSE)" # TODO: Raise bar to stop_on_warning = TRUE when we can From 0b42295970115203f0a0ee81ffbd675fe15f1e7c Mon Sep 17 00:00:00 2001 From: Rohan Sasne Date: Tue, 19 Sep 2023 14:53:38 -0500 Subject: [PATCH 08/14] Add --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index d1cede26ef9..99ce96e5cda 100644 --- a/Makefile +++ b/Makefile @@ -35,9 +35,9 @@ MODELS := $(MODELS:%=models/%) MODULES := $(MODULES:%=modules/%) ALL_PKGS := $(BASE) $(MODULES) $(MODELS) -BASE_I := $(BASE:%=.install/%) -MODELS_I := $(MODELS:%=.install/%) -MODULES_I := $(MODULES:%=.install/%) +BASE_I := $(BASE_RUNIVERSE:%=.install/%) +MODELS_I := $(MODELS_RUNIVERSE:%=.install/%) +MODULES_I := $(MODULES_RUNIVERSE:%=.install/%) ALL_PKGS_I := $(BASE_I) $(MODULES_I) $(MODELS_I) SHINY_I := $(SHINY:shiny/%=.shiny_depends/%) @@ -112,7 +112,7 @@ depends = .doc/$(1) .install/$(1) .check/$(1) .test/$(1) .PHONY: all install check test document shiny \ check_base check_models check_modules -all: install document +all: installFromRuniverse document check_base: $(BASE_C) @@ -123,7 +123,7 @@ check_models: $(MODELS_C) check_modules: $(BASE_I) $(MODULES_C) document: $(ALL_PKGS_D) .doc/base/all -install: $(ALL_PKGS_I) .install/base/all +installFromRuniverse: $(ALL_PKGS_I) .install/base/all check: $(ALL_PKGS_C) .check/base/all test: $(ALL_PKGS_T) .test/base/all shiny: $(SHINY_I) From 5788dc922c3b1c0030a18cad00435b4036f6bd09 Mon Sep 17 00:00:00 2001 From: Rohan Sasne Date: Tue, 19 Sep 2023 15:00:29 -0500 Subject: [PATCH 09/14] Add --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 99ce96e5cda..554f4eb8d6b 100644 --- a/Makefile +++ b/Makefile @@ -35,9 +35,9 @@ MODELS := $(MODELS:%=models/%) MODULES := $(MODULES:%=modules/%) ALL_PKGS := $(BASE) $(MODULES) $(MODELS) -BASE_I := $(BASE_RUNIVERSE:%=.install/%) -MODELS_I := $(MODELS_RUNIVERSE:%=.install/%) -MODULES_I := $(MODULES_RUNIVERSE:%=.install/%) +BASE_I := $(BASE:%=.install/%) +MODELS_I := $(MODELS:%=.install/%) +MODULES_I := $(MODULES:%=.install/%) ALL_PKGS_I := $(BASE_I) $(MODULES_I) $(MODELS_I) SHINY_I := $(SHINY:shiny/%=.shiny_depends/%) From ce13c6f6ed9acb1d6dd90c2e3469e49bd4ee5b13 Mon Sep 17 00:00:00 2001 From: Rohan Sasne Date: Tue, 19 Sep 2023 15:04:20 -0500 Subject: [PATCH 10/14] Add --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 554f4eb8d6b..99ce96e5cda 100644 --- a/Makefile +++ b/Makefile @@ -35,9 +35,9 @@ MODELS := $(MODELS:%=models/%) MODULES := $(MODULES:%=modules/%) ALL_PKGS := $(BASE) $(MODULES) $(MODELS) -BASE_I := $(BASE:%=.install/%) -MODELS_I := $(MODELS:%=.install/%) -MODULES_I := $(MODULES:%=.install/%) +BASE_I := $(BASE_RUNIVERSE:%=.install/%) +MODELS_I := $(MODELS_RUNIVERSE:%=.install/%) +MODULES_I := $(MODULES_RUNIVERSE:%=.install/%) ALL_PKGS_I := $(BASE_I) $(MODULES_I) $(MODELS_I) SHINY_I := $(SHINY:shiny/%=.shiny_depends/%) From cc19f347488639e4f874eb39f463518ae9c74797 Mon Sep 17 00:00:00 2001 From: Rohan Sasne Date: Tue, 19 Sep 2023 15:18:08 -0500 Subject: [PATCH 11/14] Add --- Makefile | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 99ce96e5cda..2c4305ea888 100644 --- a/Makefile +++ b/Makefile @@ -35,12 +35,17 @@ MODELS := $(MODELS:%=models/%) MODULES := $(MODULES:%=modules/%) ALL_PKGS := $(BASE) $(MODULES) $(MODELS) -BASE_I := $(BASE_RUNIVERSE:%=.install/%) -MODELS_I := $(MODELS_RUNIVERSE:%=.install/%) -MODULES_I := $(MODULES_RUNIVERSE:%=.install/%) +BASE_I := $(BASE:%=.install/%) +MODELS_I := $(MODELS:%=.install/%) +MODULES_I := $(MODULES:%=.install/%) ALL_PKGS_I := $(BASE_I) $(MODULES_I) $(MODELS_I) SHINY_I := $(SHINY:shiny/%=.shiny_depends/%) +RBASE_I := $(BASE_RUNIVERSE:%=.install/%) +RMODELS_I := $(MODELS_RUNIVERSE:%=.install/%) +RMODULES_I := $(MODULES_RUNIVERSE:%=.install/%) +RALL_PKGS_I := $(RBASE_I) $(RMODULES_I) $(RMODELS_I) + BASE_C := $(BASE:%=.check/%) MODELS_C := $(MODELS:%=.check/%) MODULES_C := $(MODULES:%=.check/%) @@ -112,7 +117,7 @@ depends = .doc/$(1) .install/$(1) .check/$(1) .test/$(1) .PHONY: all install check test document shiny \ check_base check_models check_modules -all: installFromRuniverse document +all: document installFromRUniverse check_base: $(BASE_C) @@ -123,10 +128,11 @@ check_models: $(MODELS_C) check_modules: $(BASE_I) $(MODULES_C) document: $(ALL_PKGS_D) .doc/base/all -installFromRuniverse: $(ALL_PKGS_I) .install/base/all +install: $(ALL_PKGS_I) .install/base/all check: $(ALL_PKGS_C) .check/base/all test: $(ALL_PKGS_T) .test/base/all shiny: $(SHINY_I) +installFromRUniverse: $(RALL_PKGS_I) # Render the PEcAn bookdown documentation book: From 58830415c1b0db2127758be60700820acd8b9c84 Mon Sep 17 00:00:00 2001 From: Rohan Sasne Date: Tue, 19 Sep 2023 15:20:43 -0500 Subject: [PATCH 12/14] Add --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2c4305ea888..19f8c3bcd85 100644 --- a/Makefile +++ b/Makefile @@ -117,7 +117,7 @@ depends = .doc/$(1) .install/$(1) .check/$(1) .test/$(1) .PHONY: all install check test document shiny \ check_base check_models check_modules -all: document installFromRUniverse +all: installFromRUniverse check_base: $(BASE_C) From 2ff11004e44dbdda1a02302cf7ef84bc53c356ce Mon Sep 17 00:00:00 2001 From: Rohan Sasne Date: Wed, 20 Sep 2023 01:36:25 -0500 Subject: [PATCH 13/14] Add --- Makefile | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 19f8c3bcd85..c01872849cd 100644 --- a/Makefile +++ b/Makefile @@ -35,17 +35,12 @@ MODELS := $(MODELS:%=models/%) MODULES := $(MODULES:%=modules/%) ALL_PKGS := $(BASE) $(MODULES) $(MODELS) -BASE_I := $(BASE:%=.install/%) -MODELS_I := $(MODELS:%=.install/%) -MODULES_I := $(MODULES:%=.install/%) +BASE_I := $(BASE_RUNIVERSE:%=.install/%) +MODELS_I := $(MODELS_RUNIVERSE:%=.install/%) +MODULES_I := $(MODULES_RUNIVERSE:%=.install/%) ALL_PKGS_I := $(BASE_I) $(MODULES_I) $(MODELS_I) SHINY_I := $(SHINY:shiny/%=.shiny_depends/%) -RBASE_I := $(BASE_RUNIVERSE:%=.install/%) -RMODELS_I := $(MODELS_RUNIVERSE:%=.install/%) -RMODULES_I := $(MODULES_RUNIVERSE:%=.install/%) -RALL_PKGS_I := $(RBASE_I) $(RMODULES_I) $(RMODELS_I) - BASE_C := $(BASE:%=.check/%) MODELS_C := $(MODELS:%=.check/%) MODULES_C := $(MODULES:%=.check/%) @@ -132,7 +127,6 @@ install: $(ALL_PKGS_I) .install/base/all check: $(ALL_PKGS_C) .check/base/all test: $(ALL_PKGS_T) .test/base/all shiny: $(SHINY_I) -installFromRUniverse: $(RALL_PKGS_I) # Render the PEcAn bookdown documentation book: From 76a47d7b27a5579a0ffc9ec687293def29c35bc7 Mon Sep 17 00:00:00 2001 From: Rohan Sasne Date: Sun, 24 Sep 2023 01:15:11 +0530 Subject: [PATCH 14/14] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3c27cf84d80..a8e2d41e519 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -131,7 +131,7 @@ jobs: # run PEcAn checks - name: check - run: make -j1 check_base + run: make -j1 install env: REBUILD_DOCS: "FALSE" RUN_TESTS: "FALSE"