Skip to content

Commit 08eb525

Browse files
zkamvarzkamvar
authored
Merge pull request #270 from grunwaldlab/znk/release/2.9.8
release 2.9.8
2 parents ce63308 + a6f8f46 commit 08eb525

File tree

8 files changed

+52
-33
lines changed

8 files changed

+52
-33
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,22 +38,22 @@ jobs:
3838
steps:
3939
- uses: actions/checkout@v4
4040

41-
- uses: r-lib/actions/setup-pandoc@v2
41+
- uses: r-lib/actions/setup-pandoc@bd49c52ffe281809afa6f0fecbf37483c5dd0b93 #v2.11.3
4242

43-
- uses: r-lib/actions/setup-r@v2
43+
- uses: r-lib/actions/setup-r@bd49c52ffe281809afa6f0fecbf37483c5dd0b93 #v2.11.3
4444
with:
4545
r-version: ${{ matrix.config.r }}
4646
http-user-agent: ${{ matrix.config.http-user-agent }}
4747
use-public-rspm: true
4848

49-
- uses: r-lib/actions/setup-tinytex@v2
49+
- uses: r-lib/actions/setup-tinytex@bd49c52ffe281809afa6f0fecbf37483c5dd0b93 #v2.11.3
5050

51-
- uses: r-lib/actions/setup-r-dependencies@v2
51+
- uses: r-lib/actions/setup-r-dependencies@bd49c52ffe281809afa6f0fecbf37483c5dd0b93 #v2.11.3
5252
with:
5353
extra-packages: any::rcmdcheck, local::.
5454
needs: check
5555

56-
- uses: r-lib/actions/check-r-package@v2
56+
- uses: r-lib/actions/check-r-package@bd49c52ffe281809afa6f0fecbf37483c5dd0b93 #v2.11.3
5757
with:
5858
upload-snapshots: true
5959
build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")'

‎.github/workflows/pkgdown.yaml‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@ 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
1312

1413
permissions: read-all
1514

@@ -26,17 +25,25 @@ jobs:
2625
steps:
2726
- uses: actions/checkout@v4
2827

29-
- uses: r-lib/actions/setup-pandoc@v2
28+
- uses: r-lib/actions/setup-pandoc@bd49c52ffe281809afa6f0fecbf37483c5dd0b93 #v2.11.3
3029

31-
- uses: r-lib/actions/setup-r@v2
30+
- uses: r-lib/actions/setup-r@bd49c52ffe281809afa6f0fecbf37483c5dd0b93 #v2.11.3
3231
with:
3332
use-public-rspm: true
3433

35-
- uses: r-lib/actions/setup-r-dependencies@v2
34+
- uses: r-lib/actions/setup-r-dependencies@bd49c52ffe281809afa6f0fecbf37483c5dd0b93 #v2.11.3
3635
with:
3736
extra-packages: any::pkgdown, local::.
3837
needs: website
3938

4039
- name: Build site
41-
run: pkgdown::deploy_to_branch(new_process = FALSE, run_dont_run = TRUE)
40+
run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)
4241
shell: Rscript {0}
42+
43+
- name: Deploy to GitHub pages 🚀
44+
if: github.event_name != 'pull_request'
45+
uses: JamesIves/github-pages-deploy-action@65b5dfd4f5bcd3a7403bbc2959c144256167464e #v4.5.0
46+
with:
47+
clean: false
48+
branch: gh-pages
49+
folder: docs

‎.github/workflows/rhub.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333

3434
steps:
3535
# NO NEED TO CHECKOUT HERE
36-
- uses: r-hub/actions/setup@v1
36+
- uses: r-hub/actions/setup@e9663823ac5d540b7b2d93436945048a8f6fc4c1 #v1.6.6
3737
with:
3838
config: ${{ github.event.inputs.config }}
3939
id: rhub-setup
@@ -51,16 +51,16 @@ jobs:
5151
image: ${{ matrix.config.container }}
5252

5353
steps:
54-
- uses: r-hub/actions/checkout@v1
55-
- uses: r-hub/actions/platform-info@v1
54+
- uses: r-hub/actions/checkout@e9663823ac5d540b7b2d93436945048a8f6fc4c1 #v1.6.6
55+
- uses: r-hub/actions/platform-info@e9663823ac5d540b7b2d93436945048a8f6fc4c1 #v1.6.6
5656
with:
5757
token: ${{ secrets.RHUB_TOKEN }}
5858
job-config: ${{ matrix.config.job-config }}
59-
- uses: r-hub/actions/setup-deps@v1
59+
- uses: r-hub/actions/setup-deps@e9663823ac5d540b7b2d93436945048a8f6fc4c1 #v1.6.6
6060
with:
6161
token: ${{ secrets.RHUB_TOKEN }}
6262
job-config: ${{ matrix.config.job-config }}
63-
- uses: r-hub/actions/run-check@v1
63+
- uses: r-hub/actions/run-check@e9663823ac5d540b7b2d93436945048a8f6fc4c1 #v1.6.6
6464
with:
6565
token: ${{ secrets.RHUB_TOKEN }}
6666
job-config: ${{ matrix.config.job-config }}
@@ -76,20 +76,20 @@ jobs:
7676
config: ${{ fromJson(needs.setup.outputs.platforms) }}
7777

7878
steps:
79-
- uses: r-hub/actions/checkout@v1
80-
- uses: r-hub/actions/setup-r@v1
79+
- uses: r-hub/actions/checkout@e9663823ac5d540b7b2d93436945048a8f6fc4c1 #v1.6.6
80+
- uses: r-hub/actions/setup-r@e9663823ac5d540b7b2d93436945048a8f6fc4c1 #v1.6.6
8181
with:
8282
job-config: ${{ matrix.config.job-config }}
8383
token: ${{ secrets.RHUB_TOKEN }}
84-
- uses: r-hub/actions/platform-info@v1
84+
- uses: r-hub/actions/platform-info@e9663823ac5d540b7b2d93436945048a8f6fc4c1 #v1.6.6
8585
with:
8686
token: ${{ secrets.RHUB_TOKEN }}
8787
job-config: ${{ matrix.config.job-config }}
88-
- uses: r-hub/actions/setup-deps@v1
88+
- uses: r-hub/actions/setup-deps@e9663823ac5d540b7b2d93436945048a8f6fc4c1 #v1.6.6
8989
with:
9090
job-config: ${{ matrix.config.job-config }}
9191
token: ${{ secrets.RHUB_TOKEN }}
92-
- uses: r-hub/actions/run-check@v1
92+
- uses: r-hub/actions/run-check@e9663823ac5d540b7b2d93436945048a8f6fc4c1 #v1.6.6
9393
with:
9494
job-config: ${{ matrix.config.job-config }}
9595
token: ${{ secrets.RHUB_TOKEN }}

‎.github/workflows/test-coverage.yaml‎

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

9-
name: test-coverage
8+
name: test-coverage.yaml
109

1110
permissions: read-all
1211

@@ -19,11 +18,11 @@ jobs:
1918
steps:
2019
- uses: actions/checkout@v4
2120

22-
- uses: r-lib/actions/setup-r@v2
21+
- uses: r-lib/actions/setup-r@bd49c52ffe281809afa6f0fecbf37483c5dd0b93 #v2.11.3
2322
with:
2423
use-public-rspm: true
2524

26-
- uses: r-lib/actions/setup-r-dependencies@v2
25+
- uses: r-lib/actions/setup-r-dependencies@bd49c52ffe281809afa6f0fecbf37483c5dd0b93 #v2.11.3
2726
with:
2827
extra-packages: any::covr, any::xml2
2928
needs: coverage
@@ -35,14 +34,16 @@ jobs:
3534
clean = FALSE,
3635
install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package")
3736
)
37+
print(cov)
3838
covr::to_cobertura(cov)
3939
shell: Rscript {0}
4040

41-
- uses: codecov/codecov-action@v4
41+
- uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 #v5.5.1
4242
with:
43-
fail_ci_if_error: ${{ github.event_name != 'pull_request' && true || false }}
44-
file: ./cobertura.xml
45-
plugin: noop
43+
# Fail if error if not on PR, or if on PR and token is given
44+
fail_ci_if_error: ${{ github.event_name != 'pull_request' || secrets.CODECOV_TOKEN }}
45+
files: ./cobertura.xml
46+
plugins: noop
4647
disable_search: true
4748
token: ${{ secrets.CODECOV_TOKEN }}
4849

‎CRAN-SUBMISSION‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Version: 2.9.7
2-
Date: 2025-06-18 23:41:37 UTC
3-
SHA: 43eb0047542d0bc739f6ea19bc95e008431f2119
1+
Version: 2.9.8
2+
Date: 2025-08-23 22:26:12 UTC
3+
SHA: 928ee2ce3c003194af3d7a6927dd8aec87ca4461

‎NEWS.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ MISC
1515
* compatibility fix for ggplot2 4.0.0 (reported: @teunbrand, #263,
1616
fixed: @zkamvar, #264)
1717
* CRAN maintenance: documentaiton fixes
18+
* internal code formatting has been applied with air
1819

1920
poppr 2.9.6
2021
===========
@@ -148,7 +149,7 @@ CRAN MAINTENANCE
148149
* The output from the `poppr()` function will no longer contain factor columns
149150
for the population names or the file names. This is due to R 4.0.0 changing
150151
behavior with the `stringsAsFactors` default in `data.frame()`. (See
151-
<https://github.com/grunwaldlab/poppr/issue/212> for details).
152+
<https://github.com/grunwaldlab/poppr/issues/212> for details).
152153

153154
poppr 2.8.4
154155
===========

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
<!-- badges: start -->
44
[![R-CMD-check](https://github.com/grunwaldlab/poppr/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/grunwaldlab/poppr/actions/workflows/R-CMD-check.yaml)
5+
[![Codecov test coverage](https://codecov.io/gh/grunwaldlab/poppr/graph/badge.svg)](https://app.codecov.io/gh/grunwaldlab/poppr)
56
<!-- badges: end -->
67

78
## What is *poppr*?

‎air.toml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[format]
2+
line-width = 80
3+
indent-width = 2
4+
indent-style = "space"
5+
line-ending = "auto"
6+
persistent-line-breaks = true
7+
exclude = []
8+
default-exclude = true
9+
skip = []

0 commit comments

Comments
 (0)