Skip to content

Commit 229f3f8

Browse files
committed
prepare for releasing using travis-ci
1 parent b5637b8 commit 229f3f8

File tree

6 files changed

+21
-26
lines changed

6 files changed

+21
-26
lines changed

.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "vim"]
2+
path = vim
3+
url = https://github.com/vim/vim

.travis.yml

+11-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ compiler:
99

1010
env:
1111
- FEATURES=huge SRCDIR=vim/src
12-
"CONFOPT='--enable-perlinterp --enable-pythoninterp --enable-python3interp --enable-rubyinterp --enable-luainterp --prefix=/usr'"
12+
"CONFOPT='--enable-perlinterp --enable-pythoninterp --enable-python3interp --enable-rubyinterp --enable-luainterp --enable-tclinterp --prefix=/usr'"
1313

1414
# sudo required to build AppImage (does apparently enable FUSE extensions)
1515
sudo: required
@@ -39,9 +39,18 @@ script:
3939
- NPROC=$(getconf _NPROCESSORS_ONLN)
4040
- (cd ${SRCDIR} && ./configure --with-features=$FEATURES $CONFOPT --enable-fail-if-missing && make -j$NPROC )
4141
- ${SRCDIR}/vim --version
42-
- make $SHADOWOPT $TEST
4342

4443
after_success:
4544
- bash -ex scripts/appimage.sh || true
4645

46+
deploy:
47+
provider: releases
48+
api-key:
49+
secure: "GrTph8SOjAL6WJphl3X4iqZnVJ7ZwRCn1Ef2g2zrOKJC25MPsptOVWuaJPk90hYbfXlHTZnRRpZe4ZOkAIZxEkcX35tqux3nSifgdTc565VXk/xX4mplCXXOANG7L4ksZFf/tRUHg3JSaJyuA+amaC9qnGp1d+3Dhg2iXpPqmcbvP3halWZZJfieZhuGJ0UGfVSYxUX8M+FL4Q2o0nFWdL9NlwWTgz2jcL50G3jSKmzv3A+e3DK8a2PquEmoV/KBaRnbfMjoiY40gbAB94ogyLPtCBXaxAIGEmFuuCPEesmbAUoTKJBJObMmEKRIHwZwj43O/wQY04+C6xy3IPFrPIZ5nBV1iu/bZIX+2FeEXw2O6vOnysz9LLBwyEG6QWGfnFscPJbrm3A1z/oopyqY8acIUAybteF99HMuPHypF4vRpil9oRt5RAgBuHfpEU82o7K1Mzy+OZQojbAv9qjq7Opx8emKdErJIsKonSg62RyUrh++018mPKmT8xLWI3fWjTz8SFNpdd28AnnnjWE43amyg3wNsbgdE/bJxdSy7kyz1esdk/nAEAnzwNqI7vSNnTCghkZBLmUiPmnmJ2cLM2fVV5FZS91hFd3Ya3comnXuTm6fjWtAxzx0B+4Xbca63NE0qKHUi0cQo7pz6kR0k2+O5eUUqzwdSdDE3X1Yu9Y="
50+
file: "*.AppImage"
51+
file_glob: true
52+
skip_cleanup: true
53+
# on:
54+
# tags: true
55+
4756
# vim:set sts=2 sw=2 tw=0 et:

README.md

-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
[![Build status](https://ci.appveyor.com/api/projects/status/320t4kaltc7u3ut3?svg=true)](https://ci.appveyor.com/project/chrisbra/vim-win32-installer-33v6e)
2-
[![Github All Releases](https://img.shields.io/github/downloads/chrisbra/vim-win32-installer/total.svg?maxAge=2592000)](https://github.com/vim/vim-win32-installer)
3-
[![GitHub tag](https://img.shields.io/github/tag/chrisbra/vim-win32-installer.svg?maxAge=2592000)](https://github.com/vim/vim-win32-installer)
4-
5-
61
# Vim Appimage Repository
72

83
This is a project for building a 64bit Gvim Appimage from the latest Vim snapshots.

scripts/appimage.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ export ARCH="$(arch)"
1111
APP=GVim
1212
LOWERAPP=${APP,,}
1313

14+
cd vim
1415
GIT_REV="$(git rev-parse --short HEAD)"
1516

1617
VIM_VER="$(git describe --tags --abbrev=0)"
@@ -112,9 +113,10 @@ find ./usr/bin -type l \! -name "gvim" -delete || true
112113

113114
cd .. # Go out of AppImage
114115

115-
mkdir -p ../out/
116116
generate_appimage
117117

118+
cp ../out/*.AppImage "$TRAVIS_BUILD_DIR"
119+
118120
########################################################################
119121
# Upload the AppDir
120122
########################################################################

scripts/update-repo.sh

+3-18
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/sh
2-
#set -x
2+
set -x
33

44
# Work directory of this repository.
55
if [ "$1" != "" ]; then
@@ -22,24 +22,14 @@ git pull
2222
if [ ! -d vim/src ]; then
2323
git submodule init
2424
fi
25-
git submodule update
25+
#git submodule update
2626

2727
# Get the latest vim source code
2828
cd vim
2929
vimoldver=$(git rev-parse HEAD)
3030
git checkout master
3131
git pull
3232
vimver=$(git describe --tags --abbrev=0)
33-
# pretty print the shortlog:
34-
# - squeeze spaces
35-
# - drop 'patch '
36-
# - drop 'Problem: '
37-
# - format to 100 chars
38-
vimlog=$(git log --decorate --graph --pretty=format:%s $vimoldver..HEAD |sed \
39-
-e 's/^\(. \)patch /\1/' \
40-
-e 's/ \+/ /g' \
41-
-e 's/\([0-9]\+ \)Problem: \+/\1/' \
42-
-e 's/\(.\{100\}\).*/\1/g')
4333
cd -
4434

4535
# Check if it is updated
@@ -49,11 +39,6 @@ if git diff --exit-code > /dev/null; then
4939
fi
5040

5141
# Commit the change and push it
52-
# replace newline by \n
53-
echo "$vimlog" | sed \
54-
-e 's#^\* *\([0-9]\([a-z]\)\?\.[0-9]\([a-z]\)\?\(\.[0-9]\+\)\?\) #* [\1](https://github.com/vim/vim/releases/tag/v\1) #g' | sed \
55-
-e ':a;N;$!ba;s/\n/\\n/g' > gitlog.txt
56-
57-
git commit -a -m "Vim $vimver" -m "$vimlog"
42+
git commit -a -m "Vim: $vimver" -m "$vimlog"
5843
git tag $vimver
5944
git push origin master --tags

vim

Submodule vim added at a899e6e

0 commit comments

Comments
 (0)