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

Upgrade installed Cygwin packages in AppVeyor CI #963

Merged
merged 1 commit into from
Dec 12, 2016

Conversation

dra27
Copy link
Member

@dra27 dra27 commented Dec 10, 2016

The Cygwin diffutils packages was updated a few days ago and this is causing a conflict on the AppVeyor CI because the new diff binary depends on an updated Cygwin DLL.

The fix is to add the -g parameter to the call to Cygwin's setup which installs diffutils (and other packages). The effect of this switch is to upgrade all existing packages as well (i.e. sudo apt-get upgrade / sudo yum update). The effect of this is that the Cygwin installation takes noticeably longer, probably owing to having to rebase the entire installation.

Ultimately, this requires the underlying AppVeyor Cygwin installation image to be updated - we can monitor this by looking for early in AppVeyor logs for these lines:

%CYG_ROOT%\bin\bash -lc "cygcheck -dc cygwin"
Cygwin Package Information
Package              Version
cygwin               2.5.2-1
"%CYG_ROOT%\setup-x86.exe" -qgnNdO -R "%CYG_ROOT%" -s "%CYG_MIRROR%" -l "%CYG_CACHE%" -P diffutils -P dos2unix -P gcc-core -P make -P ncurses >NUL %CYG_ROOT%\bin\bash -lc "cygcheck -dc cygwin"
Cygwin Package Information
Package              Version
cygwin               2.6.0-1
call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64

which allows us to see the version of the Cygwin package before and after update.

@dra27
Copy link
Member Author

dra27 commented Dec 10, 2016

Despite the performance hit (though AppVeyor is still returning faster than Travis), I propose merging this quickly to get the Windows CI back up and running...

/cc @avsm, @Chris00. @gasche, @damiendoligez

@dra27 dra27 mentioned this pull request Dec 10, 2016
@avsm avsm mentioned this pull request Dec 12, 2016
2 tasks
@avsm
Copy link
Member

avsm commented Dec 12, 2016

The change looks good to me, with some notes:

@mshinwell mshinwell merged commit eb9665d into ocaml:trunk Dec 12, 2016
@dra27
Copy link
Member Author

dra27 commented Dec 12, 2016

diffutils is only required for running the testsuite so, yes, opam can probably survive!

@dra27 dra27 deleted the fix-appveyor branch December 14, 2016 13:19
dra27 added a commit to dra27/ocaml that referenced this pull request Jan 29, 2017
dra27 added a commit to dra27/ocaml that referenced this pull request Feb 18, 2017
camlspotter pushed a commit to camlspotter/ocaml that referenced this pull request Oct 17, 2017
EmileTrotignon pushed a commit to EmileTrotignon/ocaml that referenced this pull request Jan 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants