Skip to content

Commit

Permalink
Merge branch 'main' into parallel
Browse files Browse the repository at this point in the history
  • Loading branch information
JanMarvin committed Jun 22, 2024
2 parents 43a3125 + 5cf2648 commit 3471e1b
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 28 deletions.
31 changes: 11 additions & 20 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [main, master, parallel]
Expand All @@ -7,6 +8,8 @@ on:

name: R-CMD-check

permissions: read-all

jobs:
R-CMD-check:
runs-on: ${{ matrix.config.os }}
Expand All @@ -17,18 +20,18 @@ jobs:
fail-fast: false
matrix:
config:
- {os: macOS-latest, r: 'release'}
- {os: macos-latest, r: 'release'}
- {os: windows-latest, r: 'release'}
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
- {os: ubuntu-latest, r: 'release'}
- {os: ubuntu-latest, r: 'oldrel-1'}
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
- {os: ubuntu-latest, r: 'release'}
- {os: ubuntu-latest, r: 'oldrel-1'}

env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
R_KEEP_PKG_SOURCE: yes

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

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

Expand All @@ -44,18 +47,6 @@ jobs:
needs: check

- uses: r-lib/actions/check-r-package@v2

- name: Build binary package
if: success() && runner.os != 'Linux'
run: |
dir.create("build")
install.packages("devtools")
devtools::build(path = "build", binary = TRUE)
shell: Rscript {0}

- name: Upload build results
if: success() && runner.os != 'Linux'
uses: actions/upload-artifact@main
with:
name: ${{ runner.os }}-r-${{ matrix.config.r }}-pkg
path: build
upload-snapshots: true
build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")'
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ LinkingTo: Rcpp,
RcppArmadillo
ByteCompile: yes
Encoding: UTF-8
RoxygenNote: 7.2.3
RoxygenNote: 7.3.1
8 changes: 5 additions & 3 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
0.8: switch to numeriDeriv
0.7: Implement elasticities function for the estmation of expenditure/income
elastisticesa and uncompensated and compensatend prices elasticities
# nlsur 0.8
* switch to `numericDeriv()`

# nlsur 0.7
* Implement elasticities function for the estmation of expenditure/income elastistices and uncompensated and compensatend prices elasticities
2 changes: 0 additions & 2 deletions src/Makevars
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
PKG_LIBS= `$(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()"` $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)

CXX_STD = CXX11
2 changes: 0 additions & 2 deletions src/Makevars.win
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
PKG_LIBS = $(shell $(R_HOME)/bin${R_ARCH_BIN}/Rscript.exe -e "Rcpp:::LdFlags()") $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)

CXX_STD = CXX11

0 comments on commit 3471e1b

Please sign in to comment.