Merge pull request #5 from SciomeLLC/main

Renamed Actions. Added contributors. Github Action release improvements
NIEHS · Oct 31, 2023 · bec5093 · bec5093
2 parents e08ff7a + 95af115
commit bec5093
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 15 deletions.
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
@@ -6,7 +6,7 @@
 # See https://github.com/r-lib/actions/tree/master/examples#readme for
 # additional example workflows available for the R community.
 
-name: builds
+name: Valgrind Check
 
 on:
   pull_request:

diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
@@ -6,7 +6,7 @@
 # See https://github.com/r-lib/actions/tree/master/examples#readme for
 # additional example workflows available for the R community.
 
-name: releases
+name: Release New version
 
 on:
   push: 
@@ -24,6 +24,8 @@ jobs:
         - name: Create release
           id: create_release
           uses: ncipollo/release-action@v1
+          with:
+            allowUpdates: true
   build_upload_artefacts:
     runs-on: ${{ matrix.config.os }}
     name: ${{ matrix.config.os }} (${{ matrix.config.r }})
@@ -57,6 +59,17 @@ jobs:
           needs: |
             check
             roxygen2
+      - name: Read VERSION file
+        if: runner.os != 'macOs'
+        id: getversion
+        shell: bash
+        run: |
+          echo "VERSION=$(cat DESCRIPTION | grep -Po '(?<=Version\:\s).*')" >> $GITHUB_OUTPUT
+      - name: Read VERSION file (macOS)
+        if: runner.os == 'macOs'
+        id: getversion_mac
+        run: |
+          echo "VERSION=$(sed -n 's/Version:[[:space:]]*//p' DESCRIPTION | tr -d '[:space:]')" >> $GITHUB_OUTPUT
       - name: Install gsl (Mac)
         if: runner.os == 'macOS'
         run: |
@@ -68,29 +81,32 @@ jobs:
       - name: Build package
         if: runner.os == 'Linux' || runner.os == 'macOs' 
         run: R CMD build --no-build-vignettes .
-      - name: Test Install  (Windows)
+      - name: Test Install (Windows)
         if: runner.os == 'Windows'
         shell: cmd
-        run: R CMD INSTALL --build ToxicR_23.4.1.1.0.tar.gz
-      - name: Test Install
-        if: runner.os == 'Linux' || runner.os == 'macOs'
-        run: R CMD INSTALL --build ToxicR_23.4.1.1.0.tar.gz
+        run: R CMD INSTALL --build ToxicR_${{ steps.getversion.outputs.VERSION }}.tar.gz
+      - name: Test Install (Linux)
+        if: runner.os == 'Linux'
+        run: R CMD INSTALL --build ToxicR_${{ steps.getversion.outputs.VERSION }}.tar.gz
+      - name: Test Install (macOs)
+        if: runner.os == 'macOs'
+        run: R CMD INSTALL --build ToxicR_${{ steps.getversion_mac.outputs.VERSION }}.tar.gz
       - uses: svenstaro/upload-release-action@v2
         if: runner.os == 'macOs'
         with:
             tag: ${{ github.ref }}
-            file: ToxicR_23.4.1.1.0.tgz
-            asset_name: ToxicR_23.4.1.1.0-x86_64-macOs-R.${{ matrix.config.r }}.tgz
+            file: ToxicR_${{ steps.getversion_mac.outputs.VERSION }}.tgz
+            asset_name: "ToxicR_${{ steps.getversion_mac.outputs.VERSION }}-x86_64-macOs-R.${{ matrix.config.r }}.tgz"
       - uses: svenstaro/upload-release-action@v2
         if: runner.os == 'Linux'
         with:
             tag: ${{ github.ref }}
-            file: ToxicR_23.4.1.1.0_R_x86_64-pc-linux-gnu.tar.gz
-            asset_name: ToxicR_23.4.1.1.0-x86_64-linux-R.${{ matrix.config.r }}.zip
+            file: "ToxicR_${{ steps.getversion.outputs.VERSION }}_R_x86_64-pc-linux-gnu.tar.gz"
+            asset_name: ToxicR_${{ steps.getversion.outputs.VERSION }}-x86_64-linux-R.${{ matrix.config.r }}.zip
       - uses: svenstaro/upload-release-action@v2
         if: runner.os == 'Windows'
         with:
             tag: ${{ github.ref }}
-            file: ToxicR_23.4.1.1.0.zip
-            asset_name: ToxicR_23.4.1.1.0-windows-R.${{ matrix.config.r }}.zip
+            file: ToxicR_${{ steps.getversion.outputs.VERSION }}.zip
+            asset_name: ToxicR_${{ steps.getversion.outputs.VERSION }}-windows-R.${{ matrix.config.r }}.zip
 
diff --git a/.github/workflows/sanitizer.yml b/.github/workflows/sanitizer.yml
@@ -1,4 +1,4 @@
-name: builds
+name: UBSAN/ASAN Checks
 
 on:
   pull_request:

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: ToxicR
 Type: Package
 Title: Analyzing Toxicology Dose-Response Data
-Version: 23.10.1.1.1
+Version: 23.10.1.1.2
 Date: 2023-10-23
 Authors@R: 
     c(
@@ -16,6 +16,13 @@ Authors@R:
     person(given ="Eric",
            family="Wimberly",
            role = "ctb"),
+    person(given = "Shail",
+           family = "Choksi",
+	   role = "ctb",
+	   comment = "Setup github actions for automated tests and builds."),
+    person(given = "Brian",
+           family = "Kidd",
+	   role = "ctb"),
     person(given = "Keith",
            family = "Shockley",
            role = "com"),