From 40cc5822b1dbd06615bcbe966fffb3a64d255462 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Sat, 11 Jan 2020 13:04:35 -0500 Subject: [PATCH] ci: install perl provider --- .travis.yml | 3 +++ appveyor.yml | 3 --- ci/before_install.sh | 1 - ci/build.ps1 | 22 ++++++++++++++++++++-- ci/install.sh | 3 +++ 5 files changed, 26 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4bb5c00251..53faf29cc5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,6 +71,7 @@ addons: - build-essential - clang - cmake + - cpanminus - cscope - gcc-multilib - gdb @@ -90,7 +91,9 @@ addons: - powershell packages: - ccache + - cpanminus - ninja + - perl jobs: include: diff --git a/appveyor.yml b/appveyor.yml index 7e2aef345b..01ca16f930 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -22,9 +22,6 @@ init: #- ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) matrix: fast_finish: true -install: [] -before_build: -- ps: Install-Product node 10 build_script: - powershell ci\build.ps1 after_build: diff --git a/ci/before_install.sh b/ci/before_install.sh index 5810bec71a..0303936bdd 100755 --- a/ci/before_install.sh +++ b/ci/before_install.sh @@ -44,7 +44,6 @@ fi source ~/.nvm/nvm.sh nvm install 10 -nvm use 10 if [[ -n "$CMAKE_URL" ]]; then echo "Installing custom CMake: $CMAKE_URL" diff --git a/ci/build.ps1 b/ci/build.ps1 index 524dabdf3e..b2a4c1ec2a 100644 --- a/ci/build.ps1 +++ b/ci/build.ps1 @@ -29,6 +29,25 @@ function exitIfFailed() { } } +# https://github.com/lukesampson/scoop#installation +$scoop = (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh') +& { + Set-StrictMode -Off + Invoke-Expression $scoop +} + +scoop install nodejs-lts perl +node --version +npm.cmd --version +perl --version +cpanm.bat --version + +cpanm.bat -n Neovim::Ext +if ($LastExitCode -ne 0) { + Get-Content -Path "$env:USERPROFILE\.cpanm\build.log" +} +perl -W -e 'use Neovim::Ext; print $Neovim::Ext::VERSION'; exitIfFailed + if (-Not (Test-Path -PathType container $env:DEPS_BUILD_DIR)) { write-host "cache dir not found: $($env:DEPS_BUILD_DIR)" mkdir $env:DEPS_BUILD_DIR @@ -57,7 +76,7 @@ if ($compiler -eq 'MINGW') { # in MSYS2, but we cannot build inside the MSYS2 shell. $cmakeGenerator = 'Ninja' $cmakeGeneratorArgs = '-v' - $mingwPackages = @('ninja', 'cmake', 'perl', 'diffutils').ForEach({ + $mingwPackages = @('ninja', 'cmake', 'diffutils').ForEach({ "mingw-w64-$arch-$_" }) @@ -115,7 +134,6 @@ if (-not $NoTests) { if (-Not (Test-Path -PathType Leaf "$env:TREE_SITTER_DIR\bin\c.dll")) { exit 1 } - } if ($compiler -eq 'MSVC') { diff --git a/ci/install.sh b/ci/install.sh index 3364edfe70..b3ec9e7f65 100755 --- a/ci/install.sh +++ b/ci/install.sh @@ -50,3 +50,6 @@ else gcc -m32 -o "$TREE_SITTER_DIR/bin/c.so" -shared parser.c -I. fi test -f "$TREE_SITTER_DIR/bin/c.so" + +sudo cpanm -n Neovim::Ext || cat "$HOME/.cpanm/build.log" +perl -W -e 'use Neovim::Ext; print $Neovim::Ext::VERSION'