Skip to content

Commit e919657

Browse files
committed
v2.16.0 399a23b
1 parent 4ceeb15 commit e919657

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
-->
44
<a title="Join the chat at https://gitter.im/msys2/msys2" href="https://gitter.im/msys2/msys2"><img src="https://img.shields.io/badge/chat-on%20gitter-4db797.svg?longCache=true&style=flat-square&logo=gitter&logoColor=e8ecef&label=Chat"></a><!--
55
-->
6-
<a title="'Test' workflow Status" href="https://github.com/msys2/setup-msys2/actions/workflows/Test.yml"><img alt="'Test' workflow Status" src="https://img.shields.io/github/workflow/status/msys2/setup-msys2/Test/main?longCache=true&style=flat-square&label=Test&logo=github"></a><!--
6+
<a title="'Test' workflow Status" href="https://github.com/msys2/setup-msys2/actions/workflows/Test.yml"><img alt="'Test' workflow Status" src="https://img.shields.io/github/actions/workflow/status/msys2/setup-msys2/Test.yml?branch=main&longCache=true&style=flat-square&label=Test&logo=github"></a><!--
77
-->
8-
<a title="'Example PKGBUILD' workflow Status" href="https://github.com/msys2/setup-msys2/actions/workflows/Tool.yml"><img alt="'Example PKGBUILD' workflow Status" src="https://img.shields.io/github/workflow/status/msys2/setup-msys2/Tool/main?longCache=true&style=flat-square&label=Example%20PKGBUILD&logo=github"></a><!--
8+
<a title="'Example PKGBUILD' workflow Status" href="https://github.com/msys2/setup-msys2/actions/workflows/Tool.yml"><img alt="'Example PKGBUILD' workflow Status" src="https://img.shields.io/github/actions/workflow/status/msys2/setup-msys2/Tool.yml?branch=main&longCache=true&style=flat-square&label=Example%20PKGBUILD&logo=github"></a><!--
99
-->
1010
</p>
1111

1212
# Setup MSYS2
1313

1414
**setup-msys2** is a JavaScript GitHub Action (GHA) to setup an [MSYS2](https://www.msys2.org/) environment (i.e. MSYS,
15-
MINGW32, MINGW64, UCRT64, CLANG32, and/or CLANG64 shells) using the GHA [toolkit](https://github.com/actions/toolkit) for
15+
MINGW32, MINGW64, UCRT64, CLANG32, CLANG64 and/or CLANGARM64 shells) using the GHA [toolkit](https://github.com/actions/toolkit) for
1616
automatic caching.
1717

1818
## Context
@@ -104,8 +104,8 @@ See, for instance:
104104
include:
105105
- { sys: mingw64, env: x86_64 }
106106
- { sys: mingw32, env: i686 }
107-
- { sys: ucrt64, env: ucrt-x86_64 } # Experimental!
108-
- { sys: clang64, env: clang-x86_64 } # Experimental!
107+
- { sys: ucrt64, env: ucrt-x86_64 }
108+
- { sys: clang64, env: clang-x86_64 }
109109
steps:
110110
- uses: msys2/setup-msys2@v2
111111
with:
@@ -121,8 +121,8 @@ Alternatively, option `pacboy` allows using a single matrix variable:
121121
sys:
122122
- mingw64
123123
- mingw32
124-
- ucrt64 # Experimental!
125-
- clang64 # Experimental!
124+
- ucrt64
125+
- clang64
126126
steps:
127127
- uses: msys2/setup-msys2@v2
128128
with:
@@ -153,13 +153,13 @@ Find further details at [#171](https://github.com/msys2/setup-msys2/issues/171#i
153153
#### msystem
154154

155155
By default, `MSYSTEM` is set to `MINGW64`. However, an optional parameter named `msystem` is supported, which expects
156-
`MSYS`, `MINGW64`, `MINGW32`, `UCRT64`, `CLANG32` or `CLANG64`.
156+
`MSYS`, `MINGW64`, `MINGW32`, `UCRT64`, `CLANG32`, `CLANG64` or `CLANGARM64`. MSYS2 recommends `UCRT64` nowadays as the default instead of `MINGW64`.
157157
For example:
158158

159159
```yaml
160160
- uses: msys2/setup-msys2@v2
161161
with:
162-
msystem: MSYS
162+
msystem: UCRT64
163163
```
164164

165165
Furthermore, the environment variable can be overridden.
@@ -175,7 +175,7 @@ For example, in order to build a PKGBUILD file and then test the installed artif
175175
makepkg-mingw -sCLfc --noconfirm --noprogressbar
176176
pacman --noconfirm -U mingw-w64-*-any.pkg.tar.xz
177177
- run: |
178-
set MSYSTEM=MINGW64
178+
set MSYSTEM=UCRT64
179179
msys2 -c '<command to test the package>'
180180
```
181181

action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ branding:
55
icon: terminal
66
inputs:
77
msystem:
8-
description: 'Variant of the environment to set by default: MSYS, MINGW32, MINGW64, UCRT64, CLANG32 or CLANG64'
8+
description: 'Variant of the environment to set by default: MSYS, MINGW32, MINGW64, UCRT64, CLANG32, CLANG64 or CLANGARM64'
99
required: false
1010
default: 'MINGW64'
1111
path-type:

index.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)