Skip to content

Commit 48baeb1

Browse files
committed
Doc updates
1 parent ef383ae commit 48baeb1

File tree

2 files changed

+18
-14
lines changed

2 files changed

+18
-14
lines changed

README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1+
[ruby/setup-ruby]:https://github.com/ruby/setup-ruby
2+
13
# setup-ruby-pkgs
24

3-
Cross platform action for Ruby CI that configures build tools and installs packages needed for compiling.
5+
Cross platform action that installs Ruby, along with tools and packages needed for compiling.
6+
7+
If you don't need any changes to tools or packages, please use [ruby/setup-ruby].
48

59
The action's inputs are shown below:
610

@@ -23,7 +27,7 @@ All inputs are optional.
2327
2428
### ruby-version:
2529
26-
Installs the Ruby version using the code from [ruby/setup-ruby](https://github.com/ruby/setup-ruby). The available versions can be found in its [README](https://github.com/ruby/setup-ruby/blob/master/README.md#supported-versions).
30+
Installs the Ruby version using the code from [ruby/setup-ruby]. The available versions can be found in its [README](https://github.com/ruby/setup-ruby/blob/master/README.md#supported-versions).
2731
2832
### apt: (Ubuntu)
2933

Ruby_and_Windows.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Compiled with a set of gcc tools known as MSYS. MSYS is no longer supported and
4141

4242
[ruby/setup-ruby] adds all `ENV` information required to use the correct set of build tools. Most of the below information is general background that pertains to local use.
4343

44-
* MinGW Rubies include a file named `devkit.rb`. Requiring it adds the build tools' locations to Path. For CI, the locations are added by [ruby/setup-ruby](https://github.com/ruby/setup-ruby).
44+
* MinGW Rubies include a file named `devkit.rb`. Requiring it adds the build tools' locations to Path. For CI, the locations are added by [ruby/setup-ruby].
4545

4646
* MinGW Rubies also include a file `rubygems/defaults/operating_system.rb`, which essentially performs the same function as `devkit.rb`. When a gem needs to be compiled, it adds the builds tools to `ENV`. It also adds the locations of the devkit package dlls to the dll library 'lookup resolution' chain. This is done with a Windows specific system call.
4747

@@ -52,17 +52,17 @@ Compiled with a set of gcc tools known as MSYS. MSYS is no longer supported and
5252

5353
## MinGW builds - gcc compatibility
5454

55-
Many Windows CI providers only have the most recent Ruby patch/teeny versions installed. With GitHub Actions and [ruby/setup-ruby](https://github.com/ruby/setup-ruby), all Windows versions from Ruby 2.4 and later are available. There may be compatibility issues when using a current MSYS2 gcc with older Ruby patch versions.
56-
57-
| gcc \\ ruby | 2.4 | 2.5 | 2.6 | 2.7 |
58-
| :---: | :--- | :--- | :--- | :--- |
59-
| **6.3.0-3** | 2.4.1 | | | |
60-
| **7.2.0-2** | | 2.5.0 | | |
61-
| **8.2.1-1** | | | 2.6.0 | |
62-
| **8.3.0-2** | 2.4.6 | 2.5.5 | 2.6.3 | |
63-
| **9.2.0-1** | 2.4.7 | 2.5.6 | 2.6.4 | |
64-
| **9.2.0-2** | 2.4.9 | 2.5.7 | 2.6.5 | 2.7.0 |
65-
55+
Many Windows CI providers only have the most recent Ruby patch/teeny versions installed. With GitHub Actions and [ruby/setup-ruby], all Windows versions from Ruby 2.4 and later are available. There may be compatibility issues when using a current MSYS2 gcc with older Ruby patch versions.
56+
57+
| gcc \\ ruby | 2.4 | 2.5 | 2.6 | 2.7 | master |
58+
| :---: | :--- | :--- | :--- | :--- | |
59+
| **6.3.0-3** | 2.4.1 | | | | |
60+
| **7.2.0-2** | | 2.5.0 | | | |
61+
| **8.2.1-1** | | | 2.6.0 | | |
62+
| **8.3.0-2** | 2.4.6 | 2.5.5 | 2.6.3 | | |
63+
| **9.2.0-1** | 2.4.7 | 2.5.6 | 2.6.4 | | |
64+
| **9.2.0-2** | 2.4.9 | 2.5.7 | 2.6.5 | 2.7.0 | |
65+
| **9.3.0-1** | | | | | mingw |
6666

6767
## Windows OpenSSL
6868

0 commit comments

Comments
 (0)