From 46907c7f211d9ff244d9828338dc4eaf14a48d2c Mon Sep 17 00:00:00 2001 From: Thomas Bouffard <27200110+tbouffard@users.noreply.github.com> Date: Thu, 26 Aug 2021 15:09:06 +0200 Subject: [PATCH 01/16] Introduce gh wf --- .Rbuildignore | 1 + .github/.gitignore | 1 + .github/workflows/R-CMD-check.yaml | 68 +++++++++++++++++++++ .github/workflows/check-standard.yaml | 85 +++++++++++++++++++++++++++ 4 files changed, 155 insertions(+) create mode 100644 .Rbuildignore create mode 100644 .github/.gitignore create mode 100644 .github/workflows/R-CMD-check.yaml create mode 100644 .github/workflows/check-standard.yaml diff --git a/.Rbuildignore b/.Rbuildignore new file mode 100644 index 0000000..c503c4f --- /dev/null +++ b/.Rbuildignore @@ -0,0 +1 @@ +^\.github$ diff --git a/.github/.gitignore b/.github/.gitignore new file mode 100644 index 0000000..2d19fc7 --- /dev/null +++ b/.github/.gitignore @@ -0,0 +1 @@ +*.html diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml new file mode 100644 index 0000000..e6425cf --- /dev/null +++ b/.github/workflows/R-CMD-check.yaml @@ -0,0 +1,68 @@ +# NOTE: This workflow is overkill for most R packages +# check-standard.yaml is likely a better choice +# usethis::use_github_action("check-standard") will install it. +# +# For help debugging build failures open an issue on the RStudio community with the 'github-actions' tag. +# https://community.rstudio.com/new-topic?category=Package%20development&tags=github-actions +on: + push: + branches: [main, master] + pull_request: + branches: [main, master] + +name: R-CMD-check + +jobs: + R-CMD-check: + runs-on: ${{ matrix.config.os }} + + name: ${{ matrix.config.os }} (${{ matrix.config.r }}) + + strategy: + fail-fast: false + matrix: + config: + - {os: macOS-latest, r: 'release'} + - {os: windows-latest, r: 'release'} + - {os: windows-latest, r: '3.6'} + - {os: ubuntu-18.04, r: 'devel', http-user-agent: 'release'} + - {os: ubuntu-18.04, r: 'release'} + - {os: ubuntu-18.04, r: 'oldrel'} + - {os: ubuntu-18.04, r: '3.6'} + - {os: ubuntu-18.04, r: '3.5'} + - {os: ubuntu-18.04, r: '3.4'} + + env: + RSPM: https://packagemanager.rstudio.com/cran/__linux__/bionic/latest + GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} + + steps: + - uses: actions/checkout@v2 + - uses: r-lib/actions/setup-pandoc@v1 + - uses: r-lib/actions/setup-r@v1 + with: + r-version: ${{ matrix.config.r }} + http-user-agent: ${{ matrix.config.http-user-agent }} + - uses: r-lib/actions/setup-r-dependencies@master + with: + extra-packages: rcmdcheck + + - name: Check + env: + _R_CHECK_CRAN_INCOMING_: false + run: | + options(crayon.enabled = TRUE) + rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check") + shell: Rscript {0} + + - name: Show testthat output + if: always() + run: find check -name 'testthat.Rout*' -exec cat '{}' \; || true + shell: bash + + - name: Upload check results + if: failure() + uses: actions/upload-artifact@main + with: + name: ${{ matrix.config.os }}-r${{ matrix.config.r }}-results + path: check diff --git a/.github/workflows/check-standard.yaml b/.github/workflows/check-standard.yaml new file mode 100644 index 0000000..cea7ca2 --- /dev/null +++ b/.github/workflows/check-standard.yaml @@ -0,0 +1,85 @@ +# For help debugging build failures open an issue on the RStudio community with the 'github-actions' tag. +# https://community.rstudio.com/new-topic?category=Package%20development&tags=github-actions +on: + push: + branches: + - main + - master + pull_request: + branches: + - main + - master + +name: R-CMD-check + +jobs: + R-CMD-check: + runs-on: ${{ matrix.config.os }} + + name: ${{ matrix.config.os }} (${{ matrix.config.r }}) + + strategy: + fail-fast: false + matrix: + config: + - {os: windows-latest, r: 'release'} + - {os: macOS-latest, r: 'release'} + - {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} + - {os: ubuntu-20.04, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest", http-user-agent: "R/4.1.0 (ubuntu-20.04) R (4.1.0 x86_64-pc-linux-gnu x86_64 linux-gnu) on GitHub Actions" } + + env: + R_REMOTES_NO_ERRORS_FROM_WARNINGS: true + RSPM: ${{ matrix.config.rspm }} + GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} + + steps: + - uses: actions/checkout@v2 + + - uses: r-lib/actions/setup-r@v1 + with: + r-version: ${{ matrix.config.r }} + + - uses: r-lib/actions/setup-pandoc@v1 + + - name: Query dependencies + run: | + install.packages('remotes') + saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2) + writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version") + shell: Rscript {0} + + - name: Restore R package cache + uses: actions/cache@v2 + with: + path: ${{ env.R_LIBS_USER }} + key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }} + restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1- + + - name: Install system dependencies + if: runner.os == 'Linux' + run: | + while read -r cmd + do + eval sudo $cmd + done < <(Rscript -e 'writeLines(remotes::system_requirements("ubuntu", "20.04"))') + + - name: Install dependencies + run: | + remotes::install_deps(dependencies = TRUE) + remotes::install_cran("rcmdcheck") + shell: Rscript {0} + + - name: Check + env: + _R_CHECK_CRAN_INCOMING_REMOTE_: false + run: | + options(crayon.enabled = TRUE) + rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check") + shell: Rscript {0} + + - name: Upload check results + if: failure() + uses: actions/upload-artifact@main + with: + name: ${{ runner.os }}-r${{ matrix.config.r }}-results + path: check From a5c1678a8fc04a750a53b73ad1001f174d8faa6f Mon Sep 17 00:00:00 2001 From: Thomas Bouffard <27200110+tbouffard@users.noreply.github.com> Date: Thu, 26 Aug 2021 15:16:43 +0200 Subject: [PATCH 02/16] clean wf --- .github/workflows/check-standard.yaml | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/.github/workflows/check-standard.yaml b/.github/workflows/check-standard.yaml index cea7ca2..84f3804 100644 --- a/.github/workflows/check-standard.yaml +++ b/.github/workflows/check-standard.yaml @@ -1,14 +1,13 @@ +# Initially created by following https://orchid00.github.io/actions_sandbox/packageci.html#set-up-package # For help debugging build failures open an issue on the RStudio community with the 'github-actions' tag. # https://community.rstudio.com/new-topic?category=Package%20development&tags=github-actions on: push: branches: - main - - master pull_request: branches: - main - - master name: R-CMD-check @@ -22,15 +21,22 @@ jobs: fail-fast: false matrix: config: - - {os: windows-latest, r: 'release'} - - {os: macOS-latest, r: 'release'} - - {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} - - {os: ubuntu-20.04, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest", http-user-agent: "R/4.1.0 (ubuntu-20.04) R (4.1.0 x86_64-pc-linux-gnu x86_64 linux-gnu) on GitHub Actions" } + - {os: ubuntu-20.04, r: 'release'} + + # - {os: ubuntu-18.04, r: '3.6'} + # - {os: ubuntu-18.04, r: '3.5'} + # - {os: ubuntu-18.04, r: '3.4'} + + + # - {os: windows-latest, r: 'release'} + # - {os: macOS-latest, r: 'release'} + # - {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} + # - {os: ubuntu-20.04, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest", http-user-agent: "R/4.1.0 (ubuntu-20.04) R (4.1.0 x86_64-pc-linux-gnu x86_64 linux-gnu) on GitHub Actions" } env: R_REMOTES_NO_ERRORS_FROM_WARNINGS: true - RSPM: ${{ matrix.config.rspm }} - GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} + RSPM: https://packagemanager.rstudio.com/cran/__linux__/focal/latest + # GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} steps: - uses: actions/checkout@v2 @@ -77,6 +83,11 @@ jobs: rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check") shell: Rscript {0} + # - name: Show testthat output + # if: always() + # run: find check -name 'testthat.Rout*' -exec cat '{}' \; || true + # shell: bash + - name: Upload check results if: failure() uses: actions/upload-artifact@main From 582eaa9bc4202d982f2782da7d1504410b1c7934 Mon Sep 17 00:00:00 2001 From: Thomas Bouffard <27200110+tbouffard@users.noreply.github.com> Date: Thu, 26 Aug 2021 15:17:41 +0200 Subject: [PATCH 03/16] rename wf --- .github/workflows/R-CMD-check.yaml | 82 +++++++++++++++-------- .github/workflows/check-standard.yaml | 96 --------------------------- 2 files changed, 55 insertions(+), 123 deletions(-) delete mode 100644 .github/workflows/check-standard.yaml diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index e6425cf..84f3804 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -1,14 +1,13 @@ -# NOTE: This workflow is overkill for most R packages -# check-standard.yaml is likely a better choice -# usethis::use_github_action("check-standard") will install it. -# +# Initially created by following https://orchid00.github.io/actions_sandbox/packageci.html#set-up-package # For help debugging build failures open an issue on the RStudio community with the 'github-actions' tag. # https://community.rstudio.com/new-topic?category=Package%20development&tags=github-actions on: push: - branches: [main, master] + branches: + - main pull_request: - branches: [main, master] + branches: + - main name: R-CMD-check @@ -22,47 +21,76 @@ jobs: fail-fast: false matrix: config: - - {os: macOS-latest, r: 'release'} - - {os: windows-latest, r: 'release'} - - {os: windows-latest, r: '3.6'} - - {os: ubuntu-18.04, r: 'devel', http-user-agent: 'release'} - - {os: ubuntu-18.04, r: 'release'} - - {os: ubuntu-18.04, r: 'oldrel'} - - {os: ubuntu-18.04, r: '3.6'} - - {os: ubuntu-18.04, r: '3.5'} - - {os: ubuntu-18.04, r: '3.4'} + - {os: ubuntu-20.04, r: 'release'} + + # - {os: ubuntu-18.04, r: '3.6'} + # - {os: ubuntu-18.04, r: '3.5'} + # - {os: ubuntu-18.04, r: '3.4'} + + + # - {os: windows-latest, r: 'release'} + # - {os: macOS-latest, r: 'release'} + # - {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} + # - {os: ubuntu-20.04, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest", http-user-agent: "R/4.1.0 (ubuntu-20.04) R (4.1.0 x86_64-pc-linux-gnu x86_64 linux-gnu) on GitHub Actions" } env: - RSPM: https://packagemanager.rstudio.com/cran/__linux__/bionic/latest - GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} + R_REMOTES_NO_ERRORS_FROM_WARNINGS: true + RSPM: https://packagemanager.rstudio.com/cran/__linux__/focal/latest + # GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} steps: - uses: actions/checkout@v2 - - uses: r-lib/actions/setup-pandoc@v1 + - uses: r-lib/actions/setup-r@v1 with: r-version: ${{ matrix.config.r }} - http-user-agent: ${{ matrix.config.http-user-agent }} - - uses: r-lib/actions/setup-r-dependencies@master + + - uses: r-lib/actions/setup-pandoc@v1 + + - name: Query dependencies + run: | + install.packages('remotes') + saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2) + writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version") + shell: Rscript {0} + + - name: Restore R package cache + uses: actions/cache@v2 with: - extra-packages: rcmdcheck + path: ${{ env.R_LIBS_USER }} + key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }} + restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1- + + - name: Install system dependencies + if: runner.os == 'Linux' + run: | + while read -r cmd + do + eval sudo $cmd + done < <(Rscript -e 'writeLines(remotes::system_requirements("ubuntu", "20.04"))') + + - name: Install dependencies + run: | + remotes::install_deps(dependencies = TRUE) + remotes::install_cran("rcmdcheck") + shell: Rscript {0} - name: Check env: - _R_CHECK_CRAN_INCOMING_: false + _R_CHECK_CRAN_INCOMING_REMOTE_: false run: | options(crayon.enabled = TRUE) rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check") shell: Rscript {0} - - name: Show testthat output - if: always() - run: find check -name 'testthat.Rout*' -exec cat '{}' \; || true - shell: bash + # - name: Show testthat output + # if: always() + # run: find check -name 'testthat.Rout*' -exec cat '{}' \; || true + # shell: bash - name: Upload check results if: failure() uses: actions/upload-artifact@main with: - name: ${{ matrix.config.os }}-r${{ matrix.config.r }}-results + name: ${{ runner.os }}-r${{ matrix.config.r }}-results path: check diff --git a/.github/workflows/check-standard.yaml b/.github/workflows/check-standard.yaml deleted file mode 100644 index 84f3804..0000000 --- a/.github/workflows/check-standard.yaml +++ /dev/null @@ -1,96 +0,0 @@ -# Initially created by following https://orchid00.github.io/actions_sandbox/packageci.html#set-up-package -# For help debugging build failures open an issue on the RStudio community with the 'github-actions' tag. -# https://community.rstudio.com/new-topic?category=Package%20development&tags=github-actions -on: - push: - branches: - - main - pull_request: - branches: - - main - -name: R-CMD-check - -jobs: - R-CMD-check: - runs-on: ${{ matrix.config.os }} - - name: ${{ matrix.config.os }} (${{ matrix.config.r }}) - - strategy: - fail-fast: false - matrix: - config: - - {os: ubuntu-20.04, r: 'release'} - - # - {os: ubuntu-18.04, r: '3.6'} - # - {os: ubuntu-18.04, r: '3.5'} - # - {os: ubuntu-18.04, r: '3.4'} - - - # - {os: windows-latest, r: 'release'} - # - {os: macOS-latest, r: 'release'} - # - {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} - # - {os: ubuntu-20.04, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest", http-user-agent: "R/4.1.0 (ubuntu-20.04) R (4.1.0 x86_64-pc-linux-gnu x86_64 linux-gnu) on GitHub Actions" } - - env: - R_REMOTES_NO_ERRORS_FROM_WARNINGS: true - RSPM: https://packagemanager.rstudio.com/cran/__linux__/focal/latest - # GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} - - steps: - - uses: actions/checkout@v2 - - - uses: r-lib/actions/setup-r@v1 - with: - r-version: ${{ matrix.config.r }} - - - uses: r-lib/actions/setup-pandoc@v1 - - - name: Query dependencies - run: | - install.packages('remotes') - saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2) - writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version") - shell: Rscript {0} - - - name: Restore R package cache - uses: actions/cache@v2 - with: - path: ${{ env.R_LIBS_USER }} - key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }} - restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1- - - - name: Install system dependencies - if: runner.os == 'Linux' - run: | - while read -r cmd - do - eval sudo $cmd - done < <(Rscript -e 'writeLines(remotes::system_requirements("ubuntu", "20.04"))') - - - name: Install dependencies - run: | - remotes::install_deps(dependencies = TRUE) - remotes::install_cran("rcmdcheck") - shell: Rscript {0} - - - name: Check - env: - _R_CHECK_CRAN_INCOMING_REMOTE_: false - run: | - options(crayon.enabled = TRUE) - rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check") - shell: Rscript {0} - - # - name: Show testthat output - # if: always() - # run: find check -name 'testthat.Rout*' -exec cat '{}' \; || true - # shell: bash - - - name: Upload check results - if: failure() - uses: actions/upload-artifact@main - with: - name: ${{ runner.os }}-r${{ matrix.config.r }}-results - path: check From e313f7aaf051ed4306196397b468fd1f732165f5 Mon Sep 17 00:00:00 2001 From: Thomas Bouffard <27200110+tbouffard@users.noreply.github.com> Date: Thu, 26 Aug 2021 15:23:24 +0200 Subject: [PATCH 04/16] use r 4.1.1 --- .github/workflows/R-CMD-check.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 84f3804..57a9cf8 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -14,15 +14,18 @@ name: R-CMD-check jobs: R-CMD-check: runs-on: ${{ matrix.config.os }} - +# TODO matrix.config.os --> runner.os name: ${{ matrix.config.os }} (${{ matrix.config.r }}) strategy: fail-fast: false matrix: config: - - {os: ubuntu-20.04, r: 'release'} + # - {os: ubuntu-20.04, r: 'release'} + - {os: ubuntu-20.04, r: '4.1.1'} + + # - {os: ubuntu-18.04, r: '3.6'} # - {os: ubuntu-18.04, r: '3.5'} # - {os: ubuntu-18.04, r: '3.4'} From bcd9cf5205207025704915df1eea1dc3b9987fd5 Mon Sep 17 00:00:00 2001 From: Thomas Bouffard <27200110+tbouffard@users.noreply.github.com> Date: Thu, 26 Aug 2021 15:33:34 +0200 Subject: [PATCH 05/16] Also check with R 3.6.3 + clean wf --- .github/workflows/R-CMD-check.yaml | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 57a9cf8..ea8cb02 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -14,28 +14,15 @@ name: R-CMD-check jobs: R-CMD-check: runs-on: ${{ matrix.config.os }} -# TODO matrix.config.os --> runner.os name: ${{ matrix.config.os }} (${{ matrix.config.r }}) strategy: fail-fast: false matrix: config: - # - {os: ubuntu-20.04, r: 'release'} - + - {os: ubuntu-20.04, r: '3.6.3'} - {os: ubuntu-20.04, r: '4.1.1'} - - # - {os: ubuntu-18.04, r: '3.6'} - # - {os: ubuntu-18.04, r: '3.5'} - # - {os: ubuntu-18.04, r: '3.4'} - - - # - {os: windows-latest, r: 'release'} - # - {os: macOS-latest, r: 'release'} - # - {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} - # - {os: ubuntu-20.04, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest", http-user-agent: "R/4.1.0 (ubuntu-20.04) R (4.1.0 x86_64-pc-linux-gnu x86_64 linux-gnu) on GitHub Actions" } - env: R_REMOTES_NO_ERRORS_FROM_WARNINGS: true RSPM: https://packagemanager.rstudio.com/cran/__linux__/focal/latest @@ -86,6 +73,7 @@ jobs: rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check") shell: Rscript {0} + # TODO use when introducing tests (https://github.com/process-analytics/bpmn-visualization-R/issues/6) # - name: Show testthat output # if: always() # run: find check -name 'testthat.Rout*' -exec cat '{}' \; || true @@ -95,5 +83,5 @@ jobs: if: failure() uses: actions/upload-artifact@main with: - name: ${{ runner.os }}-r${{ matrix.config.r }}-results + name: ${{ matrix.config.os }}-r${{ matrix.config.r }}-results path: check From 26978b725579bcaf4e6718499b7cdea514f4b518 Mon Sep 17 00:00:00 2001 From: Thomas Bouffard <27200110+tbouffard@users.noreply.github.com> Date: Thu, 26 Aug 2021 15:49:53 +0200 Subject: [PATCH 06/16] README: update gh wf badge --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1fbc198..fbff847 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@ GitHub release (latest by date including pre-releases) - - Build + + Build
From 7d06a73d1edbace6883831bdef93095858c2bb91 Mon Sep 17 00:00:00 2001 From: Thomas Bouffard <27200110+tbouffard@users.noreply.github.com> Date: Thu, 26 Aug 2021 15:57:59 +0200 Subject: [PATCH 07/16] project: update .Rbuildignore --- .Rbuildignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.Rbuildignore b/.Rbuildignore index c503c4f..d325fbf 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -1 +1,3 @@ ^\.github$ +^.*\.Rproj$ +^\.Rproj\.user$ From 8927d647a1de51592789703784e27419cc43f6e0 Mon Sep 17 00:00:00 2001 From: Thomas Bouffard <27200110+tbouffard@users.noreply.github.com> Date: Thu, 26 Aug 2021 15:59:31 +0200 Subject: [PATCH 08/16] Project: description not '1.0' version --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index bae367d..93bb3d5 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: bpmnVisualization Type: Package Title: BPMN Visualization - R package -Version: 1.0 +Version: 0.1.0 Date: 2021-08-25 Authors@R: c(person("Céline Souchet", "Developer", role = c("aut", "cre"), email = "celine.souchet@bonitasoft.com"), person("Thomas Bouffard", "Developer", role = "aut")) From 8d0d303936ab4ea0341e19b919beb49265684334 Mon Sep 17 00:00:00 2001 From: Thomas Bouffard <27200110+tbouffard@users.noreply.github.com> Date: Thu, 26 Aug 2021 16:00:35 +0200 Subject: [PATCH 09/16] project DESCRIPTION: do not set date (don't want to maintain this) --- DESCRIPTION | 1 - 1 file changed, 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 93bb3d5..01c0c13 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -2,7 +2,6 @@ Package: bpmnVisualization Type: Package Title: BPMN Visualization - R package Version: 0.1.0 -Date: 2021-08-25 Authors@R: c(person("Céline Souchet", "Developer", role = c("aut", "cre"), email = "celine.souchet@bonitasoft.com"), person("Thomas Bouffard", "Developer", role = "aut")) Description: A R package which embeds BPMN Visualization From 3fb9663d1d9172a74b95766e2ef3948a94e96fe5 Mon Sep 17 00:00:00 2001 From: Thomas Bouffard <27200110+tbouffard@users.noreply.github.com> Date: Thu, 26 Aug 2021 16:07:08 +0200 Subject: [PATCH 10/16] projet DESCRIPTION fix authors --- DESCRIPTION | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 01c0c13..e10d7cf 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -2,8 +2,7 @@ Package: bpmnVisualization Type: Package Title: BPMN Visualization - R package Version: 0.1.0 -Authors@R: c(person("Céline Souchet", "Developer", role = c("aut", "cre"), email = "celine.souchet@bonitasoft.com"), - person("Thomas Bouffard", "Developer", role = "aut")) -Description: A R package which embeds BPMN Visualization -License: Apache-2.0 +Authors@R: c(person("Celine", "Souchet", role = c("aut", "cre"), email = "celine.souchet@bonitasoft.com"), + person("Thomas", "Bouffard", role = "aut")) +Description: A R package which embeds BPMN VisualizationLicense: Apache-2.0 Copyright: Bonitasoft S.A. From 7a0d8fd2c2a74d7007bfa05bdca5f56db93495a2 Mon Sep 17 00:00:00 2001 From: Thomas Bouffard <27200110+tbouffard@users.noreply.github.com> Date: Thu, 26 Aug 2021 16:10:59 +0200 Subject: [PATCH 11/16] project DESCRIPTION: add URL and BugReports --- DESCRIPTION | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DESCRIPTION b/DESCRIPTION index e10d7cf..c97352c 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -6,3 +6,5 @@ Authors@R: c(person("Celine", "Souchet", role = c("aut", "cre"), email = "celine person("Thomas", "Bouffard", role = "aut")) Description: A R package which embeds BPMN VisualizationLicense: Apache-2.0 Copyright: Bonitasoft S.A. +URL: https://github.com/process-analytics/bpmn-visualization-R +BugReports: https://github.com/process-analytics/bpmn-visualization-R/issues \ No newline at end of file From 613202730070c414742e428ae5be3c7f47631936 Mon Sep 17 00:00:00 2001 From: Thomas Bouffard <27200110+tbouffard@users.noreply.github.com> Date: Thu, 26 Aug 2021 16:13:19 +0200 Subject: [PATCH 12/16] project DESCRIPTION: restore correct license entry --- DESCRIPTION | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index c97352c..058ae6c 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -4,7 +4,8 @@ Title: BPMN Visualization - R package Version: 0.1.0 Authors@R: c(person("Celine", "Souchet", role = c("aut", "cre"), email = "celine.souchet@bonitasoft.com"), person("Thomas", "Bouffard", role = "aut")) -Description: A R package which embeds BPMN VisualizationLicense: Apache-2.0 +Description: A R package which embeds BPMN Visualization +License: Apache-2.0 Copyright: Bonitasoft S.A. URL: https://github.com/process-analytics/bpmn-visualization-R BugReports: https://github.com/process-analytics/bpmn-visualization-R/issues \ No newline at end of file From c33d708c53378993a517be245dda135737687627 Mon Sep 17 00:00:00 2001 From: Thomas Bouffard <27200110+tbouffard@users.noreply.github.com> Date: Thu, 26 Aug 2021 16:17:48 +0200 Subject: [PATCH 13/16] project DESCRIPTION: update description --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 058ae6c..d942617 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -4,7 +4,7 @@ Title: BPMN Visualization - R package Version: 0.1.0 Authors@R: c(person("Celine", "Souchet", role = c("aut", "cre"), email = "celine.souchet@bonitasoft.com"), person("Thomas", "Bouffard", role = "aut")) -Description: A R package which embeds BPMN Visualization +Description: A R package which embeds BPMN Visualization. License: Apache-2.0 Copyright: Bonitasoft S.A. URL: https://github.com/process-analytics/bpmn-visualization-R From b596807fa1ae85a5d30dffcf54536008a4506c8d Mon Sep 17 00:00:00 2001 From: Thomas Bouffard <27200110+tbouffard@users.noreply.github.com> Date: Thu, 26 Aug 2021 16:27:48 +0200 Subject: [PATCH 14/16] project settigs: fix declared license --- .Rbuildignore | 2 ++ DESCRIPTION | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.Rbuildignore b/.Rbuildignore index d325fbf..f56b928 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -1,3 +1,5 @@ ^\.github$ ^.*\.Rproj$ ^\.Rproj\.user$ +^CONTRIBUTING\.md$ +^LICENSE$ diff --git a/DESCRIPTION b/DESCRIPTION index d942617..c828872 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -5,7 +5,7 @@ Version: 0.1.0 Authors@R: c(person("Celine", "Souchet", role = c("aut", "cre"), email = "celine.souchet@bonitasoft.com"), person("Thomas", "Bouffard", role = "aut")) Description: A R package which embeds BPMN Visualization. -License: Apache-2.0 +License: Apache License (== 2) Copyright: Bonitasoft S.A. URL: https://github.com/process-analytics/bpmn-visualization-R -BugReports: https://github.com/process-analytics/bpmn-visualization-R/issues \ No newline at end of file +BugReports: https://github.com/process-analytics/bpmn-visualization-R/issues From a1a718f70954726f552d5ef2f7ad2e08cb4968c3 Mon Sep 17 00:00:00 2001 From: Thomas Bouffard <27200110+tbouffard@users.noreply.github.com> Date: Thu, 26 Aug 2021 16:45:54 +0200 Subject: [PATCH 15/16] project Rd file: fix ' All text must be in a section' line 27-28 --- man/bpmnVisualization-package.Rd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/man/bpmnVisualization-package.Rd b/man/bpmnVisualization-package.Rd index 9e801cc..d8ebe59 100644 --- a/man/bpmnVisualization-package.Rd +++ b/man/bpmnVisualization-package.Rd @@ -24,9 +24,10 @@ Maintainer: \packageMaintainer{bpmnVisualization} \references{ ~~ Literature or other references for background information ~~ } +\keyword{ ~~ Optionally other standard keywords, one per line, from file KEYWORDS in ~~ ~~ the R documentation directory ~~ -\keyword{ package } +} \seealso{ ~~ Optional links to other man pages, e.g. ~~ ~~ \code{\link[:-package]{}} ~~ From b291284078ffebd3957814785f585017bbb2eb2c Mon Sep 17 00:00:00 2001 From: Thomas Bouffard <27200110+tbouffard@users.noreply.github.com> Date: Thu, 26 Aug 2021 16:54:49 +0200 Subject: [PATCH 16/16] Remove commented config in GH wf --- .github/workflows/R-CMD-check.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index ea8cb02..0b5b742 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -26,7 +26,6 @@ jobs: env: R_REMOTES_NO_ERRORS_FROM_WARNINGS: true RSPM: https://packagemanager.rstudio.com/cran/__linux__/focal/latest - # GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} steps: - uses: actions/checkout@v2