From aa337abcb396c5bdb375d1237269dfa16af7aa49 Mon Sep 17 00:00:00 2001
From: Zargham Ahmad <46793118+zargham-ahmad@users.noreply.github.com>
Date: Sun, 25 Jun 2023 20:50:03 +0200
Subject: [PATCH 1/3] Update r-conda.yml

---
 .github/workflows/r-conda.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/r-conda.yml b/.github/workflows/r-conda.yml
index 2e56335..5efec90 100644
--- a/.github/workflows/r-conda.yml
+++ b/.github/workflows/r-conda.yml
@@ -33,6 +33,9 @@ jobs:
       - name: Install wget
         if: ${{ matrix.os == 'windows-latest' }}
         run: choco install wget
+      - name: setup R
+        if: ${{ matrix.os == 'windows-latest' }}
+        uses: r-lib/actions/setup-r@v2
 
       - name: Create conda environment
         uses: conda-incubator/setup-miniconda@v2

From 1a80c08a1953a57d2eac256217166056e20d6045 Mon Sep 17 00:00:00 2001
From: Zargham Ahmad <46793118+zargham-ahmad@users.noreply.github.com>
Date: Sun, 25 Jun 2023 21:19:14 +0200
Subject: [PATCH 2/3] Update r-conda.yml

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

diff --git a/.github/workflows/r-conda.yml b/.github/workflows/r-conda.yml
index 5efec90..4a26505 100644
--- a/.github/workflows/r-conda.yml
+++ b/.github/workflows/r-conda.yml
@@ -33,9 +33,6 @@ jobs:
       - name: Install wget
         if: ${{ matrix.os == 'windows-latest' }}
         run: choco install wget
-      - name: setup R
-        if: ${{ matrix.os == 'windows-latest' }}
-        uses: r-lib/actions/setup-r@v2
 
       - name: Create conda environment
         uses: conda-incubator/setup-miniconda@v2
@@ -53,6 +50,12 @@ jobs:
         run: wget -P tests/testthat/test-data/batchwise-correction -i tests/remote-files/fetch_waveica_batchwise.txt
       - name: Fetch nonbatchwise waveica results
         run: wget -P tests/testthat/test-data/nonbatchwise-correction -i tests/remote-files/fetch_waveica_nonbatchwise.txt
+      - name: setup Rtools
+        if: ${{ matrix.os == 'windows-latest' }}
+        uses: r-lib/actions/setup-r@v2
+        with:
+          r-version: '4.1.3'
+          windows-path-include-rtools: true
       - name: Run devtools::check()
         run: |
           conda activate recetox-waveica-dev

From 7bd6f49265e2b103593b8b46a239bcd47cb5717b Mon Sep 17 00:00:00 2001
From: Zargham Ahmad <46793118+zargham-ahmad@users.noreply.github.com>
Date: Sun, 25 Jun 2023 21:52:19 +0200
Subject: [PATCH 3/3] Update r-conda.yml

---
 .github/workflows/r-conda.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/r-conda.yml b/.github/workflows/r-conda.yml
index 4a26505..050fb98 100644
--- a/.github/workflows/r-conda.yml
+++ b/.github/workflows/r-conda.yml
@@ -52,10 +52,7 @@ jobs:
         run: wget -P tests/testthat/test-data/nonbatchwise-correction -i tests/remote-files/fetch_waveica_nonbatchwise.txt
       - name: setup Rtools
         if: ${{ matrix.os == 'windows-latest' }}
-        uses: r-lib/actions/setup-r@v2
-        with:
-          r-version: '4.1.3'
-          windows-path-include-rtools: true
+        uses: r-windows/install-rtools@master
       - name: Run devtools::check()
         run: |
           conda activate recetox-waveica-dev