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

Add Unix tools to path; Add C++ build tools; Drop msys2 #15

Merged
merged 3 commits into from
Nov 30, 2020
Merged

Add Unix tools to path; Add C++ build tools; Drop msys2 #15

merged 3 commits into from
Nov 30, 2020

Conversation

k0ekk0ek
Copy link
Contributor

@k0ekk0ek k0ekk0ek commented Nov 30, 2020

This PR:

  1. Adds the Unix tools to the path on installation to enable use of CIRRUS_SHEL: bash so that the same shell environment can be used across platforms;
  2. Adds visualstudio2019-workload-vctools to allow users to compile with MSVC;
  3. Drops msys2 to avoid indefinite hangs of Docker.
  • Trick to reenable visualstudio2019-workload-vctools is to depend on an older version of dotnetfx. The latest version has known problems and causes the Visual Studio installer to fail.
  • Reasoning behind dropping msys2 is that it isn't required since the Unix tools that ship with Git are available already and mingw is installed separately.

This should solve #12, #13 and #14. Additionally diff becomes available and thus should make #11 obsolete. I did a test build before, but this one should report success imminently.

msys2 causes the installation to hang indefinitely. While --params '/NoUpdate'
can be provided to workaround the issue, msys2 seems redundant now that the
optional Unix tools that come with Git are added to the PATH environment
variable. Especially since MinGW-w64 is already installed separately.
@fkorotkov
Copy link
Contributor

Wow! Thank you, @k0ekk0ek! I tried to fix the build but was not able. Will rebuild VMs that Cirrus is using to have the new images pre-cached on them to speed up startup time.

@fkorotkov fkorotkov merged commit c2ba9e0 into cirruslabs:master Nov 30, 2020
@k0ekk0ek
Copy link
Contributor Author

Thanks @fkorotkov!

@k0ekk0ek
Copy link
Contributor Author

@fkorotkov, could it be that GCE still has the older image cached? visualstudio2019-workload-vctools is notably absent. Not to rush you of course, but could it be that a "flush cache" button needs to be pressed somewhere?

choco list --local-only
Chocolatey v0.10.15
7zip 19.0
7zip.install 19.0
chocolatey 0.10.15
chocolatey-core.extension 1.3.5.1
chocolatey-dotnetfx.extension 1.0.1
chocolatey-visualstudio.extension 1.8.1
chocolatey-windowsupdate.extension 1.0.4
cmake.install 3.19.1
dotnetfx 4.8.0.20190930
git 2.28.0
git.install 2.28.0
KB2919355 1.0.20160915
KB2919442 1.0.20160915
KB2999226 1.0.20181019
KB3033929 1.0.5
KB3035131 1.0.3
python3 3.9.0
vcredist140 14.28.29325.2
vcredist2015 14.0.24215.20170201
visualstudio-installer 2.0.1
visualstudio2019buildtools 16.7.0.0
visualstudio2019community 16.7.0.0
winflexbison3 2.5.23.20200904
23 packages installed.

@fkorotkov
Copy link
Contributor

Just rebuilt the base images that runs Windows containers, should be working now! Sorry for the delay.

@ericoporto
Copy link

I think this PR may have broken my workflow on #16 .

@k0ekk0ek k0ekk0ek deleted the workload-vctools branch December 6, 2020 15:18
@ped7g
Copy link

ped7g commented Jan 2, 2021

This seem generally help with all my windows-build issues, except I can't find the MSCC in the image?
(I can find gcc8.1 in mingw64, and bash/diff/cmp/find/... GNU utilities in Git folder)

https://cirrus-ci.com/task/5883284922040320?command=build#L188

Seems there is Roslyn (C#? compiler?) and msbuild.exe, but no cl.exe or vcvars*.bat

From reading the package visualstudio2019-workload-vctools description it looks to me like that's the main purpose of it, so something went wrong somewhere? Or I'm just blind?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants