aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTulir Asokan <tulir@maunium.net>2019-01-12 00:35:42 +0200
committerTulir Asokan <tulir@maunium.net>2019-01-12 00:35:42 +0200
commite539a9098ca02b8ca20862a4944e9afc477a7973 (patch)
tree1eb53467bd98187d2640b1d86ce744e0222d6ca3
parentde39ec86ffdb4d45231c55b6d641b13e0eeaa07d (diff)
Update CI script and tcell
-rw-r--r--.gh-deployer.yaml1
-rw-r--r--go.mod4
-rw-r--r--go.sum2
-rwxr-xr-xscripts/ci4
4 files changed, 8 insertions, 3 deletions
diff --git a/.gh-deployer.yaml b/.gh-deployer.yaml
index 5f626a7..ab6f6ec 100644
--- a/.gh-deployer.yaml
+++ b/.gh-deployer.yaml
@@ -7,3 +7,4 @@ env:
commands:
- ./scripts/ci
- rm -rf .tmp/ target/
+- git checkout .
diff --git a/go.mod b/go.mod
index 036acdc..aa47687 100644
--- a/go.mod
+++ b/go.mod
@@ -14,6 +14,6 @@ require (
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
gopkg.in/yaml.v2 v2.2.2
maunium.net/go/mautrix v0.1.0-alpha.2
- maunium.net/go/tcell v0.0.0-20190111212645-703b3f6ecec9
- maunium.net/go/tview v0.0.0-20190111212720-d6aa1eac1b9a
+ maunium.net/go/tcell v0.0.0-20190111223412-5e74142cb009
+ maunium.net/go/tview v0.0.0-20190111223510-de38190b095b
)
diff --git a/go.sum b/go.sum
index a9806d4..c118749 100644
--- a/go.sum
+++ b/go.sum
@@ -34,7 +34,9 @@ maunium.net/go/tcell v0.0.0-20190111210611-542340841245 h1:JIekRWZ4na6cZJa5VMwLF
maunium.net/go/tcell v0.0.0-20190111210611-542340841245/go.mod h1:U+akxk8CP6vAWV74r2NOqEMMHw6kPGWTyvjzCtemxtM=
maunium.net/go/tcell v0.0.0-20190111212645-703b3f6ecec9 h1:aSZPhcBmGu8MIddPxWNksfjbXHmlRL0yUddwB9CP4s0=
maunium.net/go/tcell v0.0.0-20190111212645-703b3f6ecec9/go.mod h1:U+akxk8CP6vAWV74r2NOqEMMHw6kPGWTyvjzCtemxtM=
+maunium.net/go/tcell v0.0.0-20190111223412-5e74142cb009/go.mod h1:U+akxk8CP6vAWV74r2NOqEMMHw6kPGWTyvjzCtemxtM=
maunium.net/go/tview v0.0.0-20190111211351-2f23a5129af0 h1:xHG0S9ExKp+6dkhasnK/fgO9mLHSSSqVoAymjyUtDdI=
maunium.net/go/tview v0.0.0-20190111211351-2f23a5129af0/go.mod h1:ypYT6Dn71E7sVv6NxCjNo2cBJWJa257VSHCGOssGbV0=
maunium.net/go/tview v0.0.0-20190111212720-d6aa1eac1b9a h1:f4JVX4GHJH/wMcL9VACMVXT0eaWhxx9a7OT/NLcxsw8=
maunium.net/go/tview v0.0.0-20190111212720-d6aa1eac1b9a/go.mod h1:CTOF8OnDeK31Wl25GXdbYzTDvvZoiazmKNZdwkVUmzE=
+maunium.net/go/tview v0.0.0-20190111223510-de38190b095b/go.mod h1:Oi2eW32B8/cE7ZYXL6jyHMrXJL8ARDOQk/3aDvLEyVs=
diff --git a/scripts/ci b/scripts/ci
index a05ef7c..f73df98 100755
--- a/scripts/ci
+++ b/scripts/ci
@@ -27,9 +27,11 @@ cp target/$PROJECT_NAME-linux-amd64 deb/usr/bin/gomuks
git clone https://github.com/tulir/tcell.git .tmp/tcell
mkdir -p deb/usr/share/tcell/
rm -rf deb/usr/share/tcell/database
-cp -r .tmp.tcell/terminfo/database deb/usr/share/tcell
+cp -r .tmp/tcell/terminfo/database deb/usr/share/tcell
sed -i.bak -E 's/(Version: [0-9]+\.[0-9]+\.[0-9]+\-[0-9]+)/\1+'$SHORTHEAD'/' deb/DEBIAN/control
+chmod -R -s deb/DEBIAN
+chmod -R 0755 deb/DEBIAN
dpkg-deb --build deb 'target/'$PROJECT_NAME'_linux_amd64.deb'
mv -f deb/DEBIAN/control.bak deb/DEBIAN/control