Skip to content

Commit e36f47a

Browse files
einelazka
authored andcommitted
v2.6.0 d7eeada
1 parent 0d49294 commit e36f47a

File tree

3 files changed

+89
-18
lines changed

3 files changed

+89
-18
lines changed

README.md

Lines changed: 71 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,24 @@ See, for instance:
113113
- uses: msys2/setup-msys2@v2
114114
with:
115115
msystem: ${{matrix.sys}}
116-
install: mingw-w64-${{matrix.env}}-toolchain
116+
install: mingw-w64-${{matrix.env}}-openssl
117+
```
118+
119+
Alternatively, option `pacboy` allows using a single matrix variable:
120+
121+
```yml
122+
strategy:
123+
matrix:
124+
sys:
125+
- mingw64
126+
- mingw32
127+
- ucrt64 # Experimental!
128+
- clang64 # Experimental!
129+
steps:
130+
- uses: msys2/setup-msys2@v2
131+
with:
132+
msystem: ${{matrix.sys}}
133+
pacboy: openssl:p
117134
```
118135

119136
Find similar patterms in the following workflows:
@@ -176,38 +193,80 @@ This option corresponds to the `MSYS2_PATH_TYPE` setting in MSYS2; hence it can
176193
See [msys2/MSYS2-packages: filesystem/profile](https://github.com/msys2/MSYS2-packages/blob/915946a637e1f2b7e26e32782f3af322009293db/filesystem/profile#L28-L45)
177194
for further details about the configuration of each option.
178195

179-
#### release
196+
#### update
180197

181-
By default (`true`), retrieve and extract base installation from upstream GitHub Releases.
182-
If set to `false`, the installation available in the virtual environment is used:
198+
By default, the installation is not updated; hence package versions are those of the installation tarball.
199+
By setting option `update` to `true`, the action will try to update the runtime and packages cleanly:
183200

184201
```yaml
185202
- uses: msys2/setup-msys2@v2
186203
with:
187-
release: false
204+
update: true
188205
```
189206

190-
#### update
207+
#### install
191208

192-
By default, the installation is not updated; hence package versions are those of the installation tarball.
193-
By setting option `update` to `true`, the action will try to update the runtime and packages cleanly:
209+
Installing additional packages after updating the system is supported through option `install`.
210+
The package or list of packages are installed through `pacman --noconfirm -S --needed --overwrite *`.
194211

195212
```yaml
196213
- uses: msys2/setup-msys2@v2
197214
with:
198215
update: true
216+
install: >-
217+
git
218+
base-devel
199219
```
200220

201-
#### install
221+
#### pacboy
202222

203-
Installing additional packages after updating the system is supported through option `install`.
204-
The package or list of packages are installed through `pacman --noconfirm -S --needed`.
223+
Installing additional packages with [pacboy](https://www.msys2.org/docs/package-management/#avoiding-writing-long-package-names) after updating the system is supported through option `pacboy`.
224+
The package or list of packages are installed through `pacboy --noconfirm -S --needed`.
205225

206226
```yaml
227+
strategy:
228+
fail-fast: false
229+
matrix:
230+
sys: [ MINGW64, MINGW32, UCRT64, CLANG64 ]
231+
steps:
207232
- uses: msys2/setup-msys2@v2
208233
with:
209-
update: true
234+
msystem: ${{matrix.sys}}
210235
install: >-
211236
git
212237
base-devel
238+
pacboy: >-
239+
openssl:p
240+
```
241+
242+
#### release
243+
244+
By default (`true`), retrieve and extract base installation from upstream GitHub Releases.
245+
If set to `false`, the installation available in the virtual environment is used:
246+
247+
```yaml
248+
- uses: msys2/setup-msys2@v2
249+
with:
250+
release: false
251+
```
252+
253+
#### location
254+
255+
Specify the location where to install msys2:
256+
257+
```yaml
258+
- uses: msys2/setup-msys2@v2
259+
with:
260+
location: D:\
261+
```
262+
263+
#### platform-check-severity
264+
265+
By default (`fatal`), throw an error if the runner OS is not Windows.
266+
If set to `warn`, simply log a message and skip the rest:
267+
268+
```yaml
269+
- uses: msys2/setup-msys2@v2
270+
with:
271+
platform-check-severity: warn
213272
```

action.yml

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,30 @@ inputs:
1212
description: 'Default value for MSYS2_PATH_TYPE environment variable: strict, inherit or minimal'
1313
required: false
1414
default: 'minimal'
15-
release:
16-
description: 'Retrieve and extract base installation from upstream GitHub Releases'
17-
required: false
18-
default: true
1915
update:
2016
description: 'Update MSYS2 installation through pacman'
2117
required: false
2218
default: false
2319
install:
24-
description: 'Install packages after installation through pacman'
20+
description: 'After installation and/or update, install additional packages through pacman'
21+
required: false
22+
default: false
23+
pacboy:
24+
description: 'After installation and/or update, install additional packages through pacboy'
2525
required: false
2626
default: false
27+
release:
28+
description: 'Retrieve and extract base installation from upstream GitHub Releases'
29+
required: false
30+
default: true
31+
location:
32+
description: 'Where to install MSYS2'
33+
required: false
34+
default: 'RUNNER_TEMP'
35+
platform-check-severity:
36+
description: 'What to do when run on an incompatible runner: fatal, warn'
37+
required: false
38+
default: 'fatal'
2739
runs:
2840
using: 'node12'
2941
main: 'index.js'

index.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)