Skip to content

Commit aa519a7

Browse files
committed
TEMP STUFF
1 parent 18c0a92 commit aa519a7

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,8 @@ jobs:
105105
release: true
106106
path-type: inherit
107107
install: "make git dos2unix diffutils\n"
108+
- name: disable git crlf conversion
109+
run: src/ci/scripts/disable-git-crlf-conversion.sh
108110
- name: checkout the source code
109111
uses: actions/checkout@v4
110112
with:
@@ -508,6 +510,8 @@ jobs:
508510
release: true
509511
path-type: inherit
510512
install: "make git dos2unix diffutils\n"
513+
- name: disable git crlf conversion
514+
run: src/ci/scripts/disable-git-crlf-conversion.sh
511515
- name: checkout the source code
512516
uses: actions/checkout@v4
513517
with:
@@ -645,6 +649,8 @@ jobs:
645649
release: true
646650
path-type: inherit
647651
install: "make git dos2unix diffutils\n"
652+
- name: disable git crlf conversion
653+
run: src/ci/scripts/disable-git-crlf-conversion.sh
648654
- name: checkout the source code
649655
uses: actions/checkout@v4
650656
with:

INSTALL.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,9 @@ toolchain.
145145

146146
1. Download the latest [MSYS2 installer][msys2] and go through the installer.
147147

148-
2. Run `mingw32_shell.bat` or `mingw64_shell.bat` from the MSYS2 installation
149-
directory (e.g. `C:\msys64`), depending on whether you want 32-bit or 64-bit
150-
Rust. (As of the latest version of MSYS2 you have to run `msys2_shell.cmd
151-
-mingw32` or `msys2_shell.cmd -mingw64` from the command line instead.)
148+
2. Start a MINGW64 or MINGW32 shell (depending on whether you want 32-bit
149+
or 64-bit Rust) either from your start menu, or by running `mingw64.exe`
150+
or `mingw32.exe` from your MSYS2 installation directory (e.g. `C:\msys64`).
152151

153152
3. From this terminal, install the required tools:
154153

0 commit comments

Comments
 (0)