update

kingaa · Apr 25, 2023 · fb0ff9b · fb0ff9b
1 parent 64889bd
commit fb0ff9b
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 57 deletions.
diff --git a/.Rprofile b/.Rprofile
@@ -1,7 +1,7 @@
 options(
   help_type="html",
   repos=c(
-    CRAN="https://repo.miserver.it.umich.edu/cran/",
+    CRAN="https://cloud.r-project.org/",
     kingaa="https://kingaa.github.io"
   ),
   useFancyQuotes=FALSE,

diff --git a/.github/workflows/binary-build.yml b/.github/workflows/binary-build.yml
@@ -5,13 +5,43 @@ on:
     tags:
       - '**'
   workflow_dispatch:
-    branches:
-      - '*'
 
 name: binary-build
 
+env:
+  release_name: ${{ vars.repo_name }}_${{ github.ref_name }}
+
 jobs:
-  binary-build:
+  source_build:          
+    runs-on: ubuntu-latest
+    name: Build source tarball
+    strategy:
+      fail-fast: false
+
+    steps:
+      - uses: actions/checkout@v3.1.0
+
+      - uses: r-lib/actions/setup-r@v2
+        with:
+          r-version: latest
+
+      - uses: r-lib/actions/setup-r-dependencies@v2
+        with:
+          extra-packages: |
+            any::pkgbuild
+
+      - name: Build source tarball
+        run: |
+          R CMD build --force --no-manual --resave-data --compact-vignettes=both --md5 .
+          mkdir -p ${{ github.workspace }}/artifacts
+          cp ${{ env.release_name }}.tar.gz ${{ github.workspace }}/artifacts
+
+      - uses: actions/upload-artifact@v3.1.1
+        with:
+          name: Source tarball
+          path: ${{ github.workspace }}/artifacts/${{ env.release_name }}.tar.gz
+
+  binary_build:
     runs-on: ${{ matrix.config.os }}
 
     name: ${{ matrix.config.os }} (${{ matrix.config.r }})
@@ -20,37 +50,31 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - {os: ubuntu-latest,  r: 'release'}
-          - {os: macOS-latest,   r: 'release'}
-          - {os: windows-latest, r: 'release'}
-
-    env:
-      GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
-      R_KEEP_PKG_SOURCE: yes
+          - {os: macOS-latest,   r: 'release', ext: "tgz"}
+          - {os: windows-latest, r: 'release', ext: "zip"}
 
     steps:
       - uses: actions/checkout@v3.1.0
 
-      - uses: r-lib/actions/setup-r@v2.3.1
+      - uses: r-lib/actions/setup-r@v2
         with:
           r-version: ${{ matrix.config.r }}
-          http-user-agent: ${{ matrix.config.http-user-agent }}
-          use-public-rspm: true
 
-      - uses: r-lib/actions/setup-r-dependencies@v2.3.1
+      - uses: r-lib/actions/setup-r-dependencies@v2
         with:
-          extra-packages: rcmdcheck 
-
+          extra-packages: |
+            any::pkgbuild
+
       - name: Build binary
         run: pkgbuild::build(binary=TRUE,manual=TRUE)
         shell: Rscript {0}
-      
-      - name: Copying tarball
+
+      - name: Copy tarball
         run: |
           mkdir -p ${{ github.workspace }}/artifacts
-          cp ../subplex_* ${{ github.workspace }}/artifacts
-          
+          cp ../${{ env.release_name }}.${{ matrix.config.ext }} ${{ github.workspace }}/artifacts
+
       - uses: actions/upload-artifact@v3.1.1
         with:
-          name: binary-${{ matrix.config.os }}-${{ matrix.config.r }}
-          path: ${{ github.workspace }}/artifacts
+          name: ${{ matrix.config.os }}-${{ matrix.config.r }}
+          path: ${{ github.workspace }}/artifacts/${{ env.release_name }}.${{ matrix.config.ext }}
diff --git a/.github/workflows/r-cmd-check.yml b/.github/workflows/r-cmd-check.yml
@@ -5,10 +5,7 @@ on:
     branches:
       - '*'
   pull_request:
-    branches: [master]
   workflow_dispatch:
-    branches:
-      - '*'
 
 name: R-CMD-check
 
@@ -33,39 +30,17 @@ jobs:
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
       R_KEEP_PKG_SOURCE: yes
-      _R_CHECK_DEPENDS_ONLY_: false
-      _R_CHECK_ALL_NON_ISO_C_: true
-      _R_CHECK_CODE_ASSIGN_TO_GLOBALENV_: true
-      _R_CHECK_CODE_ATTACH_: true
-      _R_CHECK_CODE_DATA_INTO_GLOBALENV_: true
-      _R_CHECK_CODE_USAGE_VIA_NAMESPACES_: true
-      _R_CHECK_DEPRECATED_DEFUNCT_: true
-      _R_CHECK_EXECUTABLES_EXCLUSIONS_: false
-      _R_CHECK_INSTALL_DEPENDS_: true
-      _R_CHECK_NO_RECOMMENDED_: true
-      _R_CHECK_OVERWRITE_REGISTERED_S3_METHODS_: true
-      _R_CHECK_REPLACING_IMPORTS_: true
-      _R_CHECK_S3_METHODS_NOT_REGISTERED_: true
-      _R_CHECK_SCREEN_DEVICE_: stop
-      _R_CHECK_SRC_MINUS_W_IMPLICIT_: true
-      _R_CHECK_SRC_MINUS_W_UNUSED_: true
-      _R_CHECK_SUGGESTS_ONLY_: true
-      _R_CHECK_TOPLEVEL_FILES_: true
-      _R_CHECK_VC_DIRS_: true
-      _R_CHECK_WALL_FORTRAN_: true
-      _R_CHECK_USE_CODETOOLS_: true
-      _R_CHECK_CODETOOLS_PROFILE_: "suppressLocalUnused=FALSE,suppressPartialMatchArgs=FALSE,suppressParamUnused=TRUE,suppressUndefined=FALSE"
 
     steps:
       - uses: actions/checkout@v3.1.0
 
-      - uses: r-lib/actions/setup-r@v2.3.1
+      - uses: r-lib/actions/setup-r@v2
         with:
           r-version: ${{ matrix.config.r }}
           http-user-agent: ${{ matrix.config.http-user-agent }}
           use-public-rspm: true
 
-      - uses: r-lib/actions/setup-r-dependencies@v2.3.1
+      - uses: r-lib/actions/setup-r-dependencies@v2
         with:
           extra-packages: rcmdcheck 
 
@@ -74,4 +49,4 @@ jobs:
       - uses: actions/upload-artifact@v3.1.1
         with:
           name: ${{ matrix.config.os }}-${{ matrix.config.r }}-results
-          path: check
+          path: check/${{ vars.repo_name }}.Rcheck
diff --git a/.github/workflows/test-coverage.yml b/.github/workflows/test-coverage.yml
@@ -20,11 +20,11 @@ jobs:
     steps:
       - uses: actions/checkout@v3.1.0
 
-      - uses: r-lib/actions/setup-r@v2.3.1
+      - uses: r-lib/actions/setup-r@v2
         with:
           use-public-rspm: true
 
-      - uses: r-lib/actions/setup-r-dependencies@v2.3.1
+      - uses: r-lib/actions/setup-r-dependencies@v2
         with:
           extra-packages: covr
 

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,9 +1,8 @@
 Package: subplex
-Version: 1.8.1
-Date: 2022-12-29
+Version: 1.8.2
+Date: 2023-04-25
 Title: Unconstrained Optimization using the Subplex Algorithm
-Authors@R: c(person(given=c("Aaron","A."),family="King",
-		role=c("aut","trl","cre"),email="kingaa@umich.edu"),
+Authors@R: c(person(given=c("Aaron","A."),family="King",role=c("aut","trl","cre"),email="kingaa@umich.edu",comment=c(ORCID="0000-0001-6159-3207")),
 	  person(given=c("Tom"),family="Rowan",role=c("aut")))
 License: GPL-3
 Depends: R(>= 2.5.1)