Skip to content

Commit e7993fb

Browse files
Merge pull request #325 from StoXProject/develop
Develop
2 parents 8b168e0 + d5208a0 commit e7993fb

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

.github/workflows/check-full.yaml

+6-7
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
4545

4646
steps:
47-
- uses: actions/checkout@v2
47+
- uses: actions/checkout@v3
4848

4949
- name: Do autorelease increment, tagging, and environment setup
5050
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
@@ -68,8 +68,8 @@ jobs:
6868
- uses: r-lib/actions/setup-r@v2
6969
with:
7070
r-version: ${{ matrix.config.r }}
71-
rtools-version: ${{ matrix.config.rtools }}
72-
http-user-agent: ${{ matrix.config.http-user-agent }}
71+
#rtools-version: ${{ matrix.config.rtools }} # Not present in the matrix...
72+
#http-user-agent: ${{ matrix.config.http-user-agent }} # Not present in the matrix...
7373

7474
- uses: r-lib/actions/setup-pandoc@v2
7575

@@ -102,7 +102,7 @@ jobs:
102102
remotes::install_deps(dependencies = TRUE)
103103
shell: Rscript {0}
104104

105-
- name: Install R package dependencies
105+
- name: Install R package dependencies on Windows and macOS
106106
if: runner.os != 'Linux'
107107
run: |
108108
# Show the repos:
@@ -128,12 +128,11 @@ jobs:
128128
run: |
129129
remotes::install_cran("rcmdcheck")
130130
remotes::install_cran("git2r")
131+
remotes::install_cran("sessioninfo")
131132
#remotes::install_cran("drat")
132-
# Test using the modfied drat:
133+
# Using the modfied drat that supports big sur:
133134
#remotes::install_github(repo = "stoxproject/drat", dependencies = FALSE)
134135
remotes::install_github(repo = 'eddelbuettel/drat', dependencies = FALSE)
135-
136-
remotes::install_cran("sessioninfo")
137136
shell: Rscript {0}
138137

139138
- name: Show .Platform$pkgType

DESCRIPTION

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: RstoxData
2-
Version: 1.10.0-9004
3-
Date: 2023-06-14
2+
Version: 1.10.0-9005
3+
Date: 2023-06-20
44
Title: Tools to Read and Manipulate Fisheries Data
55
Authors@R: c(
66
person(given = "Edvin",

0 commit comments

Comments
 (0)