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

main to prod #40

Merged
merged 25 commits into from
Feb 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 10 additions & 4 deletions .github/workflows/combined.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ jobs:
container: eco4cast/rocker-neon4cast:latest
steps:
- uses: actions/checkout@v3
with:
ref: prod

- name: Process submissions
shell: Rscript {0}
Expand All @@ -36,6 +38,8 @@ jobs:
container: eco4cast/rocker-neon4cast:latest
steps:
- uses: actions/checkout@v3
with:
ref: prod

- name: Generate scores
shell: Rscript {0}
Expand All @@ -61,8 +65,9 @@ jobs:

- uses: actions/checkout@v3
with:
fetch-depth: 0
set-safe-directory: '*'
ref: prod
fetch-depth: 0
set-safe-directory: '*'

- name: install validator
run: |
Expand Down Expand Up @@ -91,8 +96,9 @@ jobs:

- uses: actions/checkout@v3
with:
fetch-depth: 0
set-safe-directory: '*'
ref: prod
fetch-depth: 0
set-safe-directory: '*'

- uses: quarto-dev/quarto-actions/setup@v2
with:
Expand Down
11 changes: 7 additions & 4 deletions catalog/R/stac_functions.R
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,12 @@ generate_model_assets <- function(m_vars, m_duration, aws_path){
"1"= list(
'type'= 'application/json',
'title' = 'Model Metadata',
'href' = paste0("https://", config$endpoint,"/", config$model_metadata_bucket,"/",m,".json"),
'href' = paste0("https://", config$endpoint,"/",
config$model_metadata_bucket,"/",
"project_id=",config$project_id, "/",
m,".json"),
'description' = paste0("Use `jsonlite::fromJSON()` to download the model metadata JSON file. This R code will return metadata provided during the model registration.
\n\n### R\n\n```{r}\n# Use code below\n\nmodel_metadata <- jsonlite::fromJSON(",paste0('"','https://', config$endpoint,'/', config$model_metadata_bucket,'/',m,'.json"'),")\n\n")
\n\n### R\n\n```{r}\n# Use code below\n\nmodel_metadata <- jsonlite::fromJSON(",paste0('"','https://', config$endpoint,'/', config$model_metadata_bucket,'/', 'project_id=', config$project_id, '/', m,'.json"'),")\n\n")
)
)

Expand Down Expand Up @@ -516,8 +519,8 @@ build_group_variables <- function(table_schema,
),
list(
"rel" = "describedby",
"href" = "https://ltreb-reservoirs.github.io/vera4cast/",
"title" = "VERA Forecast Challenge Dashboard",
"href" = "https://ltreb-reservoirs.github.io/vera4cast/", # TODO: update this to something?
"title" = "EFI-USGS Forecast Challenge Dashboard",
"type" = "text/html"
)
)),
Expand Down
252 changes: 0 additions & 252 deletions catalog/forecasts/Aquatics/Daily_Dissolved_oxygen/collection.json

This file was deleted.

Loading
Loading