From 0deb97b00f6b0bee8525843c3f60b167c4cdf52f Mon Sep 17 00:00:00 2001 From: Paolo Di Lorenzo Date: Sun, 31 Mar 2024 17:19:59 -0400 Subject: [PATCH] Set other workflows to re-use usmapdata workflow scripts --- .github/workflows/check.yaml | 45 +++---------------------- .github/workflows/lintr.yml | 39 +++------------------- .github/workflows/test-coverage.yaml | 49 ++++------------------------ 3 files changed, 14 insertions(+), 119 deletions(-) diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index 9bb6413..d43c7fd 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -1,4 +1,5 @@ -# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples + +name: check on: push: @@ -6,45 +7,7 @@ on: pull_request: branches: master -name: check - jobs: 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: 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@v4 - - - uses: r-lib/actions/setup-pandoc@v2 - - - 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 - - - uses: r-lib/actions/setup-r-dependencies@v2 - with: - extra-packages: any::rcmdcheck - needs: check - - - uses: r-lib/actions/check-r-package@v2 - with: - upload-snapshots: true - build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")' + uses: pdil/usmapdata/.github/workflows/check.yaml@master + secrets: inherit diff --git a/.github/workflows/lintr.yml b/.github/workflows/lintr.yml index b80661f..de0d74e 100644 --- a/.github/workflows/lintr.yml +++ b/.github/workflows/lintr.yml @@ -1,47 +1,16 @@ -# lintr provides static code analysis for R. -# It checks for adherence to a given style, -# identifying syntax errors and possible semantic issues, -# then reports them to you so you can take action. -# More details at https://lintr.r-lib.org/ name: lintr on: push: - branches: [ "master" ] + branches: master pull_request: - branches: [ "master" ] + branches: master permissions: contents: read jobs: lintr: - name: Run lintr scanning - runs-on: ubuntu-latest - permissions: - contents: read # for checkout to fetch code - security-events: write # for github/codeql-action/upload-sarif to upload SARIF results - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Setup R - uses: r-lib/actions/setup-r@v2 - - - name: Setup lintr - uses: r-lib/actions/setup-r-dependencies@v2 - with: - extra-packages: lintr - - - name: Run lintr - run: lintr::sarif_output(lintr::lint_dir("."), "lintr-results.sarif") - shell: Rscript {0} - continue-on-error: true - - - name: Upload analysis results to GitHub - uses: github/codeql-action/upload-sarif@v3 - with: - sarif_file: lintr-results.sarif - wait-for-processing: true + uses: pdil/usmapdata/.github/workflows/lintr.yaml@master + secrets: inherit diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml index 9b5dcb7..b3ed8fe 100644 --- a/.github/workflows/test-coverage.yaml +++ b/.github/workflows/test-coverage.yaml @@ -1,50 +1,13 @@ -# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples + +name: test-coverage on: push: - branches: [main, master] + branches: master pull_request: - branches: [main, master] - -name: test-coverage + branches: master jobs: test-coverage: - runs-on: ubuntu-latest - env: - GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} - - steps: - - uses: actions/checkout@v4 - - - 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@v4 - with: - name: coverage-test-failures - path: ${{ runner.temp }}/package + uses: pdil/usmapdata/.github/workflows/test-coverage.yaml@master + secrets: inherit