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.

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

Fix webpage build #17

Closed
wants to merge 51 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
e1a594d
visual editor edits
CeresBarros Jun 3, 2024
77d0737
minor
CeresBarros Jun 3, 2024
8abe4a7
do we need to pass libPath? Does it exist?
CeresBarros Jun 3, 2024
6d95c65
ue .Rprofile to set libPaths
CeresBarros Jun 3, 2024
487bf6a
mv pkgs from GHA wkfl to installpkgs.R
CeresBarros Jun 3, 2024
0d5400d
Merge remote-tracking branch 'upstream/main' into 14-fix-webpage-build
CeresBarros Jun 3, 2024
d450e5b
need to install Require first before getting mirror
CeresBarros Jun 3, 2024
0650552
create/defined .libPaths in .Rprofile
CeresBarros Jun 3, 2024
65ef2d1
this is a test
CeresBarros Jun 3, 2024
cf47af1
bring CRAN mirror back with https
CeresBarros Jun 3, 2024
566f620
oops!
CeresBarros Jun 3, 2024
34d2b64
fix cran mirror
CeresBarros Jun 3, 2024
abaaf44
pass list to options(repos)
CeresBarros Jun 3, 2024
895e277
comment Require::getCRANrepos,
CeresBarros Jun 3, 2024
517befd
try again with `terra` and `httr` installs in action
CeresBarros Jun 3, 2024
ff39fd2
fix knitr cache param
CeresBarros Jun 4, 2024
a567ca9
visual studio edits
CeresBarros Jun 4, 2024
b6fa63b
minorissmo
CeresBarros Jun 4, 2024
86762d7
move CRAN repo definition to .Rprofile
CeresBarros Jun 4, 2024
c95249f
GHA: trying to fix `remotes` install
CeresBarros Jun 4, 2024
fc46f0d
castorExample -- SpaDES.project from r-universe; bugfix qmd (yml header)
Jun 3, 2024
e40f78f
mv training-specific line in .gitignore to training/.gitgnore
CeresBarros Jun 4, 2024
71bc765
[skip-ci] .gitignore Introduction
CeresBarros Jun 4, 2024
408f23d
change .libPath() to packages/<rversion>
CeresBarros Jun 4, 2024
258859e
test: what is setupProject doing in GHA?
CeresBarros Jun 4, 2024
bffe884
try NOT setting .libPaths for CI
CeresBarros Jun 4, 2024
7539848
[skip-ci] remove test warning
CeresBarros Jun 4, 2024
05587a5
[skip-ci] options(repos) only needed in Rprofile
CeresBarros Jun 4, 2024
77afa2f
pass repos to setupProject(..., options)
CeresBarros Jun 4, 2024
29e956c
reproducible needs `terra`: install.packages(..., dependencies = TRUE)
CeresBarros Jun 4, 2024
fe69a46
Merge branch 'main' into 14-fix-webpage-build
CeresBarros Jun 4, 2024
4017b1f
push rendered webpage for now
CeresBarros Jun 4, 2024
e036731
.gitgnore files from example code
CeresBarros Jun 4, 2024
e1d556a
rm old figs
CeresBarros Jun 4, 2024
fe25c49
list of pkgs for book
CeresBarros Jun 4, 2024
59606ea
script to make pkgList
CeresBarros Jun 4, 2024
fdc9350
PackagesForBook.qmd: install a more complete list of pkgs
CeresBarros Jun 4, 2024
6cac0cd
git ignore more files from qmds
CeresBarros Jun 4, 2024
440bdf9
it's `disk.frame` not `diskframe`!
CeresBarros Jun 4, 2024
9974f81
fix missing comma
CeresBarros Jun 4, 2024
09a7768
Pkgs4Book: improve text
CeresBarros Jun 4, 2024
7e3652a
Pkgs4book: pkgList no longer working?! use sideEffects
CeresBarros Jun 4, 2024
019f02b
switch to using pkgList.R
CeresBarros Jun 4, 2024
a6564d4
explaing pkg install code
CeresBarros Jun 4, 2024
50726aa
use setupProject approach in pre-rendered installPkgs.R
CeresBarros Jun 4, 2024
cf70f8f
try not changing libpaths for CI
CeresBarros Jun 4, 2024
b553664
make full pkg list post-render
CeresBarros Jun 4, 2024
b94b87f
test
CeresBarros Jun 4, 2024
b2709bd
update pkgList.R
CeresBarros Jun 4, 2024
c2c7dae
add Require::Install to makePkgList
CeresBarros Jun 4, 2024
aab5e2d
pkg install workaround: swtich to sideEffects again
CeresBarros Jun 4, 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
6 changes: 1 addition & 5 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,11 @@ jobs:
uses: r-lib/actions/setup-r-dependencies@v2
with:
packages:
any::data.table
any::googledrive
any::httr
any::kableExtra
any::knitr
any::quarto
any::Require
any::rmarkdown
any::terra
any::terra ## must be here, won't work from r setup script

- name: Build site 🔧
run: Rscript R/renderCopyBook.R
Expand Down
12 changes: 10 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/.quarto/
/_site/
*/_book/
docs/
!docs/
.Rprofile
modules/*
cache
Expand All @@ -17,4 +17,12 @@ outputs
.secret
.secrets

training/integratingSpaDESmodules/
!training/.Rprofile

## files from chapters can end up here if not in `training.Rproj`
Introduction/
integratingSpaDESmodules/
pkgList.csv
CHECKSUMS.txt


Empty file added docs/.nojekyll
Empty file.
Loading
Loading