diff --git a/.devcontainer.json b/.devcontainer.json index 3f45e86..07884bd 100644 --- a/.devcontainer.json +++ b/.devcontainer.json @@ -1,11 +1,8 @@ { - "image": "geocompr/geocompr:qgis", - // "forwardPorts": [3000], - "customizations": { - // Configure properties specific to VS Code. - "vscode": { - // Add the IDs of extensions you want installed when the container is created. - "extensions": ["reditorsupport.r"] - } + "image": "pixi-r", + "customizations": { + "vscode": { + "extensions": ["reditorsupport.r"] } - } \ No newline at end of file + } +} \ No newline at end of file diff --git a/.github/workflows/main-no-deploy.yml b/.github/workflows/main-no-deploy.yml index 4e7dbc7..5f2f72e 100644 --- a/.github/workflows/main-no-deploy.yml +++ b/.github/workflows/main-no-deploy.yml @@ -1,10 +1,7 @@ on: - push: - branches: - - main pull_request: branches: - - main + - main name: Render-no-deploy jobs: bookdown: @@ -17,5 +14,6 @@ jobs: - uses: actions/checkout@v2 - name: Render Book run: | - Rscript -e 'remotes::install_github("geocompx/geocompkg", dependencies = TRUE, force = TRUE)' + Rscript -e 'remotes::install_dev("tmap")' + Rscript -e 'remotes::install_version("xfun", "0.46")' Rscript -e 'bookdown::render_book("index.Rmd")' diff --git a/.vscode/settings.json b/.vscode/settings.json index f0f01c0..b74a20c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,4 @@ { - "editor.wordWrap": "on" + "editor.wordWrap": "on", + "makefile.configureOnOpen": false } \ No newline at end of file