diff options
| author | Joseph Herlant <aerostitch@users.noreply.github.com> | 2018-04-21 17:48:12 -0700 |
|---|---|---|
| committer | Pierre GRANDIN <pgrandin@users.noreply.github.com> | 2018-04-21 17:48:12 -0700 |
| commit | fe7af475a7b2ce4365a89c19ccccb99edec8fa1d (patch) | |
| tree | 8b68a532805d003e4b0977a8a49a461960de5a34 | |
| parent | 3a4ec2411e6d63e745e1eda5301b50ffb497c46d (diff) | |
| download | navit-fe7af475a7b2ce4365a89c19ccccb99edec8fa1d.tar.gz | |
Update:CI:Make sure that all the scripts in the ci folder have a shebang and use set -e (#460)
* Update:CI:Make sure that all the scripts in the ci folder have a shebang and use set -e
* Fix:CI:Ignore ownership when untaring to avoid "Cannot change ownership" error
| -rw-r--r-- | ci/build_win32.sh | 2 | ||||
| -rw-r--r-- | ci/import_translations.sh | 3 | ||||
| -rw-r--r-- | ci/merge_i18n_update.sh | 3 | ||||
| -rw-r--r-- | ci/publish.sh | 3 | ||||
| -rw-r--r-- | ci/setup_android.sh | 5 | ||||
| -rw-r--r-- | ci/setup_common_requirements.sh | 3 | ||||
| -rw-r--r-- | ci/xdotools.sh | 2 |
7 files changed, 20 insertions, 1 deletions
diff --git a/ci/build_win32.sh b/ci/build_win32.sh index 6ac301449..26315ccd6 100644 --- a/ci/build_win32.sh +++ b/ci/build_win32.sh @@ -1,3 +1,5 @@ +#!/bin/sh +set -e apt-get update && apt-get install -y mingw32 mingw32-binutils mingw32-runtime default-jdk nsis libsaxonb-java mkdir win32 diff --git a/ci/import_translations.sh b/ci/import_translations.sh index 33d94e9c4..6c18ffa91 100644 --- a/ci/import_translations.sh +++ b/ci/import_translations.sh @@ -1,3 +1,6 @@ +#!/bin/bash +set -e + # Let's check if there is files in the import queue [ -d po/import_queue/ ] || exit 0 diff --git a/ci/merge_i18n_update.sh b/ci/merge_i18n_update.sh index 1943b27e4..5fb42d56e 100644 --- a/ci/merge_i18n_update.sh +++ b/ci/merge_i18n_update.sh @@ -1,3 +1,6 @@ +#!/bin/sh +set -e + message=`git log -1 --pretty=%B` git config --global user.name "CircleCI" git config --global user.email circleci@navit-project.org diff --git a/ci/publish.sh b/ci/publish.sh index a92f620b8..58c3c05d5 100644 --- a/ci/publish.sh +++ b/ci/publish.sh @@ -1,3 +1,6 @@ +#!/bin/sh +set -e + ARCH="arm" cd ~/ diff --git a/ci/setup_android.sh b/ci/setup_android.sh index f3ae96900..992044302 100644 --- a/ci/setup_android.sh +++ b/ci/setup_android.sh @@ -1,3 +1,6 @@ +#!/bin/bash +set -e + apt-get update && apt-get install -y software-properties-common add-apt-repository -y ppa:openjdk-r/ppa apt-get update && apt-get install -y openjdk-8-jdk wget expect git curl libsaxonb-java ant @@ -7,7 +10,7 @@ export ANDROID_SDK_HOME=/opt/android-sdk-linux export ANDROID_HOME=/opt/android-sdk-linux cd /opt && wget -q https://dl.google.com/android/android-sdk_r24.4.1-linux.tgz -O android-sdk.tgz -cd /opt && tar -xvzf android-sdk.tgz +cd /opt && tar -xvzf android-sdk.tgz --no-same-owner cd /opt && rm -f android-sdk.tgz export PATH=${PATH}:${ANDROID_SDK_HOME}/tools:${ANDROID_SDK_HOME}/platform-tools:/opt/tools diff --git a/ci/setup_common_requirements.sh b/ci/setup_common_requirements.sh index ad60a6625..40a87dd07 100644 --- a/ci/setup_common_requirements.sh +++ b/ci/setup_common_requirements.sh @@ -1 +1,4 @@ +#!/bin/sh +set -e + apt-get update && apt-get install -y wget unzip cmake build-essential gettext imagemagick util-linux git ssh diff --git a/ci/xdotools.sh b/ci/xdotools.sh index b745d9f39..f71232b97 100644 --- a/ci/xdotools.sh +++ b/ci/xdotools.sh @@ -1,3 +1,5 @@ +#!/bin/sh +set -e sudo apt-get install xdotool # Use xinput test 4 when running x11vnc on the circleci server to find mouse coordinates |