Skip to content

Commit

Permalink
gh action workflow edits for readability and act compatibility
Browse files Browse the repository at this point in the history
'apt update' statements to allow act to run locally

align Roxygen in test packages

revised logic to balance act and gh actions
  • Loading branch information
bburns632 committed Apr 24, 2024
1 parent 6c75587 commit ea3df13
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 9 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Tests
name: CI Tests

on:
push:
Expand Down Expand Up @@ -26,6 +26,9 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: If local, apt update
if: ${{ (env.ACT || false) && (matrix.os == 'ubuntu-latest')}}
run: sudo apt update
- name: Install Tidy Ubuntu
if: matrix.os == 'ubuntu-latest'
run: sudo apt install -y tidy
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Release Testing on Devel
name: Release Testing (Devel)

on:
push:
Expand All @@ -16,7 +16,7 @@ jobs:
steps:
- name: checkout repository
uses: actions/checkout@v4
- name: Show Version Found
- name: Display Version Found
shell: bash
run: grep -E "Version:" $GITHUB_WORKSPACE/DESCRIPTION
- name: Test if it is a production pattern (#.#.#)
Expand All @@ -41,6 +41,9 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: If local, apt update
if: ${{ (env.ACT || false) && (matrix.os == 'ubuntu-latest')}}
run: sudo apt update
- name: Install Tidy Ubuntu
if: matrix.os == 'ubuntu-latest'
run: sudo apt install -y tidy
Expand Down Expand Up @@ -75,6 +78,9 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: If local, apt update
if: ${ (env.ACT || false)}
run: sudo apt update
- name: Install Tidy Ubuntu
run: sudo apt install -y tidy
- name: build tarball for submission to CRAN
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/smoke-tests.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: smoke tests
name: Smoke Tests

# only build on merges to main
on:
Expand Down Expand Up @@ -84,6 +84,9 @@ jobs:
uses: r-lib/actions/setup-r@v2
with:
r-version: 'release'
- name: If local, apt update
if: ${{ (env.ACT || false) }}
run: sudo apt update
- name: Install Tidy
run: sudo apt install -y tidy
- name: Install Deps For Pkgnet & ${{ matrix.test_pkg }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/website.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: update website docs
name: Website Docs Update

# only build on new tagged versions (OR manually specified)
on:
Expand Down
3 changes: 2 additions & 1 deletion inst/baseballstats/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@ Suggests:
testthat
License: file LICENSE
LazyData: TRUE
RoxygenNote: 6.0.1
RoxygenNote: 7.1.0
Roxygen: list(r6 = FALSE)
3 changes: 2 additions & 1 deletion inst/milne/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@ LinkingTo:
Rcpp
License: file LICENSE
LazyData: TRUE
RoxygenNote: 6.1.1
RoxygenNote: 7.1.0
Roxygen: list(r6 = FALSE)
3 changes: 2 additions & 1 deletion inst/sartre/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ Maintainer: Brian Burns <[email protected]>
Description: This package is used to test the functions in `pkgnet`. It's a "nothing" network. Get it?
License: file LICENSE
LazyData: TRUE
RoxygenNote: 6.1.1
RoxygenNote: 7.1.0
Roxygen: list(r6 = FALSE)
3 changes: 2 additions & 1 deletion inst/silverstein/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Imports:
R6
License: file LICENSE
LazyData: TRUE
RoxygenNote: 7.0.2
RoxygenNote: 7.1.0
Suggests:
testthat (>= 2.1.0)
Roxygen: list(r6 = FALSE)

0 comments on commit ea3df13

Please sign in to comment.