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

Jump to bottom

GitLab ci updates #411

Merged
merged 13 commits into from
Oct 10, 2024
Merged

GitLab ci updates #411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
dbfefb0
Merge branch 'response_to_review' into 'main'
ldecicco-USGS Oct 2, 2024
151d49c
test pipeline
ldecicco-USGS Oct 3, 2024
3c3e8c7
still seeing 3.1 on Shiny
ldecicco-USGS Oct 3, 2024
24261c9
add to option?
ldecicco-USGS Oct 7, 2024
7214555
ONLY dev
ldecicco-USGS Oct 7, 2024
73fabd3
curly?
ldecicco-USGS Oct 7, 2024
91285c8
missing a quote on install
ldecicco-USGS Oct 7, 2024
2d3eef7
double vs single quotes
ldecicco-USGS Oct 7, 2024
5a05247
indentations
ldecicco-USGS Oct 7, 2024
c1c19d6
?
ldecicco-USGS Oct 7, 2024
91d9bed
had a double install happening
ldecicco-USGS Oct 7, 2024
95b06c9
Merge branch 'main' of https://github.com/DOI-USGS/toxEval
ldecicco-USGS Oct 10, 2024
01e4fae
move to vars
ldecicco-USGS Oct 10, 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
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ variables:
_R_CHECK_DONTTEST_EXAMPLES_: "false"
R_PROFILE: "$R_HOME/etc/Rprofile.site"
APT_CACHE: "$CI_PROJECT_DIR/ci/lib/apt-cache"
CRAN: "https://rpkg.chs.usgs.gov/prod-cran/latest"
R_LIBS_USER: "$CI_PROJECT_DIR/ci/lib"
R_LIBS: "$CI_PROJECT_DIR/ci/lib"
BUILD_LOGS_DIR: "$CI_PROJECT_DIR/ci/logs"
Expand Down Expand Up @@ -103,8 +102,9 @@ pages:
only:
- main
script:
- echo -e "options(repos=c(DEV = '${DEV}', CRAN = '${CRAN}'));" >> $R_PROFILE
- Rscript -e 'install.packages("toxEval", repos = Sys.getenv("DEV")); packageVersion("toxEval"); source("deploy_simple.R")'
- Rscript -e 'pkgdown::build_site(override = list(destination = "public"))'
- Rscript -e 'source("deploy_simple.R")'
artifacts:
paths:
- $PAGES_OUTDIR
Expand Down
2 changes: 0 additions & 2 deletions deploy_simple.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ library(connectapi)
client <- connect(server = Sys.getenv("CONNECT_SERVER"),
api_key = Sys.getenv("CONNECT_API_KEY"))

install.packages("toxEval", repos = "https://rpkg.chs.usgs.gov/prod-cran/latest")

rsconnect::writeManifest(appDir = "./inst/shiny")
bundle <- bundle_dir("./inst/shiny")

Expand Down
Loading