Skip to content
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.

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

Update for Actions Windows MSYS2 install #39

Merged
merged 1 commit into from
Mar 24, 2020

Conversation

MSP-Greg
Copy link
Collaborator

  1. Use 'Git for Windows' cert.pem file
  2. Add MSYS2 to path for mswin (after msvc additions)
  3. Rearrange code for cleanup when MSYS2 is added to Window image

The comment below precedes code that can be removed when MSYS2 is added.

// Remove when Actions Windows image contains MSYS2 install

Copy link
Member

@eregon eregon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great, thanks!

// add MSYS2 paths for misc gnu utilities like bison and ragel
pathAry.push(`${msys2}\\mingw64\\bin`)
pathAry.push(`${msys2}\\usr\\bin`)
return pathAry
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you use an array literal with ... to splat addVCVARSEnv()?
That would be closer to the code above in setupMingw and avoid mutating the array in place.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I noticed that push allows multiple arguments, so I changed to that? VCVARSEnv is defined by the bat file, so we have to 'add' two arrays, but this is just adding two items...

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I meant ae39a8d actually

@@ -8,6 +8,12 @@ const exec = require('@actions/exec')
const tc = require('@actions/tool-cache')
const rubyInstallerVersions = require('./windows-versions').versions

// needed for 2.2, 2.3, and mswin, cert file used by Git for Windows
const certFile = 'C:\\Program Files\\Git\\mingw64\\ssl\\cert.pem'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I hope this location will remain available, it sounds likely enough for now.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Git for Windows has always been there. It's the git that's used by all the actions and any Windows devs using git. There are also GitHub/MSFT staff involved with it. IOW, its location is probably more locked down than the locations of the toolcache Rubies...

1. Use 'Git for Windows' cert.pem file
2. Add MSYS2 to path for mswin (after msvc additions)
3. Rearrange code for cleanup when MSYS2 is added to Window image
@eregon eregon merged commit f70e6bf into ruby:master Mar 24, 2020
@eregon
Copy link
Member

eregon commented Mar 24, 2020

Released as https://github.com/ruby/setup-ruby/releases/tag/v1.24.0

@MSP-Greg MSP-Greg deleted the windows-cert-pem branch March 24, 2020 18:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants