Skip to content

Commit

Permalink
Unpin R in pip/windows GHA jobs
Browse files Browse the repository at this point in the history
  • Loading branch information
langmm committed Jan 10, 2024
1 parent edcb3e2 commit 3bd5f55
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 38 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/julia-setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ jobs:
- name: Install R
if: matrix.install-method == 'pip'
uses: r-lib/actions/setup-r@v2
with:
r-version: 4.2.3
# with:
# r-version: 4.2.3
- name: Install Julia
if: matrix.install-method == 'pip'
uses: julia-actions/setup-julia@v1
Expand Down
30 changes: 0 additions & 30 deletions .github/workflows/test-install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -283,12 +283,6 @@ jobs:
== 1
name: (WINDOWS,PIP) Set up MSMPI
uses: mpi4py/setup-mpi@v1
- if: runner.os == 'Windows' && matrix.install-method == 'pip' && env.INSTALLR
== 1
name: Install R
uses: r-lib/actions/setup-r@v2
with:
r-version: 4.2.3
- if: startsWith(runner.os, 'Linux') && matrix.install-method == 'pip'
name: (LINUX,PIP) Cache pip
uses: actions/cache@v3
Expand Down Expand Up @@ -634,12 +628,6 @@ jobs:
== 1
name: (WINDOWS,PIP) Set up MSMPI
uses: mpi4py/setup-mpi@v1
- if: runner.os == 'Windows' && matrix.install-method == 'pip' && env.INSTALLR
== 1
name: Install R
uses: r-lib/actions/setup-r@v2
with:
r-version: 4.2.3
- if: startsWith(runner.os, 'Linux') && matrix.install-method == 'pip'
name: (LINUX,PIP) Cache pip
uses: actions/cache@v3
Expand Down Expand Up @@ -977,12 +965,6 @@ jobs:
== 1
name: (WINDOWS,PIP) Set up MSMPI
uses: mpi4py/setup-mpi@v1
- if: runner.os == 'Windows' && matrix.install-method == 'pip' && env.INSTALLR
== 1
name: Install R
uses: r-lib/actions/setup-r@v2
with:
r-version: 4.2.3
- if: startsWith(runner.os, 'Linux') && matrix.install-method == 'pip'
name: (LINUX,PIP) Cache pip
uses: actions/cache@v3
Expand Down Expand Up @@ -1303,12 +1285,6 @@ jobs:
== 1
name: (WINDOWS,PIP) Set up MSMPI
uses: mpi4py/setup-mpi@v1
- if: runner.os == 'Windows' && matrix.install-method == 'pip' && env.INSTALLR
== 1
name: Install R
uses: r-lib/actions/setup-r@v2
with:
r-version: 4.2.3
- if: startsWith(runner.os, 'Linux') && matrix.install-method == 'pip'
name: (LINUX,PIP) Cache pip
uses: actions/cache@v3
Expand Down Expand Up @@ -1628,12 +1604,6 @@ jobs:
== 1
name: (WINDOWS,PIP) Set up MSMPI
uses: mpi4py/setup-mpi@v1
- if: runner.os == 'Windows' && matrix.install-method == 'pip' && env.INSTALLR
== 1
name: Install R
uses: r-lib/actions/setup-r@v2
with:
r-version: 4.2.3
- if: startsWith(runner.os, 'Linux') && matrix.install-method == 'pip'
name: (LINUX,PIP) Cache pip
uses: actions/cache@v3
Expand Down
12 changes: 6 additions & 6 deletions utils/test-install-base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,12 @@ jobs:
- name: (WINDOWS,PIP) Set up MSMPI
uses: mpi4py/setup-mpi@v1
if: runner.os == 'Windows' && matrix.install-method == 'pip' && env.INSTALLMPI == 1
- name: Install R
uses: r-lib/actions/setup-r@v2
if: runner.os == 'Windows' && matrix.install-method == 'pip' && env.INSTALLR == 1
with:
r-version: '4.2.3'
# windows-path-include-rtools: false
# - name: Install R
# uses: r-lib/actions/setup-r@v2
# if: runner.os == 'Windows' && matrix.install-method == 'pip' && env.INSTALLR == 1
# with:
# r-version: '4.2.3'
# # windows-path-include-rtools: false
- name: (LINUX,PIP) Cache pip
uses: actions/cache@v3
if: startsWith(runner.os, 'Linux') && matrix.install-method == 'pip'
Expand Down

0 comments on commit 3bd5f55

Please sign in to comment.