Skip to content

Commit 784a06c

Browse files
committed
Remove 'convenience' install of Choco OpenSSL, update README
1 parent 5029fe1 commit 784a06c

File tree

6 files changed

+19
-27
lines changed

6 files changed

+19
-27
lines changed

README.md

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66

77
Cross platform action that installs Ruby, along with tools and packages needed for compiling.
88

9-
If you don't need any changes to tools or packages, please use [ruby/setup-ruby].
9+
**IMPORTANT NOTE:** If one is using Actions image 'windows-2022' or later, [ruby/setup-ruby]
10+
installs all packages needed to compile/build Windows Rubies, versions 2.5 and later.
11+
Hence, if you don't need any additional tools or packages, please use [ruby/setup-ruby].
1012

1113
The action's inputs are shown below:
1214

@@ -23,7 +25,7 @@ The action's inputs are shown below:
2325
brew: # macOS
2426
mingw: # Windows mingw / mswin /ucrt
2527
msys2: # mingw / mswin /ucrt
26-
mswin: # Windows mswin
28+
mswin: # Windows mswin - installs MSYS packages
2729
choco: # mswin
2830
vcpkg: # mswin
2931
```
@@ -52,35 +54,36 @@ List of packages to install. Space delimited. Special options are `_update_` an
5254

5355
* **Ruby 2.4 & later**<br/>
5456
List of MSYS2 MinGW packages to install.<br/>
55-
Space delimited. The package prefix (`mingw-w64-x86_64-` or `mingw-w64-ucrt-x86_64-`) is not required.<br/>If `_upgrade_` is included in the input, all packages needed by the gcc tools are updated.<br/>If `openssl` is included, an appropriate package will be installed.
57+
Space delimited. The package prefix (`mingw-w64-x86_64-` or `mingw-w64-ucrt-x86_64-`) is not required.<br/>
58+
If `_upgrade_` is included in the input, all packages needed by the gcc tools are updated.<br/>
59+
If `openssl` is included, an appropriate package will be installed.
5660

5761
* **Ruby 2.3 & earlier**<br/>
5862
The following DevKit packages are available:<br/>
5963
* libffi-3.2.1
6064
* openssl-1.0.2j
6165
* ragel-6.7
62-
* sqlite-3.7.15.2 (sqlite3)</li>
66+
* sqlite-3.7.15.2 (sqlite3)
6367
* zlib-1.2.8
6468

65-
* **Ruby mswin**<br/>
66-
If `openssl` is included, it will be installed for mswin as a convenience.<br/>Likewise, if `ragel` is included, the MSYS2 ragel package will be installed.
67-
</dl>
68-
6969
### msys2: (Windows)
7070

7171
* **Ruby 2.4 & later**<br/>
72-
List of MSYS2 packages to install. Space delimited. These are command line utilities, and are rarely needed.
72+
List of MSYS2 packages to install. Space delimited. These are command line utilities and are rarely needed.
7373

7474
* **Ruby 2.3 & earlier**<br/
75-
No action, as no utilities are available for the older MSYS/DevKit.</dd>
75+
No action, as no utilities are available for the older MSYS/DevKit.
7676

7777
### mswin: (Windows)
7878

79-
Installs MSYS2 packages. These are typically build utilities, such as bison, ragel, etc. As in pacman, MinGW packages must be prefixed with `mingw-w64-x86_64-`.
79+
Installs MSYS2 packages. These are typically build utilities, such as bison, ragel, etc.
80+
As in pacman, MinGW packages must be prefixed with `mingw-w64-x86_64-` or `mingw-w64-ucrt-x86_64-`.
8081

8182
### choco: (Windows)
8283

8384
List of packages to install. Space delimited. Most packages are compiled with msvc, so normally used with mswin builds.
85+
Currently, the mswin Ruby build is compiled using [microsoft/vcpkg](https://github.com/microsoft/vcpkg) packages, so
86+
use of choco packages is discouraged.
8487

8588
### vcpkg: (Windows)
8689

RELEASES.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# ruby/setup-ruby-pkgs Releases
22

3+
### v1.32.0 - 2022-May-19
4+
- Remove 'convenience' install of Choco OpenSSL, update README
5+
36
### v1.31.0 - 2022-May-18
47
- vcpkg - update repo, add `installed/x64-windows/bin` to path
58
- Use node16, package.json version updates

dist/index.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -627,13 +627,6 @@ const run = async () => {
627627
grpEnd(msSt)
628628
}
629629

630-
if (mingw.includes('openssl')) {
631-
if (!choco.includes('openssl')) {
632-
choco += ' openssl'
633-
choco = choco.trim()
634-
}
635-
}
636-
637630
if (choco !== '') {
638631
msSt = grpSt(`choco install ${choco}`)
639632
execSync(`choco install --no-progress ${choco}`)

dist/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "setup-ruby-pkgs",
3-
"version": "1.31.0",
3+
"version": "1.32.0",
44
"description": "Install packages and update builds tools for Ruby",
55
"main": "index.js",
66
"scripts": {

mswin.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,6 @@ export const run = async () => {
3232
grpEnd(msSt)
3333
}
3434

35-
if (mingw.includes('openssl')) {
36-
if (!choco.includes('openssl')) {
37-
choco += ' openssl'
38-
choco = choco.trim()
39-
}
40-
}
41-
4235
if (choco !== '') {
4336
msSt = grpSt(`choco install ${choco}`)
4437
execSync(`choco install --no-progress ${choco}`)

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "setup-ruby-pkgs",
3-
"version": "1.31.0",
3+
"version": "1.32.0",
44
"description": "Install packages and update builds tools for Ruby",
55
"main": "index.js",
66
"scripts": {

0 commit comments

Comments
 (0)