Commit f5ca4518 authored by Laura A DeCicco's avatar Laura A DeCicco
Browse files

Merge branch 'optional_adjust' into 'main' 

Officially switch to the new Water Data services for Daily. Add argument to...

See merge request !179
parents 60a7107a b89b57ea

.Rbuildignore

+6 −1
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ vignettes/helper_functions.R 
vignettes/Method.bib

vignettes/Extend_method.bib

vignettes/Regional_studies.bib

vignettes/data_retrieval_updates.Rmd

_pkgdown.yml

pkgdown/favicon/*

vignettes/css/*
@@ -65,3 +66,7 @@ test-out.xml 
review/*

docs/*

docker/*

^\.vscode$

^[.]?air[.]toml$

^\.positai$

^\.claude$

.github/workflows/pkgdown.yaml

+7 −7
Original line number Diff line number Diff line
@@ -26,10 +26,9 @@ jobs: 
    # Only restrict concurrency for non-PR jobs

    concurrency:

      group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}

    environment: CI_config

    env:

      GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

      API_USGS_PAT: ${{ secrets.API_USGS_PAT }}

      CUSTOM_DR_UA: 'GitHub_CI'

    steps:

      - uses: actions/checkout@581d62f320f2a4043a1ea6ac77290c60d27485cc
@@ -41,12 +40,15 @@ jobs: 


      - uses: r-lib/actions/setup-r-dependencies@473c68190595b311a74f208fba61a8d8c0d4c247

        with:

          extra-packages: any::pkgdown, local::.

          extra-packages: |

            any::pkgdown

            any::zoo

            any::data.table

            local::.

          needs: website



      - name: Build site

        run: |

          install.packages(c('zoo', 'data.table')) | 

          pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE, dest_dir = "public") |

          file.copy(from = "./public/articles/logo.png",to = "./public/reference/logo.png")

        shell: Rscript {0}
@@ -59,11 +61,9 @@ jobs: 
    environment:

      name: github-pages

      url: ${{ steps.deployment.outputs.page_url }}

      API_USGS_PAT: ${{ secrets.API_USGS_PAT }}

    runs-on: ubuntu-latest

    needs: pkgdown

    steps:

      - name: Deploy to GitHub Pages

        id: deployment

        uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e
 
 No newline at end of file

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -17,3 +17,4 @@ vignettes/*_cache 
docs

/doc/

/Meta/

.positai

.gitlab-ci.yml

+19 −11
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ build-image: 
    # If this is building a git tag, create the corresponding docker tag

    - if [ -n "${CI_COMMIT_TAG}" ]; then docker tag ${CI_REGISTRY_IMAGE}:BUILD_${CI_COMMIT_SHORT_SHA} ${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG}; fi

    - docker push --all-tags ${CI_REGISTRY_IMAGE}

  artifacts:

    expire_in: 5 minutes



buildcheck:

  stage: check
@@ -60,6 +62,8 @@ buildcheck: 
    - mkdir -p $BUILD_LOGS_DIR

    - R CMD build . --no-manual

    - R -e 'devtools::check(document = FALSE, args = "--no-tests", check_dir = Sys.getenv("BUILD_LOGS_DIR"), vignettes = FALSE)'

  artifacts:

    expire_in: 1 hour



unittests:

  stage: test
@@ -70,6 +74,7 @@ unittests: 
    - R -e 'library(testthat); options(testthat.output_file = file.path(Sys.getenv("CI_PROJECT_DIR"), "test-out.xml")); devtools::test(reporter = "junit")'

  artifacts:

    when: always

    expire_in: 1 hour

    paths: 

      - test-out.xml

    reports:
@@ -83,6 +88,7 @@ covertests: 
  script:

    - R -e 'x <- covr::package_coverage(); covr::to_cobertura(x); x; '

  artifacts:

    expire_in: 1 hour

    reports:

      coverage_report:

        coverage_format: cobertura
@@ -100,7 +106,7 @@ pages: 
  artifacts:

    paths:

      - $PAGES_OUTDIR

    expire_in: 1 week

    expire_in: 1 hour

    

Validate Inventory:

  stage: end
@@ -113,3 +119,5 @@ Validate Inventory: 
      --token "${GIT_TOKEN_CUSTOM}"

  tags:

      - chs-shared

  artifacts:

    expire_in: 5 minutes

.vscode/extensions.json

0 → 100644
+5 −0
Original line number Diff line number Diff line 
{

    "recommendations": [

        "Posit.air-vscode"

    ]

}