diff options
Diffstat (limited to 'ci')
-rwxr-xr-x | ci/before_cache.sh | 2 | ||||
-rwxr-xr-x | ci/before_script.sh | 1 | ||||
-rw-r--r-- | ci/build.ps1 | 146 | ||||
-rw-r--r-- | ci/common/build.sh | 7 | ||||
-rw-r--r-- | ci/common/suite.sh | 4 | ||||
-rw-r--r-- | ci/common/test.sh | 6 | ||||
-rwxr-xr-x | ci/run_tests.sh | 10 | ||||
-rw-r--r-- | ci/snap/.snapcraft_payload | 194 | ||||
-rwxr-xr-x | ci/snap/after_success.sh | 14 | ||||
-rwxr-xr-x | ci/snap/deploy.sh | 39 | ||||
-rwxr-xr-x | ci/snap/install.sh | 11 | ||||
-rwxr-xr-x | ci/snap/script.sh | 8 | ||||
-rw-r--r-- | ci/snap/travis_snapcraft.cfg | bin | 2448 -> 0 bytes |
13 files changed, 19 insertions, 423 deletions
diff --git a/ci/before_cache.sh b/ci/before_cache.sh index 9bc9bb45e9..3daeb04793 100755 --- a/ci/before_cache.sh +++ b/ci/before_cache.sh @@ -4,7 +4,9 @@ set -e set -o pipefail CI_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +# shellcheck source-path=SCRIPTDIR source "${CI_DIR}/common/build.sh" +# shellcheck source-path=SCRIPTDIR source "${CI_DIR}/common/suite.sh" mkdir -p "${HOME}/.cache" diff --git a/ci/before_script.sh b/ci/before_script.sh index 08e0cb9103..066789af36 100755 --- a/ci/before_script.sh +++ b/ci/before_script.sh @@ -4,6 +4,7 @@ set -e set -o pipefail CI_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +# shellcheck source-path=SCRIPTDIR source "${CI_DIR}/common/build.sh" # Test some of the configuration variables. diff --git a/ci/build.ps1 b/ci/build.ps1 deleted file mode 100644 index 6709a9507a..0000000000 --- a/ci/build.ps1 +++ /dev/null @@ -1,146 +0,0 @@ -[CmdletBinding(DefaultParameterSetName = "Build")]
-param(
- [Parameter(ParameterSetName="Build")][switch]$Build,
- [Parameter(ParameterSetName="BuildDeps")][switch]$BuildDeps,
- [Parameter(ParameterSetName="EnsureTestDeps")][switch]$EnsureTestDeps,
- [Parameter(ParameterSetName="Package")][switch]$Package,
- [Parameter(ParameterSetName="Test")][switch]$Test,
- [Parameter(ParameterSetName="TestOld")][switch]$TestOld
-)
-
-Set-StrictMode -Version Latest
-$ErrorActionPreference = 'Stop'
-$ProgressPreference = 'SilentlyContinue'
-
-$projectDir = [System.IO.Path]::GetFullPath("$(Get-Location)")
-$buildDir = Join-Path -Path $projectDir -ChildPath "build"
-
-# $env:CMAKE_BUILD_TYPE is ignored by cmake when not using ninja
-$cmakeBuildType = $(if ($null -ne $env:CMAKE_BUILD_TYPE) {$env:CMAKE_BUILD_TYPE} else {'RelWithDebInfo'});
-$depsCmakeVars = @{
- CMAKE_BUILD_TYPE=$cmakeBuildType;
-}
-$nvimCmakeVars = @{
- CMAKE_BUILD_TYPE=$cmakeBuildType;
- BUSTED_OUTPUT_TYPE = 'nvim';
- DEPS_PREFIX=$(if ($null -ne $env:DEPS_PREFIX) {$env:DEPS_PREFIX} else {".deps/usr"});
-}
-if ($null -eq $env:DEPS_BUILD_DIR) {
- $env:DEPS_BUILD_DIR = Join-Path -Path $projectDir -ChildPath ".deps"
-}
-$uploadToCodeCov = $false
-
-function exitIfFailed() {
- if ($LastExitCode -ne 0) {
- exit $LastExitCode
- }
-}
-
-function convertToCmakeArgs($vars) {
- return $vars.GetEnumerator() | ForEach-Object { "-D$($_.Key)=$($_.Value)" }
-}
-
-$installationPath = vswhere.exe -latest -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath
-if ($installationPath -and (Test-Path "$installationPath\Common7\Tools\vsdevcmd.bat")) {
- & "${env:COMSPEC}" /s /c "`"$installationPath\Common7\Tools\vsdevcmd.bat`" -arch=x64 -no_logo && set" | ForEach-Object {
- $name, $value = $_ -split '=', 2
- Set-Content env:\"$name" $value
- }
-}
-
-function BuildDeps {
-
- if (Test-Path -PathType container $env:DEPS_BUILD_DIR) {
- $cachedBuildTypeStr = $(Get-Content $env:DEPS_BUILD_DIR\CMakeCache.txt | Select-String -Pattern "CMAKE_BUILD_TYPE.*=($cmakeBuildType)")
- if (-not $cachedBuildTypeStr) {
- Write-Warning " unable to validate build type from cache dir ${env:DEPS_BUILD_DIR}"
- }
- }
-
- # we currently can't use ninja for cmake.deps, see #19405
- $depsCmakeGenerator = "Visual Studio 16 2019"
- $depsCmakeGeneratorPlf = "x64"
- cmake -S "$projectDir\cmake.deps" -B $env:DEPS_BUILD_DIR -G $depsCmakeGenerator -A $depsCmakeGeneratorPlf $(convertToCmakeArgs($depsCmakeVars)); exitIfFailed
-
- $depsCmakeNativeToolOptions= @('/verbosity:normal', '/m')
- cmake --build $env:DEPS_BUILD_DIR --config $cmakeBuildType -- $depsCmakeNativeToolOptions; exitIfFailed
-}
-
-function Build {
- cmake -S $projectDir -B $buildDir $(convertToCmakeArgs($nvimCmakeVars)) -G Ninja; exitIfFailed
- cmake --build $buildDir --config $cmakeBuildType; exitIfFailed
-}
-
-function EnsureTestDeps {
- & $buildDir\bin\nvim.exe "--version"; exitIfFailed
-
- # Ensure that the "win32" feature is set.
- & $buildDir\bin\nvim -u NONE --headless -c 'exe !has(\"win32\").\"cq\"' ; exitIfFailed
-
- python -m pip install pynvim
- # Sanity check
- python -c "import pynvim; print(str(pynvim))"; exitIfFailed
-
- gem.cmd install --pre neovim
- Get-Command -CommandType Application neovim-ruby-host.bat; exitIfFailed
-
- node --version
- npm.cmd --version
-
- npm.cmd install -g neovim; exitIfFailed
- Get-Command -CommandType Application neovim-node-host.cmd; exitIfFailed
- npm.cmd link neovim
-
- if ($env:USE_LUACOV -eq 1) {
- & $env:DEPS_PREFIX\luarocks\luarocks.bat install cluacov
- }
-}
-
-function Test {
- # Functional tests
- # The $LastExitCode from MSBuild can't be trusted
- $failed = $false
-
- # Run only this test file:
- # $env:TEST_FILE = "test\functional\foo.lua"
- cmake --build $buildDir --target functionaltest 2>&1 |
- ForEach-Object { $failed = $failed -or
- $_ -match 'functional tests failed with error'; $_ }
-
- if ($failed) {
- exit $LastExitCode
- }
-
- if (-not $uploadToCodecov) {
- return
- }
- if ($env:USE_LUACOV -eq 1) {
- & $env:DEPS_PREFIX\bin\luacov.bat
- }
- bash -l /c/projects/neovim/ci/common/submit_coverage.sh functionaltest
-}
-
-function TestOld {
- # Old tests
- # Add MSYS to path, required for e.g. `find` used in test scripts.
- # But would break functionaltests, where its `more` would be used then.
- $OldPath = $env:PATH
- $env:PATH = "C:\msys64\usr\bin;$env:PATH"
- & "C:\msys64\mingw64\bin\mingw32-make.exe" -C $(Convert-Path $projectDir\src\nvim\testdir) VERBOSE=1; exitIfFailed
- $env:PATH = $OldPath
-
- if ($uploadToCodecov) {
- bash -l /c/projects/neovim/ci/common/submit_coverage.sh oldtest
- }
-}
-
-
-function Package {
- cmake -S $projectDir -B $buildDir $(convertToCmakeArgs($nvimCmakeVars)) -G Ninja; exitIfFailed
- cmake --build $buildDir --target package; exitIfFailed
-}
-
-if ($PSCmdlet.ParameterSetName) {
- & (Get-ChildItem "Function:$($PSCmdlet.ParameterSetName)")
- exit
-}
diff --git a/ci/common/build.sh b/ci/common/build.sh index 6e7ea2c8f8..e30d0337b5 100644 --- a/ci/common/build.sh +++ b/ci/common/build.sh @@ -7,7 +7,7 @@ _stat() { } top_make() { - printf '%78s\n' | tr ' ' '=' + printf '%78s\n' ' ' | tr ' ' '=' ninja "$@" } @@ -33,6 +33,7 @@ build_deps() { # update CMake configuration and update to newer deps versions. cd "${DEPS_BUILD_DIR}" echo "Configuring with '${DEPS_CMAKE_FLAGS}'." + # shellcheck disable=SC2086 CC= cmake -G Ninja ${DEPS_CMAKE_FLAGS} "${CI_BUILD_DIR}/cmake.deps/" if ! top_make; then @@ -51,10 +52,10 @@ build_nvim() { mkdir -p "${BUILD_DIR}" cd "${BUILD_DIR}" - echo "Configuring with '${CMAKE_FLAGS} $@'." + echo "Configuring with '${CMAKE_FLAGS} $*'." + # shellcheck disable=SC2086 cmake -G Ninja ${CMAKE_FLAGS} "$@" "${CI_BUILD_DIR}" - echo "Building nvim." if ! top_make nvim ; then exit 1 diff --git a/ci/common/suite.sh b/ci/common/suite.sh index 0320ac15c3..c81261d2e7 100644 --- a/ci/common/suite.sh +++ b/ci/common/suite.sh @@ -9,12 +9,12 @@ fail() { local test_name="$1" local message="$2" - : ${message:=Test $test_name failed} + : "${message:=Test $test_name failed}" local full_msg="$test_name :: $message" echo "${full_msg}" >> "${FAIL_SUMMARY_FILE}" echo "Failed: $full_msg" - FAILED=1 + export FAILED=1 } ended_successfully() { diff --git a/ci/common/test.sh b/ci/common/test.sh index 7db39a0e5f..326ec162c3 100644 --- a/ci/common/test.sh +++ b/ci/common/test.sh @@ -57,6 +57,7 @@ check_core_dumps() { check_logs() { # Iterate through each log to remove an useless warning. + # shellcheck disable=SC2044 for log in $(find "${1}" -type f -name "${2}"); do sed -i "${log}" \ -e '/Warning: noted but unhandled ioctl/d' \ @@ -66,6 +67,7 @@ check_logs() { # Now do it again, but only consider files with size > 0. local err="" + # shellcheck disable=SC2044 for log in $(find "${1}" -type f -name "${2}" -size +0); do cat "${log}" err=1 @@ -97,7 +99,7 @@ unittests() {( functionaltests() {( ulimit -c unlimited || true - if ! build_make ${FUNCTIONALTEST}; then + if ! build_make "${FUNCTIONALTEST}"; then fail 'functionaltests' 'Functional tests failed' fi submit_coverage functionaltest @@ -132,7 +134,7 @@ check_runtime_files() {( fail "$test_name" "It appears that $file is only a part of the file name" fi if ! test "$tst" "$INSTALL_PREFIX/share/nvim/runtime/$file" ; then - fail "$test_name" "$(printf "$message" "$file")" + fail "$test_name" "$(printf "%s%s" "$message" "$file")" fi done )} diff --git a/ci/run_tests.sh b/ci/run_tests.sh index da72d09506..0ef7080628 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -4,8 +4,11 @@ set -e set -o pipefail CI_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +# shellcheck source-path=SCRIPTDIR source "${CI_DIR}/common/build.sh" +# shellcheck source-path=SCRIPTDIR source "${CI_DIR}/common/test.sh" +# shellcheck source-path=SCRIPTDIR source "${CI_DIR}/common/suite.sh" rm -f "$END_MARKER" @@ -14,16 +17,15 @@ rm -f "$END_MARKER" if (($# == 0)); then tests=('build_nvim') + # Additional threads aren't created in the unit/old tests if test "$CLANG_SANITIZER" != "TSAN"; then - # Additional threads are only created when the builtin UI starts, which - # doesn't happen in the unit/functional tests if test "${FUNCTIONALTEST}" != "functionaltest-lua"; then tests+=('unittests') fi - tests+=('functionaltests') + tests+=('oldtests') fi - tests+=('oldtests' 'install_nvim') + tests+=('functionaltests' 'install_nvim') else tests=("$@") fi diff --git a/ci/snap/.snapcraft_payload b/ci/snap/.snapcraft_payload deleted file mode 100644 index 29f895fad6..0000000000 --- a/ci/snap/.snapcraft_payload +++ /dev/null @@ -1,194 +0,0 @@ -{ - "ref": "refs/heads/master", - "before": "66b136c43c12df3dcf8f19ff48f206ad2e4f43fc", - "after": "1bf69c32217cc455603ce8aa2b5415d9717f0fa2", - "repository": { - "id": 292861950, - "node_id": "MDEwOlJlcG9zaXRvcnkyOTI4NjE5NTA=", - "name": "neovim-snap", - "full_name": "hurricanehrndz/neovim-snap", - "private": false, - "owner": { - "name": "hurricanehrndz", - "email": "hurricanehrndz@users.noreply.github.com", - "login": "hurricanehrndz", - "id": 5804237, - "node_id": "MDQ6VXNlcjU4MDQyMzc=", - "avatar_url": "https://avatars0.githubusercontent.com/u/5804237?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/hurricanehrndz", - "html_url": "https://github.com/hurricanehrndz", - "followers_url": "https://api.github.com/users/hurricanehrndz/followers", - "following_url": "https://api.github.com/users/hurricanehrndz/following{/other_user}", - "gists_url": "https://api.github.com/users/hurricanehrndz/gists{/gist_id}", - "starred_url": "https://api.github.com/users/hurricanehrndz/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/hurricanehrndz/subscriptions", - "organizations_url": "https://api.github.com/users/hurricanehrndz/orgs", - "repos_url": "https://api.github.com/users/hurricanehrndz/repos", - "events_url": "https://api.github.com/users/hurricanehrndz/events{/privacy}", - "received_events_url": "https://api.github.com/users/hurricanehrndz/received_events", - "type": "User", - "site_admin": false - }, - "html_url": "https://github.com/hurricanehrndz/neovim-snap", - "description": "snap build for neovim", - "fork": false, - "url": "https://github.com/hurricanehrndz/neovim-snap", - "forks_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/forks", - "keys_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/keys{/key_id}", - "collaborators_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/collaborators{/collaborator}", - "teams_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/teams", - "hooks_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/hooks", - "issue_events_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/issues/events{/number}", - "events_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/events", - "assignees_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/assignees{/user}", - "branches_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/branches{/branch}", - "tags_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/tags", - "blobs_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/git/blobs{/sha}", - "git_tags_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/git/tags{/sha}", - "git_refs_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/git/refs{/sha}", - "trees_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/git/trees{/sha}", - "statuses_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/statuses/{sha}", - "languages_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/languages", - "stargazers_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/stargazers", - "contributors_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/contributors", - "subscribers_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/subscribers", - "subscription_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/subscription", - "commits_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/commits{/sha}", - "git_commits_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/git/commits{/sha}", - "comments_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/comments{/number}", - "issue_comment_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/issues/comments{/number}", - "contents_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/contents/{+path}", - "compare_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/compare/{base}...{head}", - "merges_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/merges", - "archive_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/{archive_format}{/ref}", - "downloads_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/downloads", - "issues_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/issues{/number}", - "pulls_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/pulls{/number}", - "milestones_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/milestones{/number}", - "notifications_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/notifications{?since,all,participating}", - "labels_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/labels{/name}", - "releases_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/releases{/id}", - "deployments_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/deployments", - "created_at": 1599227980, - "updated_at": "2020-09-04T14:02:38Z", - "pushed_at": 1599228352, - "git_url": "git://github.com/hurricanehrndz/neovim-snap.git", - "ssh_url": "git@github.com:hurricanehrndz/neovim-snap.git", - "clone_url": "https://github.com/hurricanehrndz/neovim-snap.git", - "svn_url": "https://github.com/hurricanehrndz/neovim-snap", - "homepage": null, - "size": 0, - "stargazers_count": 0, - "watchers_count": 0, - "language": null, - "has_issues": true, - "has_projects": true, - "has_downloads": true, - "has_wiki": true, - "has_pages": false, - "forks_count": 0, - "mirror_url": null, - "archived": false, - "disabled": false, - "open_issues_count": 0, - "license": { - "key": "mit", - "name": "MIT License", - "spdx_id": "MIT", - "url": "https://api.github.com/licenses/mit", - "node_id": "MDc6TGljZW5zZTEz" - }, - "forks": 0, - "open_issues": 0, - "watchers": 0, - "default_branch": "master", - "stargazers": 0, - "master_branch": "master" - }, - "pusher": { - "name": "hurricanehrndz", - "email": "hurricanehrndz@users.noreply.github.com" - }, - "sender": { - "login": "hurricanehrndz", - "id": 5804237, - "node_id": "MDQ6VXNlcjU4MDQyMzc=", - "avatar_url": "https://avatars0.githubusercontent.com/u/5804237?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/hurricanehrndz", - "html_url": "https://github.com/hurricanehrndz", - "followers_url": "https://api.github.com/users/hurricanehrndz/followers", - "following_url": "https://api.github.com/users/hurricanehrndz/following{/other_user}", - "gists_url": "https://api.github.com/users/hurricanehrndz/gists{/gist_id}", - "starred_url": "https://api.github.com/users/hurricanehrndz/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/hurricanehrndz/subscriptions", - "organizations_url": "https://api.github.com/users/hurricanehrndz/orgs", - "repos_url": "https://api.github.com/users/hurricanehrndz/repos", - "events_url": "https://api.github.com/users/hurricanehrndz/events{/privacy}", - "received_events_url": "https://api.github.com/users/hurricanehrndz/received_events", - "type": "User", - "site_admin": false - }, - "created": false, - "deleted": false, - "forced": false, - "base_ref": null, - "compare": "https://github.com/hurricanehrndz/neovim-snap/compare/66b136c43c12...1bf69c32217c", - "commits": [ - { - "id": "1bf69c32217cc455603ce8aa2b5415d9717f0fa2", - "tree_id": "62ea83a2349be8c930c45fdc199f71b08bf5927e", - "distinct": true, - "message": "Build of latest tag", - "timestamp": "2020-09-04T14:05:40Z", - "url": "https://github.com/hurricanehrndz/neovim-snap/commit/1bf69c32217cc455603ce8aa2b5415d9717f0fa2", - "author": { - "name": "Carlos Hernandez", - "email": "carlos@techbyte.ca", - "username": "hurricanehrndz" - }, - "committer": { - "name": "Carlos Hernandez", - "email": "carlos@techbyte.ca", - "username": "hurricanehrndz" - }, - "added": [ - - ], - "removed": [ - - ], - "modified": [ - "snap/snapcraft.yaml" - ] - } - ], - "head_commit": { - "id": "1bf69c32217cc455603ce8aa2b5415d9717f0fa2", - "tree_id": "62ea83a2349be8c930c45fdc199f71b08bf5927e", - "distinct": true, - "message": "Build of latest tag", - "timestamp": "2020-09-04T14:05:40Z", - "url": "https://github.com/hurricanehrndz/neovim-snap/commit/1bf69c32217cc455603ce8aa2b5415d9717f0fa2", - "author": { - "name": "Carlos Hernandez", - "email": "carlos@techbyte.ca", - "username": "hurricanehrndz" - }, - "committer": { - "name": "Carlos Hernandez", - "email": "carlos@techbyte.ca", - "username": "hurricanehrndz" - }, - "added": [ - - ], - "removed": [ - - ], - "modified": [ - "snap/snapcraft.yaml" - ] - } -} diff --git a/ci/snap/after_success.sh b/ci/snap/after_success.sh deleted file mode 100755 index e66721a5e2..0000000000 --- a/ci/snap/after_success.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -o pipefail - - -RESULT_SNAP=$(find ./ -name "*.snap") - -sudo snap install "$RESULT_SNAP" --dangerous --classic - -/snap/bin/nvim --version - -SHA256=$(sha256sum "$RESULT_SNAP") -echo "SHA256: ${SHA256} ." diff --git a/ci/snap/deploy.sh b/ci/snap/deploy.sh deleted file mode 100755 index 1794fc61d9..0000000000 --- a/ci/snap/deploy.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -o pipefail - -SNAP_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -WEBHOOK_PAYLOAD="$(cat "${SNAP_DIR}/.snapcraft_payload")" -PAYLOAD_SIG="${SECRET_SNAP_SIG}" - - -snap_release_needed() { - last_committed_tag="$(git tag -l --sort=refname|head -1)" - last_snap_release="$(snap info nvim | awk '$1 == "latest/edge:" { print $2 }' | perl -lpe 's/v\d.\d.\d-//g')" - git fetch -f --tags - git checkout "${last_committed_tag}" 2> /dev/null - last_git_release="$(git describe --first-parent 2> /dev/null | perl -lpe 's/v\d.\d.\d-//g')" - - if [[ -z "$(echo $last_snap_release | perl -ne "print if /${last_git_release}.*/")" ]]; then - return 0 - fi - return 1 -} - - -trigger_snapcraft_webhook() { - [[ -n "${PAYLOAD_SIG}" ]] || exit - echo "Triggering new snap release via webhook..." - curl -X POST \ - -H "Content-Type: application/json" \ - -H "X-Hub-Signature: sha1=${PAYLOAD_SIG}" \ - --data "${WEBHOOK_PAYLOAD}" \ - https://snapcraft.io/nvim/webhook/notify -} - - -if $(snap_release_needed); then - echo "New snap release required" - trigger_snapcraft_webhook -fi diff --git a/ci/snap/install.sh b/ci/snap/install.sh deleted file mode 100755 index 0ceb6f0422..0000000000 --- a/ci/snap/install.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -o pipefail - -sudo apt update -sudo usermod -aG lxd $USER -sudo /snap/bin/lxd.migrate -yes -sudo /snap/bin/lxd waitready -sudo /snap/bin/lxd init --auto - diff --git a/ci/snap/script.sh b/ci/snap/script.sh deleted file mode 100755 index 21d3421044..0000000000 --- a/ci/snap/script.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -o pipefail - -mkdir -p "$CI_BUILD_DIR/snaps-cache" -sg lxd -c snapcraft - diff --git a/ci/snap/travis_snapcraft.cfg b/ci/snap/travis_snapcraft.cfg Binary files differdeleted file mode 100644 index 3e6a60c30d..0000000000 --- a/ci/snap/travis_snapcraft.cfg +++ /dev/null |