Skip to content

Commit

Permalink
Merge pull request #90 from KWB-R/dev
Browse files Browse the repository at this point in the history
Release v0.2.3
  • Loading branch information
mrustl authored Oct 24, 2022
2 parents 99a5138 + c42e982 commit 074a26b
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 22 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: r-lib/actions/setup-r@master
- uses: r-lib/actions/setup-r@v2
with:
r-version: ${{ matrix.config.r }}

- uses: r-lib/actions/setup-pandoc@master
- uses: r-lib/actions/setup-pandoc@v2

- name: Query dependencies
run: |
Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:

- name: Upload check results
if: failure()
uses: actions/upload-artifact@master
uses: actions/upload-artifact@main
with:
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
path: check
5 changes: 3 additions & 2 deletions .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@ jobs:
pkgdown:
runs-on: windows-latest
env:
CURL_SSL_BACKEND: "openssl"
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v2

- uses: r-lib/actions/setup-r@master
- uses: r-lib/actions/setup-r@v2

- uses: r-lib/actions/setup-pandoc@master
- uses: r-lib/actions/setup-pandoc@v2

- name: Query dependencies
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: r-lib/actions/setup-r@master
- uses: r-lib/actions/setup-r@v2

- uses: r-lib/actions/setup-pandoc@master
- uses: r-lib/actions/setup-pandoc@v2

- name: Query dependencies
run: |
Expand Down
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: kwb.pkgbuild
Title: R package for standardised development at KWB
Version: 0.2.2
Version: 0.2.3
Authors@R:
c(person(given = "Michael",
family = "Rustler",
Expand Down Expand Up @@ -53,4 +53,4 @@ Remotes:
ByteCompile: true
Encoding: UTF-8
LazyData: true
RoxygenNote: 7.1.2
RoxygenNote: 7.2.1
14 changes: 14 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# [kwb.pkgbuild 0.2.3](https://github.com/KWB-R/kwb.pkgbuild/releases/tag/v0.2.3) <small>2022-10-24</small>

* Fix GitHub action worfklows:

- fix continuous integration workflows (i.e. `pkgdown`, `Rcmdcheck`,
`test-coverage`)), which were broken after 2022-10-15 due to unavailable `master`
branch in upstream dependency [r-lib/actions](https://github.com/r-lib/actions).

- fix [pkgdown](https://github.com/r-lib/pkgdown) GitHub actions workflow, which
crashed during `build_news()` generation on `windows` due to an `recent change in Windows that has made it incompatible with old openssl servers` (thanks to [@jeroen](https://github.com/KWB-R/kwb.geosalz/commit/925944151617d9b3b7f50008fafd29eb18ba1d65#commitcomment-87352971) for that hint!) and [@garborcsardi](https://github.com/r-lib/pkgdown/issues/2211#issuecomment-1281171018)
for this workaround!). For full discussion on this issue (which might be
fixed in an upcoming [pkgdown](https://github.com/r-lib/pkgdown) version 2.0.7)
see [pkgdown#2211](https://github.com/r-lib/pkgdown/issues/2211)

# [kwb.pkgbuild 0.2.2](https://github.com/KWB-R/kwb.pkgbuild/releases/tag/v0.2.2) <small>2022-05-11</small>

* GitHub actions: use `windows` as default operating system for `pkgdown` (for
Expand Down
7 changes: 1 addition & 6 deletions _pkgdown.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
url: https://kwb-r.github.io/kwb.pkgdown

url: https://kwb-r.github.io/kwb.pkgbuild
authors:
Michael Rustler:
href: https://mrustl.de
Expand All @@ -23,10 +22,6 @@ template:
primary: "#007aff"
border-radius: 0.5rem
btn-border-radius: 0.25rem
params:
docsearch:
api_key: d114e26fe8901b7b424d949906e60102
index_name: kwb_pkgbuild
development:
mode: auto

7 changes: 4 additions & 3 deletions inst/templates/ci_github-actions/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,12 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: r-lib/actions/setup-r@master
- uses: r-lib/actions/setup-r@v2
with:
r-version: ${{ matrix.config.r }}
use-public-rspm: true

- uses: r-lib/actions/setup-pandoc@master
- uses: r-lib/actions/setup-pandoc@v2

- name: Query dependencies
run: |
Expand Down Expand Up @@ -76,7 +77,7 @@ jobs:

- name: Upload check results
if: failure()
uses: actions/upload-artifact@master
uses: actions/upload-artifact@main
with:
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
path: check
7 changes: 5 additions & 2 deletions inst/templates/ci_github-actions/pkgdown.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,16 @@ jobs:
pkgdown:
runs-on: windows-latest
env:
CURL_SSL_BACKEND: "openssl"
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v2

- uses: r-lib/actions/setup-r@master
- uses: r-lib/actions/setup-r@v2
with:
use-public-rspm: true

- uses: r-lib/actions/setup-pandoc@master
- uses: r-lib/actions/setup-pandoc@v2

- name: Query dependencies
run: |
Expand Down
4 changes: 2 additions & 2 deletions inst/templates/ci_github-actions/test-coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: r-lib/actions/setup-r@master
- uses: r-lib/actions/setup-r@v2

- uses: r-lib/actions/setup-pandoc@master
- uses: r-lib/actions/setup-pandoc@v2

- name: Query dependencies
run: |
Expand Down

0 comments on commit 074a26b

Please sign in to comment.