diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2020-08-15 15:03:44 +0200 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-09-01 16:11:59 +0000 |
| commit | 7c15b368e2adcb917095cc46d07c7da5e97cc76d (patch) | |
| tree | 420e16893168a10504ac5c7eb1765f898cbf491c /scripts/install-qt.sh | |
| parent | b60f3409bbd6317de5f889d49055bee70648931b (diff) | |
Initial support for GitHub Actions
This commit adds jobs similar to what we have in Travis. Some tests are
disabled when running on GitHub since they do not pass for various
reasons. Note that those tests are usually skipped on Travis due to
missing dependencies.
Change-Id: Icec96dc22e2939d12568d2de1f1a4537c35977ad
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'scripts/install-qt.sh')
| -rwxr-xr-x | scripts/install-qt.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/install-qt.sh b/scripts/install-qt.sh index be953e77d..a73300ae4 100755 --- a/scripts/install-qt.sh +++ b/scripts/install-qt.sh @@ -218,7 +218,7 @@ if ! ${FORCE_DOWNLOAD} && [ -f "${HASH_FILEPATH}" ]; then fi if ${INSTALLATION_IS_VALID}; then - echo "Already installed. Skipping download." + echo "Already installed. Skipping download." >&2 exit 0 fi @@ -313,7 +313,11 @@ for COMPONENT in ${COMPONENTS}; do # adjust the PATH variable. echo $(dirname "${CONF_FILE}") elif [[ "${COMPONENT}" =~ "qtcreator" ]]; then - echo "${INSTALL_DIR}/Tools/QtCreator/bin" + if [ "${HOST_OS}" == "mac_x64" ]; then + echo "${INSTALL_DIR}/Qt Creator.app/Contents/MacOS" + else + echo "${INSTALL_DIR}/Tools/QtCreator/bin" + fi fi done |