Skip to content

Commit 87db6f6

Browse files
Removing unnecessary MSYS2 step from GHA (#42)
* No need for MSYS2 * Cleanup
1 parent 70134ab commit 87db6f6

File tree

1 file changed

+8
-19
lines changed

1 file changed

+8
-19
lines changed

.github/workflows/test.yml

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -71,26 +71,15 @@ jobs:
7171
default: true
7272
components: rustfmt, clippy
7373

74-
# This step is only needed for Windows
75-
- name: Set up MSYS2 for Windows
76-
if: runner.os == 'Windows'
77-
uses: msys2/setup-msys2@v2
78-
with:
79-
msystem: ${{ matrix.config.msystem }}
80-
path-type: inherit
81-
release: false
82-
update: false
83-
8474
# All configurations for Windows go here
85-
# `Rust` toolchain is used to determine target architecture
86-
# Alternatively, `if:` conditions can be used
75+
# Rust toolchain is used to determine target architecture
8776
- name: Configure Windows
8877
if: runner.os == 'Windows'
8978
# 1. Add appropriate *-gnu target
90-
# 2. Set CARGO_BUILD_FLAGS to the `rust` target
91-
# 3. Configure path to `libclang`
92-
# 4. Add path to `mingw32`/`mingw64` -- otherwise library is linked to `rtools`
93-
# 5. Add path to R's `i386`/`x64` -- to solve `x86` build/test issue
79+
# 2. Set CARGO_BUILD_FLAGS to the Rust target
80+
# 3. Configure path to libclang
81+
# 4. Add path to mingw32/mingw64 -- otherwise library is linked to rtools
82+
# 5. Add path to R's i386/x64 -- to solve x86 build/test issue
9483
run: |
9584
if ($env:RUST_TOOLCHAIN -like "*x86_64*") {
9685
rustup target add x86_64-pc-windows-gnu ;
@@ -111,7 +100,7 @@ jobs:
111100
RUST_TOOLCHAIN: ${{ matrix.config.rust-version }}
112101

113102

114-
# MacOS configurations, mainly `llvm` and path to `libclang`
103+
# MacOS configurations, mainly llvm and path to libclang
115104
- name: Configure MacOs
116105
if: runner.os == 'macOS'
117106
run: |
@@ -120,14 +109,14 @@ jobs:
120109
121110
122111
# This is required for ubuntu r-devel
123-
# 'Del alias:R' removes 'R' alias which prevents running R
112+
# 'Del alias:R' removes R alias which prevents running R
124113
- name: Configure Linux
125114
if: runner.os == 'linux'
126115
run: |
127116
Del alias:R
128117
echo "LD_LIBRARY_PATH=$(R -s -e 'cat(normalizePath(R.home()))')/lib" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
129118
130-
# Build and emit bindings to `./generated_bindings`
119+
# Build and emit bindings to './generated_bindings'
131120
- name: Build & Emit bindings
132121
id: build
133122
run: |

0 commit comments

Comments
 (0)