Skip to content

Commit

Permalink
Merge branch 'main' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
jzaun444 committed Jul 9, 2024
2 parents 8c4f56b + 35ecdc8 commit dbc84a0
Show file tree
Hide file tree
Showing 5 changed files with 6,336 additions and 1 deletion.
11 changes: 11 additions & 0 deletions .hooks/pre-commit.R
Original file line number Diff line number Diff line change
Expand Up @@ -78,5 +78,16 @@ if (error_flag) {
quit(save = "no", status = 1, runLast = FALSE)
}

cat("\n")

cat("\n2. Rebuilding manifest.json...", fill = TRUE)
if (system.file(package = "rsconnect") != "" & system.file(package = "git2r") != "") {
if (!any(grepl("manifest.json", git2r::status()))) {
rsconnect::writeManifest()
git2r::add(path = "manifest.json")
}
cat("...manifest.json rebuilt\n")
}
cat("\n")

# End of hooks
34 changes: 34 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Release-$(rev:r)

pool:
name: RSConnect

trigger:
branches:
include:
- main
paths:
exclude:
- azure-pipelines.yml

resources:
repositories:
- repository: posit-deploy
type: git
name: ESFA-Data-Science/posit-deploy

extends:
template: deploy.yml@posit-deploy
parameters:
appName: csc-outcomes-enablers
environments:
- name: Pre-Production
appId: 939
- name: Production
appId: 374
approvers: |
emily.yau@education.gov.uk
richard.bielby@education.gov.uk
cameron.race@education.gov.uk
jen.machin@education.gov.uk
charlotte.foster@education.gov.uk
2 changes: 2 additions & 0 deletions global.R
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

# Library calls ---------------------------------------------------------------------------------
shhh <- suppressPackageStartupMessages # It's a library, so shhh!
shhh(library(git2r))
shhh(library(rsconnect))
shhh(library(shiny))
shhh(library(shinyjs))
shhh(library(tools))
Expand Down
Loading

0 comments on commit dbc84a0

Please sign in to comment.