From c073cb3c5d16947c4bb2ea0b9e9d270faf863f21 Mon Sep 17 00:00:00 2001 From: mike Date: Wed, 10 Apr 2024 21:13:57 +1000 Subject: [PATCH] switch to dev version of rhub [no ci] --- .github/workflows/rhub.yaml | 36 ++++++++++++++++++++++++++---------- DESCRIPTION | 11 ++++++----- NEWS.md | 5 +++++ 3 files changed, 37 insertions(+), 15 deletions(-) diff --git a/.github/workflows/rhub.yaml b/.github/workflows/rhub.yaml index 48b12a4..74ec7b0 100644 --- a/.github/workflows/rhub.yaml +++ b/.github/workflows/rhub.yaml @@ -1,13 +1,13 @@ -# R-hub's genetic GitHub Actions workflow file. It's canonical location is at -# https://github.com/r-hub/rhub2/blob/v1/inst/workflow/rhub.yaml +# R-hub's generic GitHub Actions workflow file. It's canonical location is at +# https://github.com/r-hub/actions/blob/v1/workflows/rhub.yaml # You can update this file to a newer version using the rhub2 package: # -# rhub2::rhub_setup() +# rhub::rhub_setup() # # It is unlikely that you need to modify this file manually. name: R-hub -run-name: ${{ github.event.inputs.name || format('Manually run by {0}', github.triggering_actor) }} (${{ github.event.inputs.id }}) +run-name: "${{ github.event.inputs.id }}: ${{ github.event.inputs.name || format('Manually run by {0}', github.triggering_actor) }}" on: workflow_dispatch: @@ -33,7 +33,7 @@ jobs: steps: # NO NEED TO CHECKOUT HERE - - uses: r-hub/rhub2/actions/rhub-setup@v1 + - uses: r-hub/actions/setup@v1 with: config: ${{ github.event.inputs.config }} id: rhub-setup @@ -51,8 +51,16 @@ jobs: image: ${{ matrix.config.container }} steps: - - uses: actions/checkout@v3 - - uses: r-hub/rhub2/actions/rhub-check@v1 + - uses: r-hub/actions/checkout@v1 + - uses: r-hub/actions/platform-info@v1 + with: + token: ${{ secrets.RHUB_TOKEN }} + job-config: ${{ matrix.config.job-config }} + - uses: r-hub/actions/setup-deps@v1 + with: + token: ${{ secrets.RHUB_TOKEN }} + job-config: ${{ matrix.config.job-config }} + - uses: r-hub/actions/run-check@v1 with: token: ${{ secrets.RHUB_TOKEN }} job-config: ${{ matrix.config.job-config }} @@ -68,12 +76,20 @@ jobs: config: ${{ fromJson(needs.setup.outputs.platforms) }} steps: - - uses: actions/checkout@v3 - - uses: r-hub/rhub2/actions/rhub-setup-r@v1 + - uses: r-hub/actions/checkout@v1 + - uses: r-hub/actions/setup-r@v1 + with: + job-config: ${{ matrix.config.job-config }} + token: ${{ secrets.RHUB_TOKEN }} + - uses: r-hub/actions/platform-info@v1 + with: + token: ${{ secrets.RHUB_TOKEN }} + job-config: ${{ matrix.config.job-config }} + - uses: r-hub/actions/setup-deps@v1 with: job-config: ${{ matrix.config.job-config }} token: ${{ secrets.RHUB_TOKEN }} - - uses: r-hub/rhub2/actions/rhub-check@v1 + - uses: r-hub/actions/run-check@v1 with: job-config: ${{ matrix.config.job-config }} token: ${{ secrets.RHUB_TOKEN }} diff --git a/DESCRIPTION b/DESCRIPTION index 86e4157..1a3ba50 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,18 +1,19 @@ Package: yyjsonr Type: Package -Title: Fast JSON, NDJSON and GeoJSON Parser and Generator -Version: 0.1.18.9007 +Title: Fast 'JSON', 'NDJSON' and 'GeoJSON' Parser and Generator +Version: 0.1.19 Authors@R: c( person("Mike", "Cheng", role = c("aut", "cre", 'cph'), email = "mikefc@coolbutuseless.com"), person("Yao", "Yuan", role = c("aut", "cph"), email = "ibireme@gmail.com", comment="Author of bundled yyjson")) Maintainer: Mike Cheng -Description: A fast JSON parser, generator and validator which converts JSON, - NDJSON and GeoJSON data to/from R objects. The standard R data types are +Description: A fast 'JSON' parser, generator and validator which converts 'JSON', + 'NDJSON' (Newline Delimited 'JSON') and 'GeoJSON' (Geographic 'JSON') data + to/from R objects. The standard R data types are supported (e.g. logical, numeric, integer) with configurable handling of NULL and NA values. Data frames, atomic vectors and lists are all supported as data - containers translated to/from JSON. GeoJSON data is read in as + containers translated to/from 'JSON'. 'GeoJSON' data is read in as 'simple features' objects. This implementation wraps the 'yyjson' 'C' library which is available from . diff --git a/NEWS.md b/NEWS.md index 980a228..26e3b43 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,9 @@ + +# yyjsonr 0.1.19 2024-04-10 + +* Release to CRAN + # yyjsonr 0.1.18.9007 2024-04-09 * Fix some compilation warnings.