Merge pull request #116 from StevenMMortimer/main

Merge main into dev after Release 1.0.1
StevenMMortimer · Mar 2, 2022 · b296b30 · b296b30
2 parents 411b3e8 + a1e1e9c
commit b296b30
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/main-04-R-CMD-check-windows.yml b/.github/workflows/main-04-R-CMD-check-windows.yml
@@ -29,7 +29,7 @@ jobs:
       RSPM: ${{ matrix.config.rspm }}
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
       SALESFORCER_USERNAME: ${{ secrets.SALESFORCER_USERNAME }}
-      SALESFORCER_TOKEN_PATH: ${{ github.workspace }}/tests/testthat/
+      SALESFORCER_TOKEN_PATH: ${{ github.workspace }}\tests\testthat\
 
     steps:
       - uses: actions/checkout@v2
@@ -40,6 +40,7 @@ jobs:
           ./.github/scripts/decrypt_secret.sh
         env:
           SALESFORCER_TOKEN_PASSPHRASE: ${{ secrets.SALESFORCER_TOKEN_PASSPHRASE }}
+        shell: bash
 
       - uses: r-lib/actions/setup-r@master
         with:

diff --git a/.github/workflows/main-05-R-CMD-check-linux.yml b/.github/workflows/main-05-R-CMD-check-linux.yml
@@ -22,7 +22,7 @@ jobs:
       max-parallel: 1
       matrix:
         config:
-          - {os: ubuntu-16.04,   r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}
+          - {os: ubuntu-18.04, r: 'release'}
 
     env:
       R_REMOTES_NO_ERRORS_FROM_WARNINGS: true

diff --git a/NEWS.md b/NEWS.md
@@ -1,13 +1,12 @@
-# salesforcer 1.0.1
+# salesforcer 1.0.1 [release](https://github.com/StevenMMortimer/salesforcer/releases/tag/v1.0.1)
 
 ## Dependencies
 
   * Increase the package's default Salesforce API version to 54.0 (Spring '22)
   * Added a deprecation warning that using basic authentication (password and 
     security token) will no longer work since Salesforce announced that all
     customers will be migrated to MFA beginning February 1st, 2022
-    ([link](https://admin.salesforce.com/blog/2021/everything-admins-need-to-know-about-the-mfa-requirement)).
-    Many thanks to @klaw2 for highlighting in #113.
+    ([link](https://admin.salesforce.com/blog/2021/everything-admins-need-to-know-about-the-mfa-requirement)). Many thanks to @klaw2 for highlighting in #113.
   * Remove deprecated use of `dplyr::across()` and add logic to circumvent a
     new warning emitted by `readr::type_convert()` when no character columns 
     are present