Skip to content

Add --disable-download-timeout for MSYS2 pacman, fixups, v1.32.4 #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MSP-Greg merged 4 commits into from
Jan 7, 2023
Merged

Add --disable-download-timeout for MSYS2 pacman, fixups, v1.32.4 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe1a5c8
pacman - add --disable-download-timeout, v1.32.4
MSP-Greg Jan 7, 2023
3dd11fd
Fix OpenSSL install for Ruby head
MSP-Greg Jan 7, 2023
cb49ba9
Don't install dlfcn package
MSP-Greg Jan 7, 2023
abfe7cf
Fix Actions for Windows Head/OpenSSL, RG for 2.4 & 2.5
MSP-Greg Jan 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions .github/workflows/ruby.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Ruby Install
uses: ./
Expand Down Expand Up @@ -63,6 +63,7 @@ jobs:

- name: Ruby Install
uses: ./
timeout-minutes: 10
with:
ruby-version: ${{ matrix.ruby }}
mingw: _upgrade_ openssl ragel
Expand All @@ -88,12 +89,12 @@ jobs:

- name: update RubyGems for Ruby 2.4 & 2.5
# Included RubyGems doesn't work with required_ruby_version
if: (matrix.ruby >= '2.4') && (matrix.ruby < '2.6')
run: gem update --system --no-document
if: contains('2.4 2.5', matrix.ruby)
run: gem update --system 3.3.14 --no-document
timeout-minutes: 5

- name: gem install openssl
if: (matrix.ruby >= '2.4') && (matrix.ruby <= '3.2')
if: ((matrix.ruby >= '2.4') && (matrix.ruby <= '3.2')) || (matrix.ruby == 'head')
run: gem install openssl -N

plus:
Expand All @@ -107,7 +108,7 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Ruby Install
uses: ./
Expand Down
8 changes: 4 additions & 4 deletions dist/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,14 +327,13 @@ let msys2Pkgs = getInput('msys2')

let pre // package prefix, set in setRuby
// standard pacman args
const args = '--noconfirm --noprogressbar --needed'
const args = '--noconfirm --noprogressbar --needed --disable-download-timeout'

// Not used. Installs packages stored in GitHub release.
// Only needed for exceptional cases.
const install = async (pkg, release) => { // eslint-disable-line no-unused-vars
const uriBase = 'https://github.com/MSP-Greg/ruby-msys2-package-archive/releases/download'
const suff = '-any.pkg.tar.xz'
const args = '--noconfirm --noprogressbar --needed'

const uri = `${uriBase}/${release}`

Expand Down Expand Up @@ -386,7 +385,8 @@ const openssl = async () => {
execSync(`pacman.exe -Udd --noconfirm --noprogressbar ${fn}`)
grpEnd(msSt)
mingwPkgs = mingwPkgs.replace(/\bopenssl\b/gi, '').trim()
} else if (is2022orLater && ruby.abiVers >= '2.5.0 ')
} else if ((is2022orLater && ruby.abiVers >= '2.5.0') || core.getInput('ruby-version') === 'head')
// Ruby 'head' uses a custom OpenSSL 3 package
mingwPkgs = mingwPkgs.replace(/\bopenssl\b/gi, '').trim()
}

Expand All @@ -396,7 +396,7 @@ const updateGCC = async () => {

msSt = grpSt(`Upgrading gcc for Ruby ${ruby.vers}`)
checkSpace
let gccPkgs = ['', 'binutils', 'crt', 'dlfcn', 'headers', 'libiconv', 'isl', 'make', 'mpc', 'mpfr', 'pkgconf', 'windows-default-manifest', 'libwinpthread', 'libyaml', 'winpthreads', 'zlib', 'gcc-libs', 'gcc']
let gccPkgs = ['', 'binutils', 'crt', 'headers', 'libiconv', 'isl', 'make', 'mpc', 'mpfr', 'pkgconf', 'windows-default-manifest', 'libwinpthread', 'libyaml', 'winpthreads', 'zlib', 'gcc-libs', 'gcc']
execSync(`pacman.exe ${msys2Sync} --nodeps ${args} ${gccPkgs.join(pre)}`)
grpEnd(msSt)

Expand Down
2 changes: 1 addition & 1 deletion dist/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "setup-ruby-pkgs",
"version": "1.32.3",
"version": "1.32.4",
"description": "Install packages and update builds tools for Ruby",
"main": "index.js",
"scripts": {
Expand Down
8 changes: 4 additions & 4 deletions mingw.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,13 @@ let msys2Pkgs = getInput('msys2')

let pre // package prefix, set in setRuby
// standard pacman args
const args = '--noconfirm --noprogressbar --needed'
const args = '--noconfirm --noprogressbar --needed --disable-download-timeout'

// Not used. Installs packages stored in GitHub release.
// Only needed for exceptional cases.
const install = async (pkg, release) => { // eslint-disable-line no-unused-vars
const uriBase = 'https://github.com/MSP-Greg/ruby-msys2-package-archive/releases/download'
const suff = '-any.pkg.tar.xz'
const args = '--noconfirm --noprogressbar --needed'

const uri = `${uriBase}/${release}`

Expand Down Expand Up @@ -92,7 +91,8 @@ const openssl = async () => {
execSync(`pacman.exe -Udd --noconfirm --noprogressbar ${fn}`)
grpEnd(msSt)
mingwPkgs = mingwPkgs.replace(/\bopenssl\b/gi, '').trim()
} else if (is2022orLater && ruby.abiVers >= '2.5.0 ')
} else if ((is2022orLater && ruby.abiVers >= '2.5.0') || core.getInput('ruby-version') === 'head')
// Ruby 'head' uses a custom OpenSSL 3 package
mingwPkgs = mingwPkgs.replace(/\bopenssl\b/gi, '').trim()
}

Expand All @@ -102,7 +102,7 @@ const updateGCC = async () => {

msSt = grpSt(`Upgrading gcc for Ruby ${ruby.vers}`)
checkSpace
let gccPkgs = ['', 'binutils', 'crt', 'dlfcn', 'headers', 'libiconv', 'isl', 'make', 'mpc', 'mpfr', 'pkgconf', 'windows-default-manifest', 'libwinpthread', 'libyaml', 'winpthreads', 'zlib', 'gcc-libs', 'gcc']
let gccPkgs = ['', 'binutils', 'crt', 'headers', 'libiconv', 'isl', 'make', 'mpc', 'mpfr', 'pkgconf', 'windows-default-manifest', 'libwinpthread', 'libyaml', 'winpthreads', 'zlib', 'gcc-libs', 'gcc']
execSync(`pacman.exe ${msys2Sync} --nodeps ${args} ${gccPkgs.join(pre)}`)
grpEnd(msSt)

Expand Down
2 changes: 1 addition & 1 deletion mingw_gcc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export const run = async (rubyVers) => {
const uriBase = 'https://github.com/MSP-Greg/ruby-msys2-package-archive/releases/download'
const pre64 = 'mingw-w64-x86_64-'
const suff = '-any.pkg.tar.xz'
const args = '--noconfirm --noprogressbar --needed'
const args = '--noconfirm --noprogressbar --needed --disable-download-timeout'

let mingwFiles
let uri
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "setup-ruby-pkgs",
"version": "1.32.3",
"version": "1.32.4",
"description": "Install packages and update builds tools for Ruby",
"main": "index.js",
"scripts": {
Expand Down