Skip to content

Commit 79b15f7

Browse files
committed
ci: added artifact deployment
1 parent a70c382 commit 79b15f7

File tree

6 files changed

+53
-20
lines changed

6 files changed

+53
-20
lines changed

.travis.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,17 @@ matrix:
2727
script: "./.travis/macos/build.sh"
2828
after_success: "./.travis/notify-discord.sh success $WEBHOOK_URL"
2929
after_failure: "./.travis/notify-discord.sh failure $WEBHOOK_URL"
30+
3031
notifications:
3132
- email: false
33+
3234
deploy:
33-
provider: s3
34-
bucket: "avocado-build"
35-
region: us-east-2
36-
local_dir: upload
35+
provider: script
36+
script: "./.travis/deploy.sh $DEPLOY_KEY upload/*"
3737
skip_cleanup: true
3838
on:
3939
all_branches: true
40-
secret_access_key:
41-
secure: A+A/qeIsqVp8YlYCqo19TDXmFaGHYzjaMLNmILPtK+D1o5mjlG4DyTQTgCi3nESu/I+2aBhHTbhJX+JSabX/pogGtGJSnfLd8VmxSNSvCBd6pZ2pczjQoC4ufeR87LjAS63JnGZLIBORDY6o+bKUrs1kLQclEfCeieH5sBW/1Em0Ec1amY3uKZP6MA1biaI3iSRbRGzCisWdjcIpF6vOILiG3w4Xpx+hTMSJPn72/kd3dVilHGyWnQkZDYbj6LB5CT4p42xnbM3B5HkBvykYeeqQSskVqM0y1gtTF/3JmjVnW4jB7pUQVpfCyzEOF23zQkoivlwBpMJBpcTa2fYfcjb0vDPu8ELtg5IZ1WPXyXCh/IAXkD0qTUjuNjlYHVNIUlWj2FXevyLUxDoBAgPA+4POkt9p6072gIATBPrd9Ajr48yDrYLVG41AWUT9FNUW5FHZaBsg6sJSEwMkBjpyQFp9+2ufgMTrcBIMFayDXLpvZGPy4uyS4Iu/Lts5KkG780DYva7kKZwxmpo5tlVwn11ndaYwgd9H2a+wgPGmw/1yAkWocV6XS7dq5cl7jcOJ6AmqtCyqixxtQk6zK7ylmwPuV3YGsOltgLJ5sA4g4G/9849HYKAs4Tv/q4xr3y8QnlBSUAUtXjdJ2KOzu8uYpPzBrNnFdHJBxENq7u+G+5A=
42-
access_key_id:
43-
secure: PK4Fr5SfsLBo9bIM2gpwgI6bCJx8RwjD4fRCoAIXzVu65ggx+GKWpPQmcNo13TZcRAnknSxUzj6uPCHvySzZqvTOP0rT8X975/k8V6VSdEDUabwtfK+mHIfKas4We5oxmbIH3Pij8TIPrLKPfXU+wR34ScLOGEmzCYYapb4KoRjBoNZz+zWrtA/eUSoHnHk3DgUxojXd3FbKjUbyIcXHmFC3fY9wglRNyLtWgVInQRh8haEFNZv85DdiOcm6KD7QkQ6QmLaug1QGOHLYnHLM9BouhjEsu09AtG6VrbseGXe2Gsb1yUiyJjIUvTPiy/Z6b52/aS00HE2cFlqSunH79bZ+ef5WftQMOMscV436O3wCUdXSIjfWUQBIhreycV4095kahsZZfY8O/NsyVXs2ls4bLW8vHS5r5KHu/aghKLLGfJFiENuCrMDU7+SPP/7PfZduG38kn8Jmdi1AeZ6BbMP4gdO5TMpxChsjvsJQ4C9VmVpJz9l203NieZAV43stpRxVWnNo6I5L/dyitZixPvPVfoAVXwXJnFNN2lOMg222U8KZLa68z0KR2SIw9hpgoU7H0RFwlwGNwSsYmdxjC6q5DST5ipq+ObyeLx7BQlJl3XqAgcjgvA9LTllfdJUIfXCl4b2/gGSH9tv6VZuBv4Yw/9XY1b3mtzQyz3LOGpQ=
40+
41+
env:
42+
global:
43+
secure: rMChu2sm/PgLw+74wIIdVxqa6KMTCOUs3h9JePxYwMIQyvs3rdtYe0h0yCwP6q/TlSK0zFWiU09QQ9FaoSknb0AGvPrK+dVnRC/jyEcHqy25FH/58hkttjbQLd3vTBB4kLQ1LIl/vlkXwk54F4NAEKTjQnIZSSQ82eVZ9UNtpddU+R8xa7ZrPpmxUNKw15EjjaZK54QdqQqQAc3dw/h8bwrYUQKeNA/EgM7Zv+ibSDp8aLX/hCkJldlpbC3oa01CitKGqUwIa8y2Z+cHi9tGyj4fJAL7rJvs2hEJN17F7pr7q+xfeQxRAkRTHjMgfqlC9Lt1uCZzljc7IrKSDo03jr7WYeb8Ar5IIeVbNMTK+CJ2ljVQtEardN6OGAvhgsFzCsiQ5AADz4bxqzgtQ2XdkIM+1N9j6nbTxK4B14veM0J1/IrMO/TzV/lZ2GcHqrxiSlj+NBu68ov/i6GvyCqOQ/5H6MVybKyFWIr9i4N5R6Vp+1eugRzo7lsA7NesZeW7Y4Kz5g0rNoalP/GEmVc549wpU9eHFJAhcjiYJF0lPdJPsmZnlNXa+LS1oJFC6972+fK0GSru5fX8qlJALG0kSpygiZR8dq/q1pEVRKtIz1uvIOY526GqEeIfch39Bp0hMCqhJ/AQfXTSzFTwJtnCo0lZO7lNPifwkJ8PHn1WTLI=

.travis/android/build.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ export COMMIT=`git rev-parse --short=7 HEAD`
99
export ARTIFACT=avocado-$OS-$DATE-$COMMIT.apk
1010
export ASSETS_DIR=android/app/src/main/assets
1111
export TARGET_DIR=android/app/build/outputs/apk/debug
12-
export UPLOAD_DIR=$DATE-$COMMIT
1312
export NDK_CCACHE="$(which ccache)"
1413

1514
# Configure cache
@@ -37,5 +36,5 @@ popd
3736
# No test suite for Android right now
3837

3938
# Package and prepare upload artifact
40-
mkdir -p upload/$UPLOAD_DIR
41-
cp $TARGET_DIR/app-debug.apk upload/$UPLOAD_DIR/$ARTIFACT
39+
mkdir -p upload
40+
cp $TARGET_DIR/app-debug.apk upload/$ARTIFACT

.travis/deploy.sh

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
#!/bin/bash -e
2+
3+
if [ "$#" -ne 2 ]; then
4+
echo "usage: $0 <API_KEY> <FILE>"
5+
exit 1
6+
fi
7+
8+
FILES=""
9+
10+
if [ -f "$2" ]; then
11+
FILES="-F file=@\"$2\""
12+
elif [ -d "$2" ]; then
13+
for entry in "$2"/*; do
14+
# skip dirs
15+
[ -f "$entry" ] || continue
16+
17+
FILES="$FILES -F file[]=@\"$entry\""
18+
done
19+
else
20+
echo "$2 does not exist"
21+
exit 2
22+
fi
23+
24+
REVISION="$(git rev-parse --short=7 HEAD)"
25+
AUTHOR="$(git log -1 "$REVISION" --pretty="%aN")"
26+
DATE="$(git log -1 "$REVISION" --pretty="%aI")"
27+
MESSAGE="$(git log -1 "$REVISION" --pretty="%s")"
28+
29+
curl -X POST \
30+
-H "Authorization: Bearer $1" \
31+
-H "X-Commit-Revision: $REVISION" \
32+
-H "X-Commit-Author: $AUTHOR" \
33+
-H "X-Commit-Date: $DATE" \
34+
-H "X-Commit-Message: $MESSAGE" \
35+
$FILES -L \
36+
https://avocado-builds.czekanski.info/api/upload

.travis/linux/build.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ export OS=linux64
77
export DATE=`date +%Y%m%d`
88
export COMMIT=`git rev-parse --short=7 HEAD`
99
export ARTIFACT=avocado-$OS-$DATE-$COMMIT
10-
export UPLOAD_DIR=$DATE-$COMMIT
1110
export CC="ccache clang-6.0 -fcolor-diagnostics"
1211
export CXX="ccache clang++-6.0 -fcolor-diagnostics"
1312

@@ -39,5 +38,5 @@ cp -r data $ARTIFACT/
3938
# Remove .gitignore
4039
find $ARTIFACT -type f -name .gitignore -exec rm {} \;
4140

42-
mkdir -p upload/$UPLOAD_DIR
43-
tar -zcf upload/$UPLOAD_DIR/$ARTIFACT.tar.gz $ARTIFACT
41+
mkdir -p upload
42+
tar -zcf upload/$ARTIFACT.tar.gz $ARTIFACT

.travis/macos/build.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ export OS=macos
55
export DATE=`date +%Y%m%d`
66
export COMMIT=`git rev-parse --short=7 HEAD`
77
export ARTIFACT=avocado-$OS-$DATE-$COMMIT
8-
export UPLOAD_DIR=$DATE-$COMMIT
98

109
# Configure cache
1110
brew install ccache
@@ -28,5 +27,5 @@ cp -r data $ARTIFACT/avocado.app/Contents/Resources
2827
find $ARTIFACT -type f -name .gitignore -exec rm {} \;
2928

3029
# Prepare upload artifact
31-
mkdir -p upload/$UPLOAD_DIR
32-
zip -r upload/$UPLOAD_DIR/$ARTIFACT.zip $ARTIFACT
30+
mkdir -p upload
31+
zip -r upload/$ARTIFACT.zip $ARTIFACT

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ See [Avocado compatibility list](https://avocado-db.czekanski.info)
3131

3232
Build | Status | Download
3333
--------|--------|---------
34-
Travis CI (Linux) | [![Build Status](https://travis-ci.org/JaCzekanski/Avocado.svg?branch=develop)](https://travis-ci.org/JaCzekanski/Avocado)
35-
Travis CI (macOS) | [![Build Status](https://travis-ci.org/JaCzekanski/Avocado.svg?branch=develop)](https://travis-ci.org/JaCzekanski/Avocado) | Comming soon ...
36-
Travis CI (Android) | [![Build Status](https://travis-ci.org/JaCzekanski/Avocado.svg?branch=develop)](https://travis-ci.org/JaCzekanski/Avocado) | Comming soon ...
34+
Travis CI (Linux) | [![Build Status](https://avocado-builds.czekanski.info/status/linux)](https://travis-ci.org/JaCzekanski/Avocado) |
35+
Travis CI (macOS) | [![Build Status](https://avocado-builds.czekanski.info/status/macos)](https://travis-ci.org/JaCzekanski/Avocado) | [develop](https://avocado-builds.czekanski.info/latest/macos)
36+
Travis CI (Android) | [![Build Status](https://avocado-builds.czekanski.info/status/android)](https://travis-ci.org/JaCzekanski/Avocado) | [develop](https://avocado-builds.czekanski.info/latest/android)
3737
AppVeyor (Windows 64-bit, Visual Studio 2019) | [![Build status](https://ci.appveyor.com/api/projects/status/h1cs3bj1vhskjxgx/branch/develop?svg=true)](https://ci.appveyor.com/project/JaCzekanski/avocado/branch/develop) | **[develop](https://ci.appveyor.com/api/projects/JaCzekanski/avocado/artifacts/avocado.zip?branch=develop&job=Environment%3A+APPVEYOR_BUILD_WORKER_IMAGE%3DVisual+Studio+2019+Preview%2C+TOOLSET%3Dvs2017%2C+platform%3Dx64)**
3838
AppVeyor (Windows 32-bit, Visual Studio 2019) | [![Build status](https://ci.appveyor.com/api/projects/status/h1cs3bj1vhskjxgx/branch/develop?svg=true)](https://ci.appveyor.com/project/JaCzekanski/avocado/branch/develop) | [develop](https://ci.appveyor.com/api/projects/JaCzekanski/avocado/artifacts/avocado.zip?branch=develop&job=Environment%3A+APPVEYOR_BUILD_WORKER_IMAGE%3DVisual+Studio+2019+Preview%2C+TOOLSET%3Dvs2017%2C+platform%3DWin32)
3939
AppVeyor (Windows 64-bit, Visual Studio 2017) | [![Build status](https://ci.appveyor.com/api/projects/status/h1cs3bj1vhskjxgx/branch/develop?svg=true)](https://ci.appveyor.com/project/JaCzekanski/avocado/branch/develop) | [develop](https://ci.appveyor.com/api/projects/JaCzekanski/avocado/artifacts/avocado.zip?branch=develop&job=Environment%3A+APPVEYOR_BUILD_WORKER_IMAGE%3DVisual+Studio+2017%2C+TOOLSET%3Dvs2017%2C+platform%3Dx64)

0 commit comments

Comments
 (0)