diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index c40e40a..4e9ba19 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -1,5 +1,9 @@ -# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples -# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help +# Workflow derived from: https://github.com/r-lib/actions/tree/v2/examples +# Need help debugging build failures? Start at: +# https://github.com/r-lib/actions#where-to-find-help +# unix build check fix applied from: +# https://forum.posit.co/t/libraptor2-dev-depends-libcurl4-gnutls-dev-but-it-is-not-installable-in-r-lib-actions-setup-r-dependencies-v2/181572/4 + on: push: branches: [main, master] diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml deleted file mode 100644 index 087f0b0..0000000 --- a/.github/workflows/pkgdown.yaml +++ /dev/null @@ -1,46 +0,0 @@ -# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples -# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help -on: - push: - branches: [main, master] - pull_request: - branches: [main, master] - release: - types: [published] - workflow_dispatch: - -name: pkgdown - -jobs: - pkgdown: - runs-on: ubuntu-latest - # Only restrict concurrency for non-PR jobs - concurrency: - group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }} - env: - GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} - steps: - - uses: actions/checkout@v3 - - - uses: r-lib/actions/setup-pandoc@v2 - - - uses: r-lib/actions/setup-r@v2 - with: - use-public-rspm: true - - - uses: r-lib/actions/setup-r-dependencies@v2 - with: - extra-packages: any::pkgdown, local::. - needs: website - - - name: Build site - run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE) - shell: Rscript {0} - - - name: Deploy to GitHub pages 🚀 - if: github.event_name != 'pull_request' - uses: JamesIves/github-pages-deploy-action@v4.4.1 - with: - clean: false - branch: gh-pages - folder: docs diff --git a/DESCRIPTION b/DESCRIPTION index b330f62..446beb4 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -19,7 +19,7 @@ License: CC0 BugReports: https://github.com/nationalparkservice/EMLeditor/issues Encoding: UTF-8 Roxygen: list(markdown = TRUE) -RoxygenNote: 7.3.1 +RoxygenNote: 7.3.2 Remotes: NCEAS/arcticdatautils, nationalparkservice/DPchecker, diff --git a/NEWS.md b/NEWS.md index c1a6844..8ca03b7 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,6 @@ # EMLeditor v0.1.6 (in progress) +## 2024-08-21 + * add id tag to projects to help DataStore identify DataStore projects vs. other projects. ## 2024-08-20 * add helper.R file with a test_path function to facilitate unit tests * update unit test code to run both interactively and during build checks diff --git a/R/editEMLfunctions.R b/R/editEMLfunctions.R index a9ec824..97e0292 100644 --- a/R/editEMLfunctions.R +++ b/R/editEMLfunctions.R @@ -1633,7 +1633,7 @@ set_project <- function(eml_object, organizationName = project_org, onlineUrl = project_url, role = project_role - ) + ), id = "DataStore_project" ) eml_object$dataset$project <- proj diff --git a/docs/404.html b/docs/404.html index 367fd1e..ec1bf8c 100644 --- a/docs/404.html +++ b/docs/404.html @@ -6,19 +6,19 @@