Skip to content

Commit

Permalink
add version to title and bump version name
Browse files Browse the repository at this point in the history
  • Loading branch information
colinpmillar committed Feb 19, 2024
1 parent e114523 commit ce66a79
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@ $run_dev.*
^.here$
^app\.R$
^rsconnect$
^\.github$
^renv\.lock$
5 changes: 3 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: icesTEASD
Title: An Amazing Shiny App
Version: 0.0.0.9000
Version: 0.0.0.9002
Authors@R:
c(person("Neil", "Maginnis", role=c("aut","cre"), email="neil.maginnis@ices.dk"),
person("Colin", "Millar", role="aut"))
Expand All @@ -18,7 +18,8 @@ Imports:
shiny (>= 1.8.0),
icesSD,
icesSAG,
dplyr
dplyr,
desc
Suggests:
pkgload
Encoding: UTF-8
Expand Down
1 change: 1 addition & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ importFrom(bslib,bs_theme)
importFrom(bslib,card_body)
importFrom(bslib,layout_column_wrap)
importFrom(bslib,value_box)
importFrom(desc,desc_get_version)
importFrom(dplyr,bind_rows)
importFrom(dplyr,filter)
importFrom(dplyr,mutate)
Expand Down
5 changes: 3 additions & 2 deletions R/app_ui.R
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#' @importFrom htmltools css h1 tags
#' @importFrom bsicons bs_icon
#' @importFrom DT dataTableOutput DTOutput
#' @importFrom desc desc_get_version
#'
#' @noRd
app_ui <- function(request) {
Expand All @@ -16,11 +17,11 @@ app_ui <- function(request) {

navbarPage(
theme = bs_theme(bootswatch = "cyborg"),
title = ("icesTEASD: Tool for Error Alignment of Stock Databases"),
title = paste0("icesTEASD: Tool for Error Alignment of Stock Databases, v", desc_get_version()),
tabPanel("SID SAG checks",
mod_SID_SAG_checks_ui("SID_SAG_checks_1")
),
tabPanel("User checks",
tabPanel("User checks",
mod_user_checks_ui("user_checks_1"))
)
)
Expand Down
11 changes: 11 additions & 0 deletions dev/03_deploy.R
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,17 @@ rhub::check_for_cran()

# Deploy

# we deploy only through github actions, and when code is changed on the main
# branch :)

# update renv.lock file - important to do this in a clean R
# otherwise devtools etc all get put into the renv file
file <- renv::lockfile_create(exclude = desc::desc_get_field("Package"))
renv::lockfile_write(file)

# bump description file
desc::desc_bump_version(which = "dev")

## Local, CRAN or Package Manager ----
## This will build a tar.gz that can be installed locally,
## sent to CRAN, or to a package manager
Expand Down

0 comments on commit ce66a79

Please sign in to comment.