Skip to content

Commit 5cf93dc

Browse files
authored
Merge pull request #22 from NovoNordisk-OpenSource/fix/lycheignore
fix: regex for cran link
2 parents 3ae3fd7 + c494124 commit 5cf93dc

5 files changed

Lines changed: 24 additions & 9 deletions

File tree

.github/linters/.lycheeignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# Dead irrelevant path in pkgdown/favicon
22
http://svgjs.dev/svgjs
33
# Path to RSPM yet to be derived
4-
https://packagemanager.posit.co/cran/$%7B%7Bmatrix.config.date
4+
https://packagemanager.posit.co/cran/\$
5+
# Paths to workflows yet to be derived
6+
https://raw.githubusercontent.com/NovoNordisk-OpenSource/r.workflows/\$

.github/linters/.mega-linter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ DISABLE_LINTERS:
55
ADDITIONAL_EXCLUDED_DIRECTORIES:
66
- dev
77
REPOSITORY_KICS_ARGUMENTS: "--exclude-queries 555ab8f9-2001-455e-a077-f2d0f41e2fb9"
8-
SPELL_LYCHEE_ARGUMENTS: "--exclude-path man/figures --exclude-path docs --exclude-path pkgdown/favicon"
8+
SPELL_LYCHEE_ARGUMENTS: "--exclude-path man/figures --exclude-path docs --exclude-path pkgdown/favicon --exclude-path .lycheeignore --exclude-path .github/linters/.lycheeignore"
99
SPELL_LYCHEE_FILE_EXTENSIONS:
1010
- "*"
1111
SPELL_CSPELL_ANALYZE_FILE_NAMES: false

.github/workflows/check_nn_versions.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
- name: Install dependencies
5555
run: >
5656
options(
57-
repos = c(CRAN = "https://packagemanager.posit.co/cran/${{matrix.config.date }}")
57+
repos = c(CRAN = "https://packagemanager.posit.co/cran/${{matrix.config.date}}")
5858
)
5959
6060
install.packages(c("rcmdcheck", "pak"), Ncpus = parallel::detectCores()-1)

.github/workflows/megalinter.yaml

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,26 @@ jobs:
3131
- name: Copy linting config from r.workflows/main
3232
shell: bash
3333
run: |
34-
curl --output .mega-linter.yml https://raw.githubusercontent.com/NovoNordisk-OpenSource/r.workflows/main/.github/linters/.mega-linter.yml
35-
curl --output .lintr https://raw.githubusercontent.com/NovoNordisk-OpenSource/r.workflows/main/.github/linters/.lintr
36-
curl --output .lycheeignore https://raw.githubusercontent.com/NovoNordisk-OpenSource/r.workflows/main/.github/linters/.lycheeignore
34+
echo ===========
35+
echo "$GITHUB_REPOSITORY"
36+
echo "$GITHUB_HEAD_REF"
37+
echo "$GITHUB_REF_NAME"
38+
echo ===========
39+
if [ "$GITHUB_REPOSITORY" = "NovoNordisk-OpenSource/r.workflows" ]; then
40+
workflow_branch="${GITHUB_HEAD_REF:-$GITHUB_REF_NAME}"
41+
echo =========
42+
echo Using "${workflow_branch}"
43+
echo =========
44+
else
45+
workflow_branch="main"
46+
fi
47+
curl --output .mega-linter.yml "https://raw.githubusercontent.com/NovoNordisk-OpenSource/r.workflows/${workflow_branch}/.github/linters/.mega-linter.yml"
48+
curl --output .lintr "https://raw.githubusercontent.com/NovoNordisk-OpenSource/r.workflows/${workflow_branch}/.github/linters/.lintr"
49+
curl --output .lycheeignore "https://raw.githubusercontent.com/NovoNordisk-OpenSource/r.workflows/${workflow_branch}/.github/linters/.lycheeignore"
3750
if [ -e "inst/WORDLIST" ]; then
38-
curl --output .cspell.json https://raw.githubusercontent.com/NovoNordisk-OpenSource/r.workflows/main/.github/linters/.cspell-wordlist.json
51+
curl --output .cspell.json "https://raw.githubusercontent.com/NovoNordisk-OpenSource/r.workflows/${workflow_branch}/.github/linters/.cspell-wordlist.json"
3952
else
40-
curl --output .cspell.json https://raw.githubusercontent.com/NovoNordisk-OpenSource/r.workflows/main/.github/linters/.cspell.json
53+
curl --output .cspell.json "https://raw.githubusercontent.com/NovoNordisk-OpenSource/r.workflows/${workflow_branch}/.github/linters/.cspell.json"
4154
fi
4255
- name: MegaLinter
4356
id: ml

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: r.workflows
22
Title: R package workflows
3-
Version: 0.0.1.9001
3+
Version: 0.0.1.9002
44
Authors@R: c(
55
person("Cervan", "Girard", , "cgid@novonordisk.com", role = c("aut", "cre")),
66
person("Aksel", "Thomsen", , "oath@novonordisk.com", role = c("aut"))

0 commit comments

Comments
 (0)