From 4f04932e2127e74f325c2dc60ca2184641e118e1 Mon Sep 17 00:00:00 2001 From: sorinvoicu <61691256+sorinvoicu@users.noreply.github.com> Date: Fri, 5 Apr 2024 12:11:38 +0000 Subject: [PATCH 1/3] remove links.yml deps --- .github/workflows/links.yml | 44 --------------------------------- .github/workflows/pkgdown.yml | 6 +++++ .github/workflows/shared_ci.yml | 4 --- README.md | 1 - workflows.md | 7 ------ 5 files changed, 6 insertions(+), 56 deletions(-) delete mode 100644 .github/workflows/links.yml diff --git a/.github/workflows/links.yml b/.github/workflows/links.yml deleted file mode 100644 index 11165ca..0000000 --- a/.github/workflows/links.yml +++ /dev/null @@ -1,44 +0,0 @@ ---- -name: Check URLs 🌐 - -on: - pull_request: - types: - - opened - - synchronize - - reopened - - ready_for_review - branches: - - main - push: - branches: - - main - workflow_call: - -concurrency: - group: links-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: true - -jobs: - links: - name: ${{ vars.CI_IMAGE }} - runs-on: ubuntu-latest - - steps: - - name: Checkout project ⬇️ - uses: actions/checkout@v4 - - - name: Check URLs 🌐 - uses: lycheeverse/lychee-action@v1 - with: - fail: true - args: >- - --verbose - --no-progress - --exclude "https://github.com.*.tar.gz" - **/*.md - **/*.Rmd - **/*.html - **/*.yml - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/pkgdown.yml b/.github/workflows/pkgdown.yml index 6e8b2f2..8379de9 100644 --- a/.github/workflows/pkgdown.yml +++ b/.github/workflows/pkgdown.yml @@ -37,7 +37,13 @@ jobs: run: pkgdown::build_site() shell: Rscript {0} + - name: Check URLs 🌐 + run: | + lychee . --format markdown --verbose --no-progress >> $GITHUB_STEP_SUMMARY + shell: bash + - name: Checkout gh-pages branch ⬇️ + if: github.ref_name == 'main' uses: actions/checkout@v4 with: path: gh-pages diff --git a/.github/workflows/shared_ci.yml b/.github/workflows/shared_ci.yml index c1396b1..da38851 100644 --- a/.github/workflows/shared_ci.yml +++ b/.github/workflows/shared_ci.yml @@ -27,10 +27,6 @@ jobs: name: Pkgdown 📖 uses: boehringer-ingelheim/dv.templates/.github/workflows/pkgdown.yml@main - links: - name: Check URLs 🌐 - uses: boehringer-ingelheim/dv.templates/.github/workflows/links.yml@main - styler: name: Styler 🌐 uses: boehringer-ingelheim/dv.templates/.github/workflows/styler.yml@main \ No newline at end of file diff --git a/README.md b/README.md index 78b2362..125d0be 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,6 @@ [![Build status](https://github.com/boehringer-ingelheim/dv.templates/actions/workflows/lintr.yml/badge.svg)](https://github.com/boehringer-ingelheim/dv.templates/actions/workflows/lintr.yml?query=workflow) [![Build status](https://github.com/boehringer-ingelheim/dv.templates/actions/workflows/pkgdown.yml/badge.svg)](https://github.com/boehringer-ingelheim/dv.templates/actions/workflows/pkgdown.yml?query=workflow) [![Build status](https://github.com/boehringer-ingelheim/dv.templates/actions/workflows/roxygen.yml/badge.svg)](https://github.com/boehringer-ingelheim/dv.templates/actions/workflows/roxygen.yml?query=workflow) -[![Build status](https://github.com/boehringer-ingelheim/dv.templates/actions/workflows/links.yml/badge.svg)](https://github.com/boehringer-ingelheim/dv.templates/actions/workflows/links.yml?query=workflow) [![Build status](https://github.com/boehringer-ingelheim/dv.templates/actions/workflows/styler.yml/badge.svg)](https://github.com/boehringer-ingelheim/dv.templates/actions/workflows/styler.yml?query=workflow) An R package template with built-in GitHub Actions-based CI/CD workflows. diff --git a/workflows.md b/workflows.md index 0a6a2aa..e74009e 100644 --- a/workflows.md +++ b/workflows.md @@ -21,10 +21,6 @@ Generates a [`pkgdown`](https://pkgdown.r-lib.org/) website and uploads it to Gi Uses [`roxygen`](https://roxygen2.r-lib.org/) to generate `.Rd` files in the `man/` directory. It also checks if manuals are up-to-date with roxygen comments in the code. -### [`links.yml`](https://github.com/boehringer-ingelheim/dv.templates/blob/main/.github/workflows/links.yml) - -Checks for broken links inside the repository. - ### [`shared_ci.yml`](https://github.com/boehringer-ingelheim/dv.templates/blob/main/.github/workflows/shared_ci.yml) Builds a reusable workflow to be called from other repositories. @@ -72,7 +68,4 @@ jobs: name: Pkgdown 📖 uses: boehringer-ingelheim/dv.templates/.github/workflows/pkgdown.yml@main - links: - name: Check URLs 🌐 - uses: boehringer-ingelheim/dv.templates/.github/workflows/links.yml@main ``` From cb01c255198700135c41991c84ad5b9b315d26bb Mon Sep 17 00:00:00 2001 From: sorinvoicu <61691256+sorinvoicu@users.noreply.github.com> Date: Fri, 5 Apr 2024 12:15:43 +0000 Subject: [PATCH 2/3] fix logo path --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 125d0be..03781a6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# dv.templates +# dv.templates [![Build status](https://github.com/boehringer-ingelheim/dv.templates/actions/workflows/check.yml/badge.svg)](https://github.com/boehringer-ingelheim/dv.templates/actions/workflows/check.yml?query=workflow) [![Build status](https://github.com/boehringer-ingelheim/dv.templates/actions/workflows/gitleaks.yml/badge.svg)](https://github.com/boehringer-ingelheim/dv.templates/actions/workflows/gitleaks.yml?query=workflow) From 8ac3081d8b1be022945c729ddff6226fd19611cf Mon Sep 17 00:00:00 2001 From: sorinvoicu <61691256+sorinvoicu@users.noreply.github.com> Date: Fri, 5 Apr 2024 14:09:16 +0000 Subject: [PATCH 3/3] update logo path --- README.md | 2 +- {inst => man/figures}/repo-logo.svg | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename {inst => man/figures}/repo-logo.svg (100%) diff --git a/README.md b/README.md index 03781a6..8dd5ead 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# dv.templates +# dv.templates [![Build status](https://github.com/boehringer-ingelheim/dv.templates/actions/workflows/check.yml/badge.svg)](https://github.com/boehringer-ingelheim/dv.templates/actions/workflows/check.yml?query=workflow) [![Build status](https://github.com/boehringer-ingelheim/dv.templates/actions/workflows/gitleaks.yml/badge.svg)](https://github.com/boehringer-ingelheim/dv.templates/actions/workflows/gitleaks.yml?query=workflow) diff --git a/inst/repo-logo.svg b/man/figures/repo-logo.svg similarity index 100% rename from inst/repo-logo.svg rename to man/figures/repo-logo.svg