Skip to content

Commit d0f6d08

Browse files
Merge pull request #89 from katilingban/dev
refresh package; fix #85; fix #86; fix #87; fix #88
2 parents feb0088 + ea40430 commit d0f6d08

File tree

9 files changed

+98
-18
lines changed

9 files changed

+98
-18
lines changed

.github/workflows/R-CMD-check.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ on:
44
push:
55
branches: [main, master]
66
pull_request:
7-
branches: [main, master]
87

9-
name: R-CMD-check
8+
name: R-CMD-check.yaml
9+
10+
permissions: read-all
1011

1112
jobs:
1213
R-CMD-check:

.github/workflows/netlify.yaml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
on:
2+
pull_request:
3+
branches: [main, master]
4+
5+
name: pkgdown-pr
6+
7+
jobs:
8+
netlify:
9+
runs-on: ubuntu-latest
10+
env:
11+
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
12+
steps:
13+
- uses: actions/checkout@v4
14+
15+
- uses: r-lib/actions/setup-tinytex@v2
16+
17+
- uses: r-lib/actions/setup-pandoc@v2
18+
19+
- uses: r-lib/actions/setup-r@v2
20+
with:
21+
use-public-rspm: true
22+
23+
- uses: r-lib/actions/setup-r-dependencies@v2
24+
with:
25+
extra-packages: any::pkgdown, local::.
26+
needs: website
27+
28+
- name: Install package
29+
run: R CMD INSTALL .
30+
31+
- name: Create website
32+
run: |
33+
pkgdown::build_site()
34+
shell: Rscript {0}
35+
36+
- name: Create index file
37+
run: |
38+
echo '<!DOCTYPE html><html><head><meta http-equiv="refresh" content="0;URL=/dev/index.html" /> <script language="javascript"> window.location.replace('/dev/index.html')</script></head></html>' > ./docs/index.html
39+
40+
- name: Deploy to Netlify
41+
uses: nwtgck/[email protected]
42+
with:
43+
publish-dir: './docs'
44+
production-branch: main
45+
github-token: ${{ secrets.GITHUB_TOKEN }}
46+
deploy-message:
47+
'Deploy from GHA: ${{ github.event.pull_request.title || github.event.head_commit.message }} (${{ github.sha }})'
48+
# these default to 'true'
49+
enable-commit-comment: false
50+
enable-github-deployment: false
51+
env:
52+
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
53+
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}

.github/workflows/pkgdown.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ on:
44
push:
55
branches: [main, master]
66
pull_request:
7-
branches: [main, master]
87
release:
98
types: [published]
109
workflow_dispatch:
1110

12-
name: pkgdown
11+
name: pkgdown.yaml
12+
13+
permissions: read-all
1314

1415
jobs:
1516
pkgdown:

.github/workflows/test-coverage.yaml

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ on:
44
push:
55
branches: [main, master]
66
pull_request:
7-
branches: [main, master]
87

9-
name: test-coverage
8+
name: test-coverage.yaml
9+
10+
permissions: read-all
1011

1112
jobs:
1213
test-coverage:
@@ -23,18 +24,28 @@ jobs:
2324

2425
- uses: r-lib/actions/setup-r-dependencies@v2
2526
with:
26-
extra-packages: any::covr
27+
extra-packages: any::covr, any::xml2
2728
needs: coverage
2829

2930
- name: Test coverage
3031
run: |
31-
covr::codecov(
32+
cov <- covr::package_coverage(
3233
quiet = FALSE,
3334
clean = FALSE,
3435
install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package")
3536
)
37+
covr::to_cobertura(cov)
3638
shell: Rscript {0}
3739

40+
- uses: codecov/codecov-action@v4
41+
with:
42+
# Fail if error if not on PR, or if on PR and token is given
43+
fail_ci_if_error: ${{ github.event_name != 'pull_request' || secrets.CODECOV_TOKEN }}
44+
file: ./cobertura.xml
45+
plugin: noop
46+
disable_search: true
47+
token: ${{ secrets.CODECOV_TOKEN }}
48+
3849
- name: Show testthat output
3950
if: always()
4051
run: |

DESCRIPTION

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
Package: paleta
22
Type: Package
33
Title: Collection of Palettes, Themes, and Theme Components
4-
Version: 0.0.0.9001
4+
Version: 0.1.0.9000
55
Authors@R: person(
66
given = "Ernest",
77
family = "Guevarra",
88
comment = c(ORCID = "0000-0002-4887-4415"),
99
email = "[email protected]",
10-
role = c("aut", "cre")
10+
role = c("aut", "cre", "cph")
1111
)
1212
Description: A collection of palettes, themes, and theme components based on
1313
publicly available branding guidelines of various non-governmental
@@ -31,9 +31,9 @@ Suggests:
3131
Encoding: UTF-8
3232
Language: en-GB
3333
LazyData: true
34-
RoxygenNote: 7.3.1
34+
RoxygenNote: 7.3.2
3535
Roxygen: list(markdown = TRUE)
36-
URL: https://github.com/katilingban/paleta,http://katilingban.io/paleta/
36+
URL: https://katilingban.io/paleta,https://github.com/katilingban/paleta
3737
BugReports: https://github.com/katilingban/paleta/issues
3838
VignetteBuilder: knitr
3939
Config/testthat/edition: 3

NEWS.md

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,20 @@
1-
# Changes in version 0.0.0.9001
1+
# paleta (version 0.1.0)
2+
3+
## General updates
4+
5+
* refresh `pkgdown` website
6+
* refresh GitHub Actions workflows to include Netlify pull request deployment
7+
8+
9+
<br/>
10+
11+
# paleta (version 0.0.0.9001)
212

313
## Bug fixes
414

5-
* removed line on the borders of the plot;
15+
* removed line on the borders of the plot
616

17+
<br/>
718

819
# paleta (version 0.0.0.9000)
920

inst/WORDLIST

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ IFC
1111
Katilingban
1212
Lifecycle
1313
MIGA
14+
Netlify
1415
Noto
1516
Pantone
1617
Roboto

man/paleta.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkgdown/_pkgdown.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ url: https://katilingban.io/paleta/
55
template:
66
bootstrap: 5
77
bootswatch: sandstone
8-
theme: haddock
9-
ganalytics: #
8+
theme: breeze-light
9+
ganalytics: "G-D6R7DT84NL"
1010

1111
home:
1212
links:
@@ -18,7 +18,7 @@ navbar:
1818
type: light
1919
structure:
2020
left: [home, intro, reference, articles, news]
21-
right: [mastodon, linkedin, github]
21+
right: [search, mastodon, linkedin, github]
2222

2323
components:
2424
articles:
@@ -34,9 +34,11 @@ navbar:
3434
href: articles/nhs.html
3535
mastodon:
3636
icon: "fab fa-mastodon fa-lg"
37+
aria-label: Mastodon
3738
href: https://fosstodon.org/@katilingban
3839
linkedin:
3940
icon: "fab fa-linkedin fa-lg"
41+
aria-label: LinkedIn
4042
href: https://www.linkedin.com/company/katilingban
4143

4244
reference:

0 commit comments

Comments
 (0)