From 3057c64e4d7563333d180654298ea6e665d43080 Mon Sep 17 00:00:00 2001
From: Ilia Kosenkov <ilia.kosenkov@outlook.com>
Date: Tue, 4 May 2021 21:03:02 +0300
Subject: [PATCH 01/11] Enabling CI on dev branch

---
 .github/workflows/test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 22180cf3..3a78a9f7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - main
       - master
+      - 'rtools-v2'
   pull_request:
     branches:
       - main

From 9e2ff311f56fc3bc5271b033c98f830b5825deac Mon Sep 17 00:00:00 2001
From: Ilia Kosenkov <ilia.kosenkov@outlook.com>
Date: Wed, 5 May 2021 12:28:51 +0300
Subject: [PATCH 02/11] Disable unmodified jobs

---
 .github/workflows/test.yml | 304 ++++++++++++++++++-------------------
 1 file changed, 152 insertions(+), 152 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3a78a9f7..5af4ad8e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -14,182 +14,182 @@ on:
 
 jobs:
 
-  test_with_bindgen:
-    runs-on: ${{ matrix.config.os }}
+  # test_with_bindgen:
+  #   runs-on: ${{ matrix.config.os }}
 
-    name: ${{ matrix.config.os }} (R-${{ matrix.config.r }} rust-${{ matrix.config.rust-version }})
+  #   name: ${{ matrix.config.os }} (R-${{ matrix.config.r }} rust-${{ matrix.config.rust-version }})
               
-    strategy:
-      fail-fast: false
-      matrix:
-        config:
-          - {os: windows-latest, r: 'release', rust-version: 'stable-msvc',  targets: ['x86_64-pc-windows-gnu', 'i686-pc-windows-gnu']}
-          - {os: windows-latest, r: 'release', rust-version: 'nightly-msvc', targets: ['x86_64-pc-windows-gnu', 'i686-pc-windows-gnu']}
-          - {os: windows-latest, r: 'devel',   rust-version: 'stable-msvc',  targets: ['x86_64-pc-windows-gnu', 'i686-pc-windows-gnu']}
-          - {os: windows-latest, r: 'oldrel',  rust-version: 'stable-msvc',  targets: ['x86_64-pc-windows-gnu', 'i686-pc-windows-gnu']}
+  #   strategy:
+  #     fail-fast: false
+  #     matrix:
+  #       config:
+  #         - {os: windows-latest, r: 'release', rust-version: 'stable-msvc',  targets: ['x86_64-pc-windows-gnu', 'i686-pc-windows-gnu']}
+  #         - {os: windows-latest, r: 'release', rust-version: 'nightly-msvc', targets: ['x86_64-pc-windows-gnu', 'i686-pc-windows-gnu']}
+  #         - {os: windows-latest, r: 'devel',   rust-version: 'stable-msvc',  targets: ['x86_64-pc-windows-gnu', 'i686-pc-windows-gnu']}
+  #         - {os: windows-latest, r: 'oldrel',  rust-version: 'stable-msvc',  targets: ['x86_64-pc-windows-gnu', 'i686-pc-windows-gnu']}
 
-          - {os: macOS-latest,   r: 'release', rust-version: 'stable'}
-          - {os: macOS-latest,   r: 'release', rust-version: 'nightly'}
-          - {os: macOS-latest,   r: 'devel',   rust-version: 'stable'}
-          - {os: macOS-latest,   r: 'oldrel',  rust-version: 'stable'}
-          - {os: macOS-11.0,     r: 'release', rust-version: 'nightly',      targets: ['default', 'aarch64-apple-darwin'], 
-            no-test-targets: 'aarch64-apple-darwin', emit-bindings: 'true'}
+  #         - {os: macOS-latest,   r: 'release', rust-version: 'stable'}
+  #         - {os: macOS-latest,   r: 'release', rust-version: 'nightly'}
+  #         - {os: macOS-latest,   r: 'devel',   rust-version: 'stable'}
+  #         - {os: macOS-latest,   r: 'oldrel',  rust-version: 'stable'}
+  #         - {os: macOS-11.0,     r: 'release', rust-version: 'nightly',      targets: ['default', 'aarch64-apple-darwin'], 
+  #           no-test-targets: 'aarch64-apple-darwin', emit-bindings: 'true'}
 
-          - {os: ubuntu-20.04,   r: 'release', rust-version: 'stable',  rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
-          - {os: ubuntu-20.04,   r: 'release', rust-version: 'nightly', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
-          # R-devel requires LD_LIBRARY_PATH
-          - {os: ubuntu-20.04,   r: 'devel',   rust-version: 'stable',  rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}   
-          - {os: ubuntu-20.04,   r: 'oldrel',  rust-version: 'stable',  rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}   
+  #         - {os: ubuntu-20.04,   r: 'release', rust-version: 'stable',  rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
+  #         - {os: ubuntu-20.04,   r: 'release', rust-version: 'nightly', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
+  #         # R-devel requires LD_LIBRARY_PATH
+  #         - {os: ubuntu-20.04,   r: 'devel',   rust-version: 'stable',  rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}   
+  #         - {os: ubuntu-20.04,   r: 'oldrel',  rust-version: 'stable',  rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}   
 
 
 
-    env:
-      RSPM: ${{ matrix.config.rspm }}
+  #   env:
+  #     RSPM: ${{ matrix.config.rspm }}
 
-    # PowerShell core is available on all platforms and can be used to unify scripts
-    defaults:
-      run:
-        shell: pwsh
+  #   # PowerShell core is available on all platforms and can be used to unify scripts
+  #   defaults:
+  #     run:
+  #       shell: pwsh
       
-    steps:
+  #   steps:
       
-      - uses: actions/checkout@v2
+  #     - uses: actions/checkout@v2
       
-      - name: Set up R
-        uses: r-lib/actions/setup-r@v1
-        with:
-          r-version: ${{ matrix.config.r }}
+  #     - name: Set up R
+  #       uses: r-lib/actions/setup-r@v1
+  #       with:
+  #         r-version: ${{ matrix.config.r }}
 
-      - name: Set up Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: ${{ matrix.config.rust-version }}
-          default: true
-          components: rustfmt, clippy
+  #     - name: Set up Rust
+  #       uses: actions-rs/toolchain@v1
+  #       with:
+  #         toolchain: ${{ matrix.config.rust-version }}
+  #         default: true
+  #         components: rustfmt, clippy
 
-      - name: Configure targets
-        run: |
-          if ($env:RUST_TARGETS -eq '') {
-            $env:RUST_TARGETS = "default"
-          }
-          foreach ($target in ($env:RUST_TARGETS).Split(",")) {
-            if ($target -ne "default") {
-              rustup target add $target
-            }
-          }
-          echo "RUST_TARGETS=$env:RUST_TARGETS"  | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-        env:
-          RUST_TARGETS: ${{ join(matrix.config.targets, ',')}}
+  #     - name: Configure targets
+  #       run: |
+  #         if ($env:RUST_TARGETS -eq '') {
+  #           $env:RUST_TARGETS = "default"
+  #         }
+  #         foreach ($target in ($env:RUST_TARGETS).Split(",")) {
+  #           if ($target -ne "default") {
+  #             rustup target add $target
+  #           }
+  #         }
+  #         echo "RUST_TARGETS=$env:RUST_TARGETS"  | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+  #       env:
+  #         RUST_TARGETS: ${{ join(matrix.config.targets, ',')}}
       
-      # All configurations for Windows go here
-      # Rust toolchain is used to determine target architecture
-      - name: Configure Windows
-        if: runner.os == 'Windows'
-        # 1. Configure path to libclang
-        # 2. Add path to mingw32/mingw64 -- otherwise library is linked to rtools
-        # 3. Add path to R's i386/x64  -- to solve x86 build/test issue
-        run: |
-          if ($env:RUST_TARGETS -like "*x86_64*") {
-            echo "C:\msys64\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append ;
-            echo "$(Rscript.exe -e 'cat(normalizePath(R.home()))')\bin\x64"  | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append ;
-          }
-          if ($env:RUST_TARGETS -like "*i686*") {
-            echo "C:\msys64\mingw32\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append ;
-            echo "$(Rscript.exe -e 'cat(normalizePath(R.home()))')\bin\i386"  | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append ;
-          }
+  #     # All configurations for Windows go here
+  #     # Rust toolchain is used to determine target architecture
+  #     - name: Configure Windows
+  #       if: runner.os == 'Windows'
+  #       # 1. Configure path to libclang
+  #       # 2. Add path to mingw32/mingw64 -- otherwise library is linked to rtools
+  #       # 3. Add path to R's i386/x64  -- to solve x86 build/test issue
+  #       run: |
+  #         if ($env:RUST_TARGETS -like "*x86_64*") {
+  #           echo "C:\msys64\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append ;
+  #           echo "$(Rscript.exe -e 'cat(normalizePath(R.home()))')\bin\x64"  | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append ;
+  #         }
+  #         if ($env:RUST_TARGETS -like "*i686*") {
+  #           echo "C:\msys64\mingw32\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append ;
+  #           echo "$(Rscript.exe -e 'cat(normalizePath(R.home()))')\bin\i386"  | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append ;
+  #         }
           
 
-      # MacOS configurations, mainly llvm and path to libclang
-      # Because of this R installation issue on MacOS-11.0 
-      # https://github.com/r-lib/actions/issues/200
-      # Symlinks to R/Rscript are not properly set up, so we do it by hand, using this trick
-      # https://github.com/r-lib/ps/commit/a24f2c4d1bdba63be14e7729b9ab81d0ed9f719e
-      # Environment variables are required fir Mac-OS-11.0, see
-      # https://github.com/extendr/libR-sys/issues/35
-      - name: Configure MacOs
-        if: runner.os == 'macOS'
-        run: | 
-          brew install llvm
-          echo "LIBCLANG_PATH=$(brew --prefix llvm)/lib" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-          $env:LLVM_CONFIG_PATH = "$(brew --prefix llvm)/bin/llvm-config" 
-          echo "LLVM_CONFIG_PATH=$env:LLVM_CONFIG_PATH" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-          echo "LIBRSYS_LIBCLANG_INCLUDE_PATH=$(. $env:LLVM_CONFIG_PATH --libdir)/clang/$(. $env:LLVM_CONFIG_PATH --version)/include"  | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+  #     # MacOS configurations, mainly llvm and path to libclang
+  #     # Because of this R installation issue on MacOS-11.0 
+  #     # https://github.com/r-lib/actions/issues/200
+  #     # Symlinks to R/Rscript are not properly set up, so we do it by hand, using this trick
+  #     # https://github.com/r-lib/ps/commit/a24f2c4d1bdba63be14e7729b9ab81d0ed9f719e
+  #     # Environment variables are required fir Mac-OS-11.0, see
+  #     # https://github.com/extendr/libR-sys/issues/35
+  #     - name: Configure MacOs
+  #       if: runner.os == 'macOS'
+  #       run: | 
+  #         brew install llvm
+  #         echo "LIBCLANG_PATH=$(brew --prefix llvm)/lib" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+  #         $env:LLVM_CONFIG_PATH = "$(brew --prefix llvm)/bin/llvm-config" 
+  #         echo "LLVM_CONFIG_PATH=$env:LLVM_CONFIG_PATH" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+  #         echo "LIBRSYS_LIBCLANG_INCLUDE_PATH=$(. $env:LLVM_CONFIG_PATH --libdir)/clang/$(. $env:LLVM_CONFIG_PATH --version)/include"  | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
-          if ((Get-ChildItem -Path /usr/local/bin -Filter R | Measure-Object).Count -eq 0) {
-            echo "::warning:: Found no R symlink in /usr/local/bin, setting up manually..."
-            ln -s /Library/Frameworks/R.framework/Versions/Current/Resources/bin/R /usr/local/bin/
-          }
-          if ((Get-ChildItem -Path /usr/local/bin -Filter Rscript | Measure-Object).Count -eq 0) {
-            echo "::warning:: Found no Rscript symlink in /usr/local/bin, setting up manually..."
-            ln -s /Library/Frameworks/R.framework/Versions/Current/Resources/bin/Rscript /usr/local/bin/
-          }
+  #         if ((Get-ChildItem -Path /usr/local/bin -Filter R | Measure-Object).Count -eq 0) {
+  #           echo "::warning:: Found no R symlink in /usr/local/bin, setting up manually..."
+  #           ln -s /Library/Frameworks/R.framework/Versions/Current/Resources/bin/R /usr/local/bin/
+  #         }
+  #         if ((Get-ChildItem -Path /usr/local/bin -Filter Rscript | Measure-Object).Count -eq 0) {
+  #           echo "::warning:: Found no Rscript symlink in /usr/local/bin, setting up manually..."
+  #           ln -s /Library/Frameworks/R.framework/Versions/Current/Resources/bin/Rscript /usr/local/bin/
+  #         }
 
-      # This is required for ubuntu r-devel
-      # 'Del alias:R' removes R alias which prevents running R 
-      - name: Configure Linux
-        if: runner.os == 'linux'
-        run: |
-          Del alias:R
-          echo "LD_LIBRARY_PATH=$(R -s -e 'cat(normalizePath(R.home()))')/lib" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+  #     # This is required for ubuntu r-devel
+  #     # 'Del alias:R' removes R alias which prevents running R 
+  #     - name: Configure Linux
+  #       if: runner.os == 'linux'
+  #       run: |
+  #         Del alias:R
+  #         echo "LD_LIBRARY_PATH=$(R -s -e 'cat(normalizePath(R.home()))')/lib" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
-      # Build and emit bindings to './generated_bindings'
-      - name: Build & Emit bindings
-        id: build
-        run: |
-          . ./ci-cargo.ps1
-          foreach ($target in ($env:RUST_TARGETS).Split(",")) {
-            ci-cargo build -vv --features use-bindgen $(if ($target -ne 'default') {"--target=$target"} ) -ActionName "Building for target: $target"
-          }
-        env:
-          LIBRSYS_BINDINGS_OUTPUT_PATH: generated_bindings
+  #     # Build and emit bindings to './generated_bindings'
+  #     - name: Build & Emit bindings
+  #       id: build
+  #       run: |
+  #         . ./ci-cargo.ps1
+  #         foreach ($target in ($env:RUST_TARGETS).Split(",")) {
+  #           ci-cargo build -vv --features use-bindgen $(if ($target -ne 'default') {"--target=$target"} ) -ActionName "Building for target: $target"
+  #         }
+  #       env:
+  #         LIBRSYS_BINDINGS_OUTPUT_PATH: generated_bindings
 
-      # Test the result of previous step
-      - name: Run tests
-        id: test
-        run: |
-          . ./ci-cargo.ps1
-          foreach ($target in ($env:RUST_TARGETS).Split(",")) {
-            if(($env:NO_TEST_TARGETS).Split(",").Contains($target)) {
-              echo "::warning:: Skipping bindgen tests for target: $target"
-            }
-            else {
-              ci-cargo test -vv --features use-bindgen $(if ($target -ne 'default') {"--target=$target"} ) '--' --nocapture --test-threads=1 -ActionName "Running bindgen tests for target: $target"
-            }
-          }
-        env: 
-          NO_TEST_TARGETS: ${{ join(matrix.config.no-test-targets, ',') }}
+  #     # Test the result of previous step
+  #     - name: Run tests
+  #       id: test
+  #       run: |
+  #         . ./ci-cargo.ps1
+  #         foreach ($target in ($env:RUST_TARGETS).Split(",")) {
+  #           if(($env:NO_TEST_TARGETS).Split(",").Contains($target)) {
+  #             echo "::warning:: Skipping bindgen tests for target: $target"
+  #           }
+  #           else {
+  #             ci-cargo test -vv --features use-bindgen $(if ($target -ne 'default') {"--target=$target"} ) '--' --nocapture --test-threads=1 -ActionName "Running bindgen tests for target: $target"
+  #           }
+  #         }
+  #       env: 
+  #         NO_TEST_TARGETS: ${{ join(matrix.config.no-test-targets, ',') }}
             
 
 
-      # If success
-      # AND (either rust is stable and 'emit-bindings' != 'false'
-      #      OR rust is any and 'emit-bindings' == 'true'),
-      # upload bindings
-      - name: Upload generated bindings
-        if: 
-          steps.build.outcome == 'success' && 
-          steps.test.outcome == 'success' && 
-          ((startsWith(matrix.config.rust-version, 'stable') && matrix.config.emit-bindings != 'false') ||
-            (matrix.config.emit-bindings == 'true'))
-        uses: actions/upload-artifact@main
-        with:
-          name: ${{ matrix.config.os }} (R-${{ matrix.config.r }} rust-${{ matrix.config.rust-version }}) generated bindings
-          path: generated_bindings
+  #     # If success
+  #     # AND (either rust is stable and 'emit-bindings' != 'false'
+  #     #      OR rust is any and 'emit-bindings' == 'true'),
+  #     # upload bindings
+  #     - name: Upload generated bindings
+  #       if: 
+  #         steps.build.outcome == 'success' && 
+  #         steps.test.outcome == 'success' && 
+  #         ((startsWith(matrix.config.rust-version, 'stable') && matrix.config.emit-bindings != 'false') ||
+  #           (matrix.config.emit-bindings == 'true'))
+  #       uses: actions/upload-artifact@main
+  #       with:
+  #         name: ${{ matrix.config.os }} (R-${{ matrix.config.r }} rust-${{ matrix.config.rust-version }}) generated bindings
+  #         path: generated_bindings
 
-      # Run tests again using different bindings
-      - name: Run tests on precomputed bindings shipped with libR-sys
-        run: |
-          . ./ci-cargo.ps1
-          foreach ($target in ($env:RUST_TARGETS).Split(",")) {
-            if(($env:NO_TEST_TARGETS).Split(",").Contains($target)) {
-              echo "::warning:: Skipping tests for target: $target"
-            }
-            else {    
-              ci-cargo test -vv $(if ($target -ne 'default') {"--target=$target"} ) '--' --nocapture --test-threads=1 -ActionName "Running tests for target: $target"
-            }
-          }
-        env: 
-          NO_TEST_TARGETS: ${{ join(matrix.config.no-test-targets, ',') }}
+  #     # Run tests again using different bindings
+  #     - name: Run tests on precomputed bindings shipped with libR-sys
+  #       run: |
+  #         . ./ci-cargo.ps1
+  #         foreach ($target in ($env:RUST_TARGETS).Split(",")) {
+  #           if(($env:NO_TEST_TARGETS).Split(",").Contains($target)) {
+  #             echo "::warning:: Skipping tests for target: $target"
+  #           }
+  #           else {    
+  #             ci-cargo test -vv $(if ($target -ne 'default') {"--target=$target"} ) '--' --nocapture --test-threads=1 -ActionName "Running tests for target: $target"
+  #           }
+  #         }
+  #       env: 
+  #         NO_TEST_TARGETS: ${{ join(matrix.config.no-test-targets, ',') }}
 
   test_windows_rtools:
     runs-on: ${{ matrix.config.os }}

From 7281388c6793c4ca027173ee5c149d5c9af5a3fd Mon Sep 17 00:00:00 2001
From: Ilia Kosenkov <ilia.kosenkov@outlook.com>
Date: Wed, 5 May 2021 12:29:11 +0300
Subject: [PATCH 03/11] Removed rtools hack

---
 .github/workflows/test.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5af4ad8e..9cc7ad21 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -249,8 +249,6 @@ jobs:
         # 3. Add path to R's i386/x64  -- to solve x86 build/test issue
         run: |
           if ($env:RUST_TARGETS -like "*x86_64*") {
-            <# Amend rtools libgcc_eh.a #>
-            cp C:\rtools40\mingw64\lib\gcc\x86_64-w64-mingw32\8.3.0\libgcc.a C:\rtools40\mingw64\lib\gcc\x86_64-w64-mingw32\8.3.0\libgcc_eh.a 
             echo "C:\rtools40\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append ;
             echo "$(Rscript.exe -e 'cat(normalizePath(R.home()))')\bin\x64"  | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append ;
           }

From b55e68edade87a88c649fe141d5524e868fcfb7d Mon Sep 17 00:00:00 2001
From: Ilia Kosenkov <ilia.kosenkov@outlook.com>
Date: Wed, 5 May 2021 12:29:33 +0300
Subject: [PATCH 04/11] Explicit rtools40v2

---
 .github/workflows/test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9cc7ad21..dc71ebc3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -218,6 +218,7 @@ jobs:
         uses: r-lib/actions/setup-r@v1
         with:
           r-version: ${{ matrix.config.r }}
+          rtools-version: '40v2'
 
       - name: Set up Rust
         uses: actions-rs/toolchain@v1

From 3da397e8951cf0e41bbee9dfab210fb782e2eeac Mon Sep 17 00:00:00 2001
From: Ilia Kosenkov <ilia.kosenkov@outlook.com>
Date: Wed, 5 May 2021 12:30:46 +0300
Subject: [PATCH 05/11] Removing system rtools installation

---
 .github/workflows/test.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index dc71ebc3..bc78e5f6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -213,7 +213,10 @@ jobs:
     steps:
       
       - uses: actions/checkout@v2
-      
+      # https://github.com/r-lib/actions/pull/287
+      - name: Purge system Rtools installation
+        run: rm C:\rtools40 -Force -Recurse
+
       - name: Set up R
         uses: r-lib/actions/setup-r@v1
         with:

From 64ef085c307db594524899877a53a23727c7c1a5 Mon Sep 17 00:00:00 2001
From: Ilia Kosenkov <ilia.kosenkov@outlook.com>
Date: Wed, 5 May 2021 12:33:20 +0300
Subject: [PATCH 06/11] Handling no base rtools installation

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index bc78e5f6..eb989ce9 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -215,7 +215,7 @@ jobs:
       - uses: actions/checkout@v2
       # https://github.com/r-lib/actions/pull/287
       - name: Purge system Rtools installation
-        run: rm C:\rtools40 -Force -Recurse
+        run: rm C:\rtools40 -Force -Recurse -ErrorAction SilentlyContinue
 
       - name: Set up R
         uses: r-lib/actions/setup-r@v1

From e8c50b65521b3996665572d9f49b3c6c385f3d23 Mon Sep 17 00:00:00 2001
From: Ilia Kosenkov <ilia.kosenkov@outlook.com>
Date: Wed, 5 May 2021 12:37:06 +0300
Subject: [PATCH 07/11] Testing with reset cashe

---
 .github/workflows/test.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index eb989ce9..91968875 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -194,7 +194,7 @@ jobs:
   test_windows_rtools:
     runs-on: ${{ matrix.config.os }}
 
-    name: ${{ matrix.config.os }} (R-${{ matrix.config.r }} rust-${{ matrix.config.rust-version }}) \w RTOOLS
+    name: ${{ matrix.config.os }} (R-${{ matrix.config.r }} rust-${{ matrix.config.rust-version }}) \w RTOOLS test
               
     strategy:
       fail-fast: false
@@ -213,9 +213,10 @@ jobs:
     steps:
       
       - uses: actions/checkout@v2
+      # When this issue is resolved and PR merged, this step can be safely removed
       # https://github.com/r-lib/actions/pull/287
-      - name: Purge system Rtools installation
-        run: rm C:\rtools40 -Force -Recurse -ErrorAction SilentlyContinue
+      # - name: Purge system Rtools installation
+      #   run: rm C:\rtools40 -Force -Recurse -ErrorAction SilentlyContinue
 
       - name: Set up R
         uses: r-lib/actions/setup-r@v1

From ffd881f2509f8ecb0008b53e3a7954d901ab6126 Mon Sep 17 00:00:00 2001
From: Ilia Kosenkov <ilia.kosenkov@outlook.com>
Date: Wed, 5 May 2021 12:47:05 +0300
Subject: [PATCH 08/11] Reversing back

---
 .github/workflows/test.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 91968875..daa60f87 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -194,7 +194,7 @@ jobs:
   test_windows_rtools:
     runs-on: ${{ matrix.config.os }}
 
-    name: ${{ matrix.config.os }} (R-${{ matrix.config.r }} rust-${{ matrix.config.rust-version }}) \w RTOOLS test
+    name: ${{ matrix.config.os }} (R-${{ matrix.config.r }} rust-${{ matrix.config.rust-version }}) \w RTOOLSv2
               
     strategy:
       fail-fast: false
@@ -215,8 +215,8 @@ jobs:
       - uses: actions/checkout@v2
       # When this issue is resolved and PR merged, this step can be safely removed
       # https://github.com/r-lib/actions/pull/287
-      # - name: Purge system Rtools installation
-      #   run: rm C:\rtools40 -Force -Recurse -ErrorAction SilentlyContinue
+      - name: Purge system Rtools installation
+        run: rm C:\rtools40 -Force -Recurse -ErrorAction SilentlyContinue
 
       - name: Set up R
         uses: r-lib/actions/setup-r@v1

From 8347fecee64d6c70ab8ef19d9830d91a8d92068b Mon Sep 17 00:00:00 2001
From: Ilia Kosenkov <ilia.kosenkov@outlook.com>
Date: Wed, 5 May 2021 12:49:27 +0300
Subject: [PATCH 09/11] Removing debug infrastructure

---
 .github/workflows/test.yml | 306 ++++++++++++++++++-------------------
 1 file changed, 152 insertions(+), 154 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index daa60f87..d05819bf 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -5,191 +5,189 @@ on:
     branches:
       - main
       - master
-      - 'rtools-v2'
   pull_request:
     branches:
       - main
       - master
-  workflow_dispatch:
 
 jobs:
 
-  # test_with_bindgen:
-  #   runs-on: ${{ matrix.config.os }}
+  test_with_bindgen:
+    runs-on: ${{ matrix.config.os }}
 
-  #   name: ${{ matrix.config.os }} (R-${{ matrix.config.r }} rust-${{ matrix.config.rust-version }})
+    name: ${{ matrix.config.os }} (R-${{ matrix.config.r }} rust-${{ matrix.config.rust-version }})
               
-  #   strategy:
-  #     fail-fast: false
-  #     matrix:
-  #       config:
-  #         - {os: windows-latest, r: 'release', rust-version: 'stable-msvc',  targets: ['x86_64-pc-windows-gnu', 'i686-pc-windows-gnu']}
-  #         - {os: windows-latest, r: 'release', rust-version: 'nightly-msvc', targets: ['x86_64-pc-windows-gnu', 'i686-pc-windows-gnu']}
-  #         - {os: windows-latest, r: 'devel',   rust-version: 'stable-msvc',  targets: ['x86_64-pc-windows-gnu', 'i686-pc-windows-gnu']}
-  #         - {os: windows-latest, r: 'oldrel',  rust-version: 'stable-msvc',  targets: ['x86_64-pc-windows-gnu', 'i686-pc-windows-gnu']}
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+          - {os: windows-latest, r: 'release', rust-version: 'stable-msvc',  targets: ['x86_64-pc-windows-gnu', 'i686-pc-windows-gnu']}
+          - {os: windows-latest, r: 'release', rust-version: 'nightly-msvc', targets: ['x86_64-pc-windows-gnu', 'i686-pc-windows-gnu']}
+          - {os: windows-latest, r: 'devel',   rust-version: 'stable-msvc',  targets: ['x86_64-pc-windows-gnu', 'i686-pc-windows-gnu']}
+          - {os: windows-latest, r: 'oldrel',  rust-version: 'stable-msvc',  targets: ['x86_64-pc-windows-gnu', 'i686-pc-windows-gnu']}
 
-  #         - {os: macOS-latest,   r: 'release', rust-version: 'stable'}
-  #         - {os: macOS-latest,   r: 'release', rust-version: 'nightly'}
-  #         - {os: macOS-latest,   r: 'devel',   rust-version: 'stable'}
-  #         - {os: macOS-latest,   r: 'oldrel',  rust-version: 'stable'}
-  #         - {os: macOS-11.0,     r: 'release', rust-version: 'nightly',      targets: ['default', 'aarch64-apple-darwin'], 
-  #           no-test-targets: 'aarch64-apple-darwin', emit-bindings: 'true'}
+          - {os: macOS-latest,   r: 'release', rust-version: 'stable'}
+          - {os: macOS-latest,   r: 'release', rust-version: 'nightly'}
+          - {os: macOS-latest,   r: 'devel',   rust-version: 'stable'}
+          - {os: macOS-latest,   r: 'oldrel',  rust-version: 'stable'}
+          - {os: macOS-11.0,     r: 'release', rust-version: 'nightly',      targets: ['default', 'aarch64-apple-darwin'], 
+            no-test-targets: 'aarch64-apple-darwin', emit-bindings: 'true'}
 
-  #         - {os: ubuntu-20.04,   r: 'release', rust-version: 'stable',  rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
-  #         - {os: ubuntu-20.04,   r: 'release', rust-version: 'nightly', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
-  #         # R-devel requires LD_LIBRARY_PATH
-  #         - {os: ubuntu-20.04,   r: 'devel',   rust-version: 'stable',  rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}   
-  #         - {os: ubuntu-20.04,   r: 'oldrel',  rust-version: 'stable',  rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}   
+          - {os: ubuntu-20.04,   r: 'release', rust-version: 'stable',  rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
+          - {os: ubuntu-20.04,   r: 'release', rust-version: 'nightly', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
+          # R-devel requires LD_LIBRARY_PATH
+          - {os: ubuntu-20.04,   r: 'devel',   rust-version: 'stable',  rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}   
+          - {os: ubuntu-20.04,   r: 'oldrel',  rust-version: 'stable',  rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}   
 
 
 
-  #   env:
-  #     RSPM: ${{ matrix.config.rspm }}
+    env:
+      RSPM: ${{ matrix.config.rspm }}
 
-  #   # PowerShell core is available on all platforms and can be used to unify scripts
-  #   defaults:
-  #     run:
-  #       shell: pwsh
+    # PowerShell core is available on all platforms and can be used to unify scripts
+    defaults:
+      run:
+        shell: pwsh
       
-  #   steps:
+    steps:
       
-  #     - uses: actions/checkout@v2
+      - uses: actions/checkout@v2
       
-  #     - name: Set up R
-  #       uses: r-lib/actions/setup-r@v1
-  #       with:
-  #         r-version: ${{ matrix.config.r }}
+      - name: Set up R
+        uses: r-lib/actions/setup-r@v1
+        with:
+          r-version: ${{ matrix.config.r }}
 
-  #     - name: Set up Rust
-  #       uses: actions-rs/toolchain@v1
-  #       with:
-  #         toolchain: ${{ matrix.config.rust-version }}
-  #         default: true
-  #         components: rustfmt, clippy
+      - name: Set up Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: ${{ matrix.config.rust-version }}
+          default: true
+          components: rustfmt, clippy
 
-  #     - name: Configure targets
-  #       run: |
-  #         if ($env:RUST_TARGETS -eq '') {
-  #           $env:RUST_TARGETS = "default"
-  #         }
-  #         foreach ($target in ($env:RUST_TARGETS).Split(",")) {
-  #           if ($target -ne "default") {
-  #             rustup target add $target
-  #           }
-  #         }
-  #         echo "RUST_TARGETS=$env:RUST_TARGETS"  | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-  #       env:
-  #         RUST_TARGETS: ${{ join(matrix.config.targets, ',')}}
+      - name: Configure targets
+        run: |
+          if ($env:RUST_TARGETS -eq '') {
+            $env:RUST_TARGETS = "default"
+          }
+          foreach ($target in ($env:RUST_TARGETS).Split(",")) {
+            if ($target -ne "default") {
+              rustup target add $target
+            }
+          }
+          echo "RUST_TARGETS=$env:RUST_TARGETS"  | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        env:
+          RUST_TARGETS: ${{ join(matrix.config.targets, ',')}}
       
-  #     # All configurations for Windows go here
-  #     # Rust toolchain is used to determine target architecture
-  #     - name: Configure Windows
-  #       if: runner.os == 'Windows'
-  #       # 1. Configure path to libclang
-  #       # 2. Add path to mingw32/mingw64 -- otherwise library is linked to rtools
-  #       # 3. Add path to R's i386/x64  -- to solve x86 build/test issue
-  #       run: |
-  #         if ($env:RUST_TARGETS -like "*x86_64*") {
-  #           echo "C:\msys64\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append ;
-  #           echo "$(Rscript.exe -e 'cat(normalizePath(R.home()))')\bin\x64"  | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append ;
-  #         }
-  #         if ($env:RUST_TARGETS -like "*i686*") {
-  #           echo "C:\msys64\mingw32\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append ;
-  #           echo "$(Rscript.exe -e 'cat(normalizePath(R.home()))')\bin\i386"  | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append ;
-  #         }
+      # All configurations for Windows go here
+      # Rust toolchain is used to determine target architecture
+      - name: Configure Windows
+        if: runner.os == 'Windows'
+        # 1. Configure path to libclang
+        # 2. Add path to mingw32/mingw64 -- otherwise library is linked to rtools
+        # 3. Add path to R's i386/x64  -- to solve x86 build/test issue
+        run: |
+          if ($env:RUST_TARGETS -like "*x86_64*") {
+            echo "C:\msys64\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append ;
+            echo "$(Rscript.exe -e 'cat(normalizePath(R.home()))')\bin\x64"  | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append ;
+          }
+          if ($env:RUST_TARGETS -like "*i686*") {
+            echo "C:\msys64\mingw32\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append ;
+            echo "$(Rscript.exe -e 'cat(normalizePath(R.home()))')\bin\i386"  | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append ;
+          }
           
 
-  #     # MacOS configurations, mainly llvm and path to libclang
-  #     # Because of this R installation issue on MacOS-11.0 
-  #     # https://github.com/r-lib/actions/issues/200
-  #     # Symlinks to R/Rscript are not properly set up, so we do it by hand, using this trick
-  #     # https://github.com/r-lib/ps/commit/a24f2c4d1bdba63be14e7729b9ab81d0ed9f719e
-  #     # Environment variables are required fir Mac-OS-11.0, see
-  #     # https://github.com/extendr/libR-sys/issues/35
-  #     - name: Configure MacOs
-  #       if: runner.os == 'macOS'
-  #       run: | 
-  #         brew install llvm
-  #         echo "LIBCLANG_PATH=$(brew --prefix llvm)/lib" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-  #         $env:LLVM_CONFIG_PATH = "$(brew --prefix llvm)/bin/llvm-config" 
-  #         echo "LLVM_CONFIG_PATH=$env:LLVM_CONFIG_PATH" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-  #         echo "LIBRSYS_LIBCLANG_INCLUDE_PATH=$(. $env:LLVM_CONFIG_PATH --libdir)/clang/$(. $env:LLVM_CONFIG_PATH --version)/include"  | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+      # MacOS configurations, mainly llvm and path to libclang
+      # Because of this R installation issue on MacOS-11.0 
+      # https://github.com/r-lib/actions/issues/200
+      # Symlinks to R/Rscript are not properly set up, so we do it by hand, using this trick
+      # https://github.com/r-lib/ps/commit/a24f2c4d1bdba63be14e7729b9ab81d0ed9f719e
+      # Environment variables are required fir Mac-OS-11.0, see
+      # https://github.com/extendr/libR-sys/issues/35
+      - name: Configure MacOs
+        if: runner.os == 'macOS'
+        run: | 
+          brew install llvm
+          echo "LIBCLANG_PATH=$(brew --prefix llvm)/lib" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          $env:LLVM_CONFIG_PATH = "$(brew --prefix llvm)/bin/llvm-config" 
+          echo "LLVM_CONFIG_PATH=$env:LLVM_CONFIG_PATH" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          echo "LIBRSYS_LIBCLANG_INCLUDE_PATH=$(. $env:LLVM_CONFIG_PATH --libdir)/clang/$(. $env:LLVM_CONFIG_PATH --version)/include"  | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
-  #         if ((Get-ChildItem -Path /usr/local/bin -Filter R | Measure-Object).Count -eq 0) {
-  #           echo "::warning:: Found no R symlink in /usr/local/bin, setting up manually..."
-  #           ln -s /Library/Frameworks/R.framework/Versions/Current/Resources/bin/R /usr/local/bin/
-  #         }
-  #         if ((Get-ChildItem -Path /usr/local/bin -Filter Rscript | Measure-Object).Count -eq 0) {
-  #           echo "::warning:: Found no Rscript symlink in /usr/local/bin, setting up manually..."
-  #           ln -s /Library/Frameworks/R.framework/Versions/Current/Resources/bin/Rscript /usr/local/bin/
-  #         }
+          if ((Get-ChildItem -Path /usr/local/bin -Filter R | Measure-Object).Count -eq 0) {
+            echo "::warning:: Found no R symlink in /usr/local/bin, setting up manually..."
+            ln -s /Library/Frameworks/R.framework/Versions/Current/Resources/bin/R /usr/local/bin/
+          }
+          if ((Get-ChildItem -Path /usr/local/bin -Filter Rscript | Measure-Object).Count -eq 0) {
+            echo "::warning:: Found no Rscript symlink in /usr/local/bin, setting up manually..."
+            ln -s /Library/Frameworks/R.framework/Versions/Current/Resources/bin/Rscript /usr/local/bin/
+          }
 
-  #     # This is required for ubuntu r-devel
-  #     # 'Del alias:R' removes R alias which prevents running R 
-  #     - name: Configure Linux
-  #       if: runner.os == 'linux'
-  #       run: |
-  #         Del alias:R
-  #         echo "LD_LIBRARY_PATH=$(R -s -e 'cat(normalizePath(R.home()))')/lib" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+      # This is required for ubuntu r-devel
+      # 'Del alias:R' removes R alias which prevents running R 
+      - name: Configure Linux
+        if: runner.os == 'linux'
+        run: |
+          Del alias:R
+          echo "LD_LIBRARY_PATH=$(R -s -e 'cat(normalizePath(R.home()))')/lib" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
-  #     # Build and emit bindings to './generated_bindings'
-  #     - name: Build & Emit bindings
-  #       id: build
-  #       run: |
-  #         . ./ci-cargo.ps1
-  #         foreach ($target in ($env:RUST_TARGETS).Split(",")) {
-  #           ci-cargo build -vv --features use-bindgen $(if ($target -ne 'default') {"--target=$target"} ) -ActionName "Building for target: $target"
-  #         }
-  #       env:
-  #         LIBRSYS_BINDINGS_OUTPUT_PATH: generated_bindings
+      # Build and emit bindings to './generated_bindings'
+      - name: Build & Emit bindings
+        id: build
+        run: |
+          . ./ci-cargo.ps1
+          foreach ($target in ($env:RUST_TARGETS).Split(",")) {
+            ci-cargo build -vv --features use-bindgen $(if ($target -ne 'default') {"--target=$target"} ) -ActionName "Building for target: $target"
+          }
+        env:
+          LIBRSYS_BINDINGS_OUTPUT_PATH: generated_bindings
 
-  #     # Test the result of previous step
-  #     - name: Run tests
-  #       id: test
-  #       run: |
-  #         . ./ci-cargo.ps1
-  #         foreach ($target in ($env:RUST_TARGETS).Split(",")) {
-  #           if(($env:NO_TEST_TARGETS).Split(",").Contains($target)) {
-  #             echo "::warning:: Skipping bindgen tests for target: $target"
-  #           }
-  #           else {
-  #             ci-cargo test -vv --features use-bindgen $(if ($target -ne 'default') {"--target=$target"} ) '--' --nocapture --test-threads=1 -ActionName "Running bindgen tests for target: $target"
-  #           }
-  #         }
-  #       env: 
-  #         NO_TEST_TARGETS: ${{ join(matrix.config.no-test-targets, ',') }}
+      # Test the result of previous step
+      - name: Run tests
+        id: test
+        run: |
+          . ./ci-cargo.ps1
+          foreach ($target in ($env:RUST_TARGETS).Split(",")) {
+            if(($env:NO_TEST_TARGETS).Split(",").Contains($target)) {
+              echo "::warning:: Skipping bindgen tests for target: $target"
+            }
+            else {
+              ci-cargo test -vv --features use-bindgen $(if ($target -ne 'default') {"--target=$target"} ) '--' --nocapture --test-threads=1 -ActionName "Running bindgen tests for target: $target"
+            }
+          }
+        env: 
+          NO_TEST_TARGETS: ${{ join(matrix.config.no-test-targets, ',') }}
             
 
 
-  #     # If success
-  #     # AND (either rust is stable and 'emit-bindings' != 'false'
-  #     #      OR rust is any and 'emit-bindings' == 'true'),
-  #     # upload bindings
-  #     - name: Upload generated bindings
-  #       if: 
-  #         steps.build.outcome == 'success' && 
-  #         steps.test.outcome == 'success' && 
-  #         ((startsWith(matrix.config.rust-version, 'stable') && matrix.config.emit-bindings != 'false') ||
-  #           (matrix.config.emit-bindings == 'true'))
-  #       uses: actions/upload-artifact@main
-  #       with:
-  #         name: ${{ matrix.config.os }} (R-${{ matrix.config.r }} rust-${{ matrix.config.rust-version }}) generated bindings
-  #         path: generated_bindings
+      # If success
+      # AND (either rust is stable and 'emit-bindings' != 'false'
+      #      OR rust is any and 'emit-bindings' == 'true'),
+      # upload bindings
+      - name: Upload generated bindings
+        if: 
+          steps.build.outcome == 'success' && 
+          steps.test.outcome == 'success' && 
+          ((startsWith(matrix.config.rust-version, 'stable') && matrix.config.emit-bindings != 'false') ||
+            (matrix.config.emit-bindings == 'true'))
+        uses: actions/upload-artifact@main
+        with:
+          name: ${{ matrix.config.os }} (R-${{ matrix.config.r }} rust-${{ matrix.config.rust-version }}) generated bindings
+          path: generated_bindings
 
-  #     # Run tests again using different bindings
-  #     - name: Run tests on precomputed bindings shipped with libR-sys
-  #       run: |
-  #         . ./ci-cargo.ps1
-  #         foreach ($target in ($env:RUST_TARGETS).Split(",")) {
-  #           if(($env:NO_TEST_TARGETS).Split(",").Contains($target)) {
-  #             echo "::warning:: Skipping tests for target: $target"
-  #           }
-  #           else {    
-  #             ci-cargo test -vv $(if ($target -ne 'default') {"--target=$target"} ) '--' --nocapture --test-threads=1 -ActionName "Running tests for target: $target"
-  #           }
-  #         }
-  #       env: 
-  #         NO_TEST_TARGETS: ${{ join(matrix.config.no-test-targets, ',') }}
+      # Run tests again using different bindings
+      - name: Run tests on precomputed bindings shipped with libR-sys
+        run: |
+          . ./ci-cargo.ps1
+          foreach ($target in ($env:RUST_TARGETS).Split(",")) {
+            if(($env:NO_TEST_TARGETS).Split(",").Contains($target)) {
+              echo "::warning:: Skipping tests for target: $target"
+            }
+            else {    
+              ci-cargo test -vv $(if ($target -ne 'default') {"--target=$target"} ) '--' --nocapture --test-threads=1 -ActionName "Running tests for target: $target"
+            }
+          }
+        env: 
+          NO_TEST_TARGETS: ${{ join(matrix.config.no-test-targets, ',') }}
 
   test_windows_rtools:
     runs-on: ${{ matrix.config.os }}

From a55515f4a999adfa4535aaed57112e3a233864ef Mon Sep 17 00:00:00 2001
From: Ilia Kosenkov <ilia.kosenkov@outlook.com>
Date: Wed, 5 May 2021 13:19:00 +0300
Subject: [PATCH 10/11] Comments

---
 .github/workflows/test.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d05819bf..d1666bee 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -211,8 +211,10 @@ jobs:
     steps:
       
       - uses: actions/checkout@v2
+
       # When this issue is resolved and PR merged, this step can be safely removed
       # https://github.com/r-lib/actions/pull/287
+      # https://github.com/r-lib/actions/issues/289
       - name: Purge system Rtools installation
         run: rm C:\rtools40 -Force -Recurse -ErrorAction SilentlyContinue
 
@@ -220,6 +222,8 @@ jobs:
         uses: r-lib/actions/setup-r@v1
         with:
           r-version: ${{ matrix.config.r }}
+          # Explicit version string can be removed after
+          # https://github.com/r-lib/actions/pull/287
           rtools-version: '40v2'
 
       - name: Set up Rust

From 286b12a209c4c398c98b7980d5f5dc8adeef295d Mon Sep 17 00:00:00 2001
From: Ilia Kosenkov <ilia.kosenkov@outlook.com>
Date: Wed, 26 May 2021 12:07:04 +0300
Subject: [PATCH 11/11] Switching to new rtools version

---
 .github/workflows/test.yml | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d1666bee..e592d1e5 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -212,19 +212,10 @@ jobs:
       
       - uses: actions/checkout@v2
 
-      # When this issue is resolved and PR merged, this step can be safely removed
-      # https://github.com/r-lib/actions/pull/287
-      # https://github.com/r-lib/actions/issues/289
-      - name: Purge system Rtools installation
-        run: rm C:\rtools40 -Force -Recurse -ErrorAction SilentlyContinue
-
       - name: Set up R
         uses: r-lib/actions/setup-r@v1
         with:
           r-version: ${{ matrix.config.r }}
-          # Explicit version string can be removed after
-          # https://github.com/r-lib/actions/pull/287
-          rtools-version: '40v2'
 
       - name: Set up Rust
         uses: actions-rs/toolchain@v1
@@ -251,9 +242,8 @@ jobs:
       # Rust toolchain is used to determine target architecture
       - name: Configure Windows
         if: runner.os == 'Windows'
-        # 1. Configure path to libclang
-        # 2. Add path to mingw32/mingw64 -- otherwise library is linked to rtools
-        # 3. Add path to R's i386/x64  -- to solve x86 build/test issue
+        # 1. Put rtools' mingw on PATH
+        # 2. Add R's i386/x64 to PATH
         run: |
           if ($env:RUST_TARGETS -like "*x86_64*") {
             echo "C:\rtools40\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append ;