From 8a78b4060ce6c417c1844fe912bb270fd6421e41 Mon Sep 17 00:00:00 2001 From: Konstantin Date: Fri, 26 Jan 2024 08:12:38 +0100 Subject: [PATCH 1/3] pkgdown.yaml --- .github/workflows/coverage.yaml | 50 ---------------------- .github/workflows/pkgdown.yaml | 18 ++++++++ .github/workflows/rcmdcheck.yaml | 71 -------------------------------- 3 files changed, 18 insertions(+), 121 deletions(-) delete mode 100644 .github/workflows/coverage.yaml create mode 100644 .github/workflows/pkgdown.yaml delete mode 100644 .github/workflows/rcmdcheck.yaml diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml deleted file mode 100644 index cf9fa24..0000000 --- a/.github/workflows/coverage.yaml +++ /dev/null @@ -1,50 +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] - -name: test-coverage - -jobs: - test-coverage: - runs-on: ubuntu-latest - env: - GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} - - steps: - - uses: actions/checkout@v3 - - - uses: r-lib/actions/setup-r@v2 - with: - use-public-rspm: true - - - uses: r-lib/actions/setup-r-dependencies@v2 - with: - extra-packages: any::covr - needs: coverage - - - name: Test coverage - run: | - covr::codecov( - quiet = FALSE, - clean = FALSE, - install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package") - ) - shell: Rscript {0} - - - name: Show testthat output - if: always() - run: | - ## -------------------------------------------------------------------- - find ${{ runner.temp }}/package -name 'testthat.Rout*' -exec cat '{}' \; || true - shell: bash - - - name: Upload test results - if: failure() - uses: actions/upload-artifact@v3 - with: - name: coverage-test-failures - path: ${{ runner.temp }}/package \ No newline at end of file diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml new file mode 100644 index 0000000..f7afab1 --- /dev/null +++ b/.github/workflows/pkgdown.yaml @@ -0,0 +1,18 @@ +--- +name: Docs + +on: + push: + branches: [ pkgdown ] + pull_request: + branches: [ pkgdown ] + +jobs: + docs: + name: Pkgdown Documentation + uses: insightsengineering/r.pkg.template/.github/workflows/pkgdown.yaml@main + secrets: + REPO_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # with: + # install-system-dependencies: true + # upgrade-remotes: true \ No newline at end of file diff --git a/.github/workflows/rcmdcheck.yaml b/.github/workflows/rcmdcheck.yaml deleted file mode 100644 index 3857ada..0000000 --- a/.github/workflows/rcmdcheck.yaml +++ /dev/null @@ -1,71 +0,0 @@ -# Workflow derived from https://github.com/r-lib/actions/tree/master/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] - -name: CI - -jobs: - CI: - 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: 'devel'} - - {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'} - - {os: ubuntu-latest, r: 'release'} - - {os: ubuntu-latest, r: 'oldrel-1'} - - env: - GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} - R_KEEP_PKG_SOURCE: yes - - steps: - - uses: actions/checkout@v3 - - - uses: r-lib/actions/setup-pandoc@v2 - - - name: Install xquartz - if: runner.os == 'macOS' - run: brew install --cask xquartz - - - uses: r-lib/actions/setup-r@v2 - with: - r-version: ${{ matrix.config.r }} - http-user-agent: ${{ matrix.config.http-user-agent }} - use-public-rspm: true - Ncpus: '2' - - - name: Install dependencies (Win) - if: runner.os == 'windows' - uses: r-lib/actions/setup-r-dependencies@v2 - with: - extra-packages: any::rcmdcheck - needs: check - error_on: ${{ env.RCMDCHECK_ERROR_ON || 'error,warning' }} - - - name: Install dependencies (Non-Win) - if: runner.os != 'windows' - uses: r-lib/actions/setup-r-dependencies@v2 - with: - extra-packages: any::rcmdcheck, cran/randomForest@4.6-14, cran/XML@3.99-0.8 - needs: check - error_on: ${{ env.RCMDCHECK_ERROR_ON || 'error,warning' }} - - - name: Install RF - if: ${{ matrix.config.r != 'oldrel-1' }} - run: install.packages("randomForest") - shell: Rscript {0} - - - uses: r-lib/actions/check-r-package@v2 - with: - upload-snapshots: true From 771eb356d58a7479e910f07fc76bb99e215a8431 Mon Sep 17 00:00:00 2001 From: Konstantin Date: Fri, 26 Jan 2024 08:29:04 +0100 Subject: [PATCH 2/3] old workflowfiles --- .github/workflows/coverage.yaml | 50 ++++++++++++++++++++++ .github/workflows/pkgdown.yaml | 18 -------- .github/workflows/rcmdcheck.yaml | 71 ++++++++++++++++++++++++++++++++ 3 files changed, 121 insertions(+), 18 deletions(-) create mode 100644 .github/workflows/coverage.yaml delete mode 100644 .github/workflows/pkgdown.yaml create mode 100644 .github/workflows/rcmdcheck.yaml diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml new file mode 100644 index 0000000..cf9fa24 --- /dev/null +++ b/.github/workflows/coverage.yaml @@ -0,0 +1,50 @@ +# 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] + +name: test-coverage + +jobs: + test-coverage: + runs-on: ubuntu-latest + env: + GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} + + steps: + - uses: actions/checkout@v3 + + - uses: r-lib/actions/setup-r@v2 + with: + use-public-rspm: true + + - uses: r-lib/actions/setup-r-dependencies@v2 + with: + extra-packages: any::covr + needs: coverage + + - name: Test coverage + run: | + covr::codecov( + quiet = FALSE, + clean = FALSE, + install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package") + ) + shell: Rscript {0} + + - name: Show testthat output + if: always() + run: | + ## -------------------------------------------------------------------- + find ${{ runner.temp }}/package -name 'testthat.Rout*' -exec cat '{}' \; || true + shell: bash + + - name: Upload test results + if: failure() + uses: actions/upload-artifact@v3 + with: + name: coverage-test-failures + path: ${{ runner.temp }}/package \ No newline at end of file diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml deleted file mode 100644 index f7afab1..0000000 --- a/.github/workflows/pkgdown.yaml +++ /dev/null @@ -1,18 +0,0 @@ ---- -name: Docs - -on: - push: - branches: [ pkgdown ] - pull_request: - branches: [ pkgdown ] - -jobs: - docs: - name: Pkgdown Documentation - uses: insightsengineering/r.pkg.template/.github/workflows/pkgdown.yaml@main - secrets: - REPO_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # with: - # install-system-dependencies: true - # upgrade-remotes: true \ No newline at end of file diff --git a/.github/workflows/rcmdcheck.yaml b/.github/workflows/rcmdcheck.yaml new file mode 100644 index 0000000..0133ac8 --- /dev/null +++ b/.github/workflows/rcmdcheck.yaml @@ -0,0 +1,71 @@ +# Workflow derived from https://github.com/r-lib/actions/tree/master/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] + +name: CI + +jobs: + CI: + 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: 'devel'} + - {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'} + - {os: ubuntu-latest, r: 'release'} + - {os: ubuntu-latest, r: 'oldrel-1'} + + env: + GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} + R_KEEP_PKG_SOURCE: yes + + steps: + - uses: actions/checkout@v3 + + - uses: r-lib/actions/setup-pandoc@v2 + + - name: Install xquartz + if: runner.os == 'macOS' + run: brew install --cask xquartz + + - uses: r-lib/actions/setup-r@v2 + with: + r-version: ${{ matrix.config.r }} + http-user-agent: ${{ matrix.config.http-user-agent }} + use-public-rspm: true + Ncpus: '2' + + - name: Install dependencies (Win) + if: runner.os == 'windows' + uses: r-lib/actions/setup-r-dependencies@v2 + with: + extra-packages: any::rcmdcheck + needs: check + error_on: ${{ env.RCMDCHECK_ERROR_ON || 'error,warning' }} + + - name: Install dependencies (Non-Win) + if: runner.os != 'windows' + uses: r-lib/actions/setup-r-dependencies@v2 + with: + extra-packages: any::rcmdcheck, cran/randomForest@4.6-14, cran/XML@3.99-0.8 + needs: check + error_on: ${{ env.RCMDCHECK_ERROR_ON || 'error,warning' }} + + - name: Install RF + if: ${{ matrix.config.r != 'oldrel-1' }} + run: install.packages("randomForest") + shell: Rscript {0} + + - uses: r-lib/actions/check-r-package@v2 + with: + upload-snapshots: true \ No newline at end of file From 7ee32333ee7c59543ee03b8fafb49485523622a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20M=C3=BCller?= <116877035+KonstiDE@users.noreply.github.com> Date: Sat, 3 Feb 2024 10:07:22 +0100 Subject: [PATCH 3/3] New badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 005054a..fd329a2 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ [![CI](https://github.com/bleutner/RStoolbox/actions/workflows/rcmdcheck.yaml/badge.svg)](https://github.com/bleutner/RStoolbox/actions/workflows/rcmdcheck.yaml) [![CRAN version](https://www.r-pkg.org/badges/version/RStoolbox)](https://CRAN.R-project.org/package=RStoolbox) [![codecov](https://codecov.io/gh/bleutner/RStoolbox/branch/master/graph/badge.svg)](https://app.codecov.io/gh/bleutner/RStoolbox) +[![Downloads](http://cranlogs.r-pkg.org/badges/RStoolbox)](https://www.r-pkg.org:443/pkg/RStoolbox) RStoolbox is an R package providing a wide range of tools for your every-day remote sensing processing needs. The available tool-set covers many aspects from data import, pre-processing, data analysis, image classification and graphical display. RStoolbox builds upon the terra package, which makes it suitable for processing large data-sets even on smaller workstations.