diff options
| -rwxr-xr-x | .ci/linux/deploy.sh | 5 | ||||
| -rwxr-xr-x | .ci/macos/deploy.sh | 4 | ||||
| -rwxr-xr-x | .ci/script.sh | 4 | ||||
| -rw-r--r-- | .travis.yml | 6 |
4 files changed, 11 insertions, 8 deletions
diff --git a/.ci/linux/deploy.sh b/.ci/linux/deploy.sh index 403fde14..61b2e408 100755 --- a/.ci/linux/deploy.sh +++ b/.ci/linux/deploy.sh @@ -49,7 +49,10 @@ done chmod +x nheko-*x86_64.AppImage -if [ ! -z "$VERSION" ]; then +mkdir artifacts +cp nheko-*x86_64.AppImage artifacts/ + +if [ -n "$VERSION" ]; then # commented out for now, as AppImage file appears to already contain the version. #mv nheko-*x86_64.AppImage nheko-${VERSION}-x86_64.AppImage echo "nheko-${VERSION}-x86_64.AppImage" diff --git a/.ci/macos/deploy.sh b/.ci/macos/deploy.sh index 45ed13bc..ee4acaed 100755 --- a/.ci/macos/deploy.sh +++ b/.ci/macos/deploy.sh @@ -25,6 +25,8 @@ PATH=/usr/local/opt/qt/bin/:${PATH} dmgbuild -s ./.ci/macos/settings.json "Nheko" nheko.dmg -if [ ! -z "$VERSION" ]; then +if [ -n "$VERSION" ]; then mv nheko.dmg "nheko-${VERSION}.dmg" + mkdir artifacts + cp "nheko-${VERSION}.dmg" artifacts/ fi diff --git a/.ci/script.sh b/.ci/script.sh index 1bde913c..ac6bfed6 100755 --- a/.ci/script.sh +++ b/.ci/script.sh @@ -41,11 +41,11 @@ cmake --build build if [ "$TRAVIS_OS_NAME" = "osx" ]; then make lint; - if [ "$DEPLOYMENT" = 1 ] && [ ! -z "$VERSION" ] ; then + if [ "$DEPLOYMENT" = 1 ] && [ -n "$VERSION" ] ; then make macos-deploy; fi fi -if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$DEPLOYMENT" = 1 ] && [ ! -z "$VERSION" ]; then +if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$DEPLOYMENT" = 1 ] && [ -n "$VERSION" ]; then make linux-deploy; fi diff --git a/.travis.yml b/.travis.yml index 6e8ee05d..6a699043 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,10 +88,8 @@ deploy: detect_encoding: true cache_control: "max-age=31536000" skip_cleanup: true - file_glob: true - file: - - nheko-${VERSION}-x86_64.AppImage - - nheko-${VERSION}.dmg + acl: public_read + local_dir: artifacts on: condition: "$DEPLOYMENT == 1" repo: Nheko-Reborn/nheko |