Skip to content

Commit

Permalink
Merge pull request #364 from StoXProject/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
arnejohannesholmin authored May 7, 2024
2 parents 1815883 + 2c1e288 commit 7ed89cf
Show file tree
Hide file tree
Showing 6 changed files with 476 additions and 445 deletions.
17 changes: 17 additions & 0 deletions .github/workflows/check-full.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,23 @@ jobs:
#### 2. R package installation (with system and R package dependencies): ####
#############################################################################

## 2a. Cache R packages:
#- name: Query R package dependencies
# run: |
# install.packages('remotes')
# saveRDS(remotes::dev_package_deps(dependencies = TRUE), "depends.Rds", version = 2)
# writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version")
# shell: Rscript {0}

#- name: Cache R packages
# if: runner.os != 'Windows'
# uses: actions/cache@v3
# with:
# path: ${{ env.R_LIBS_USER }}
# key: ${{ env.cache-version }}-${{ runner.os }}-r-${{ matrix.config.r }}-${{ hashFiles('depends.Rds') }}
# restore-keys: ${{ env.cache-version }}-${{ runner.os }}-r-${{ matrix.config.r }}-


## 2b. System dependencies:
- name: Install system dependencies on macOS
if: runner.os == 'macOS'
Expand Down
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: RstoxData
Version: 1.10.2-9007
Date: 2024-05-02
Version: 1.10.2-9008
Date: 2024-05-07
Title: Tools to Read and Manipulate Fisheries Data
Authors@R: c(
person(given = "Edvin",
Expand Down
3 changes: 3 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# RstoxData v1.10.2-9008 (2024-05-08)
* Added the ICESBioic format 1.6 that includes the new GeneticPopulationCode field.

# RstoxData v1.10.2-9007 (2024-05-02)
* Fixed bug in FilterLanding() by aadding expandFilterExpressionList().

Expand Down
Loading

0 comments on commit 7ed89cf

Please sign in to comment.