From e2b7062e26f0db1bbc300f52581e92ac8d87a333 Mon Sep 17 00:00:00 2001 From: Syping Date: Fri, 22 Jun 2018 17:11:18 +0200 Subject: [PATCH] update CI scripts --- .ci/ci.sh | 10 ++++++++++ {.travis => .ci}/debian_build.sh | 0 .travis/debian_travis.sh => .ci/debian_ci.sh | 2 +- {.travis => .ci}/debian_install.sh | 0 {.travis => .ci}/dropbox_uploader.sh | 0 {.travis => .ci}/gta5view.nsi | 0 {.travis => .ci}/osx_build.sh | 0 .travis/osx_travis.sh => .ci/osx_ci.sh | 4 ++-- {.travis => .ci}/osx_install.sh | 0 {.travis => .ci}/windows_build.sh | 0 .travis/windows_travis.sh => .ci/windows_ci.sh | 10 +++++----- {.travis => .ci}/wininstall_build.sh | 2 +- .../wininstall_travis.sh => .ci/wininstall_ci.sh | 2 +- .travis.yml | 14 +++++++------- .travis/travis.sh | 9 +-------- .travis/ubuntu_travis.sh | 4 ++-- 16 files changed, 30 insertions(+), 27 deletions(-) create mode 100755 .ci/ci.sh rename {.travis => .ci}/debian_build.sh (100%) rename .travis/debian_travis.sh => .ci/debian_ci.sh (92%) rename {.travis => .ci}/debian_install.sh (100%) rename {.travis => .ci}/dropbox_uploader.sh (100%) rename {.travis => .ci}/gta5view.nsi (100%) rename {.travis => .ci}/osx_build.sh (100%) rename .travis/osx_travis.sh => .ci/osx_ci.sh (55%) rename {.travis => .ci}/osx_install.sh (100%) rename {.travis => .ci}/windows_build.sh (100%) rename .travis/windows_travis.sh => .ci/windows_ci.sh (64%) rename {.travis => .ci}/wininstall_build.sh (94%) rename .travis/wininstall_travis.sh => .ci/wininstall_ci.sh (91%) diff --git a/.ci/ci.sh b/.ci/ci.sh new file mode 100755 index 0000000..6f7ebbf --- /dev/null +++ b/.ci/ci.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +if [ $(git name-rev --tags --name-only $(git rev-parse HEAD)) == "undefined" ]; then export APPLICATION_VERSION=$(lua -e 'for line in io.lines("config.h") do local m = string.match(line, "#define GTA5SYNC_APPVER \"(.+)\"$"); if m then print(m); os.exit(0) end end'); else export APPLICATION_VERSION=$(git name-rev --tags --name-only $(git rev-parse HEAD)); fi +export PACKAGE_VERSION=$(grep -oE '^[^\-]*' <<< $APPLICATION_VERSION) +export PACKAGE_BUILD=$(grep -oP '\-\K.+' <<< $APPLICATION_VERSION) +export EXECUTABLE_VERSION=${PACKAGE_VERSION}${PACKAGE_BUILD}${EXECUTABLE_TAG} +if [[ ! ${PACKAGE_BUILD} ]]; then export PACKAGE_BUILD=1; fi +export PROJECT_DIR=$(pwd) + +.ci/${BUILD_SCRIPT} diff --git a/.travis/debian_build.sh b/.ci/debian_build.sh similarity index 100% rename from .travis/debian_build.sh rename to .ci/debian_build.sh diff --git a/.travis/debian_travis.sh b/.ci/debian_ci.sh similarity index 92% rename from .travis/debian_travis.sh rename to .ci/debian_ci.sh index 73ed796..c8728e7 100755 --- a/.travis/debian_travis.sh +++ b/.ci/debian_ci.sh @@ -12,4 +12,4 @@ docker pull ${DOCKER_IMAGE} && \ docker run --rm \ -v "${PROJECT_DIR}:${PROJECT_DIR_DOCKER}" \ ${DOCKER_IMAGE} \ - /bin/bash -c "export PROJECT_DIR=${PROJECT_DIR_DOCKER} && export QT_SELECT=${QT_SELECT} && export APPLICATION_VERSION=${APPLICATION_VERSION} && export APT_INSTALL=${APT_INSTALL} && export QMAKE_FLAGS_QT4=${QMAKE_FLAGS_QT4} && export QMAKE_FLAGS_QT5=${QMAKE_FLAGS_QT5} && export PACKAGE_VERSION=${PACKAGE_VERSION} && export PACKAGE_BUILD=${PACKAGE_BUILD} && export PACKAGE_CODE=${PACKAGE_CODE} && export EXECUTABLE_VERSION=${EXECUTABLE_VERSION} && export EXECUTABLE_ARCH=${EXECUTABLE_ARCH} && cd ${PROJECT_DIR_DOCKER} && .travis/debian_install.sh && .travis/debian_build.sh" + /bin/bash -c "export PROJECT_DIR=${PROJECT_DIR_DOCKER} && export QT_SELECT=${QT_SELECT} && export APPLICATION_VERSION=${APPLICATION_VERSION} && export APT_INSTALL=${APT_INSTALL} && export QMAKE_FLAGS_QT4=${QMAKE_FLAGS_QT4} && export QMAKE_FLAGS_QT5=${QMAKE_FLAGS_QT5} && export PACKAGE_VERSION=${PACKAGE_VERSION} && export PACKAGE_BUILD=${PACKAGE_BUILD} && export PACKAGE_CODE=${PACKAGE_CODE} && export EXECUTABLE_VERSION=${EXECUTABLE_VERSION} && export EXECUTABLE_ARCH=${EXECUTABLE_ARCH} && cd ${PROJECT_DIR_DOCKER} && .ci/debian_install.sh && .ci/debian_build.sh" diff --git a/.travis/debian_install.sh b/.ci/debian_install.sh similarity index 100% rename from .travis/debian_install.sh rename to .ci/debian_install.sh diff --git a/.travis/dropbox_uploader.sh b/.ci/dropbox_uploader.sh similarity index 100% rename from .travis/dropbox_uploader.sh rename to .ci/dropbox_uploader.sh diff --git a/.travis/gta5view.nsi b/.ci/gta5view.nsi similarity index 100% rename from .travis/gta5view.nsi rename to .ci/gta5view.nsi diff --git a/.travis/osx_build.sh b/.ci/osx_build.sh similarity index 100% rename from .travis/osx_build.sh rename to .ci/osx_build.sh diff --git a/.travis/osx_travis.sh b/.ci/osx_ci.sh similarity index 55% rename from .travis/osx_travis.sh rename to .ci/osx_ci.sh index 4e4ae37..b144697 100755 --- a/.travis/osx_travis.sh +++ b/.ci/osx_ci.sh @@ -1,8 +1,8 @@ #!/bin/bash # Install packages -.travis/osx_install.sh && \ +.ci/osx_install.sh && \ # Build gta5view -.travis/osx_build.sh && \ +.ci/osx_build.sh && \ cd ${PROJECT_DIR} diff --git a/.travis/osx_install.sh b/.ci/osx_install.sh similarity index 100% rename from .travis/osx_install.sh rename to .ci/osx_install.sh diff --git a/.travis/windows_build.sh b/.ci/windows_build.sh similarity index 100% rename from .travis/windows_build.sh rename to .ci/windows_build.sh diff --git a/.travis/windows_travis.sh b/.ci/windows_ci.sh similarity index 64% rename from .travis/windows_travis.sh rename to .ci/windows_ci.sh index aafe48d..dd2a293 100755 --- a/.travis/windows_travis.sh +++ b/.ci/windows_ci.sh @@ -9,18 +9,18 @@ docker pull ${DOCKER_IMAGE} && \ docker run --rm \ -v "${PROJECT_DIR}:${PROJECT_DIR_DOCKER}" \ ${DOCKER_IMAGE} \ - /bin/bash -c "export PROJECT_DIR=${PROJECT_DIR_DOCKER} && export QT_SELECT=${QT_SELECT} && export APPLICATION_VERSION=${APPLICATION_VERSION} && export QMAKE_FLAGS_QT4=${QMAKE_FLAGS_QT4} && export QMAKE_FLAGS_QT5=${QMAKE_FLAGS_QT5} && export PACKAGE_VERSION=${PACKAGE_VERSION} && export PACKAGE_BUILD=${PACKAGE_BUILD} && export PACKAGE_CODE=${PACKAGE_CODE} && export EXECUTABLE_VERSION=${EXECUTABLE_VERSION} && export EXECUTABLE_ARCH=${EXECUTABLE_ARCH} && cd ${PROJECT_DIR_DOCKER} && .travis/windows_build.sh" && \ + /bin/bash -c "export PROJECT_DIR=${PROJECT_DIR_DOCKER} && export QT_SELECT=${QT_SELECT} && export APPLICATION_VERSION=${APPLICATION_VERSION} && export QMAKE_FLAGS_QT4=${QMAKE_FLAGS_QT4} && export QMAKE_FLAGS_QT5=${QMAKE_FLAGS_QT5} && export PACKAGE_VERSION=${PACKAGE_VERSION} && export PACKAGE_BUILD=${PACKAGE_BUILD} && export PACKAGE_CODE=${PACKAGE_CODE} && export EXECUTABLE_VERSION=${EXECUTABLE_VERSION} && export EXECUTABLE_ARCH=${EXECUTABLE_ARCH} && cd ${PROJECT_DIR_DOCKER} && .ci/windows_build.sh" && \ # Prepare environment variable export GTA5VIEW_EXECUTABLE=gta5view-${EXECUTABLE_VERSION}${EXECUTABLE_ARCH}.exe && \ # Upload Assets to Dropbox if [ "${PACKAGE_CODE}" == "Dropbox" ]; then - ${PROJECT_DIR}/.travis/dropbox_uploader.sh mkdir gta5view-builds/${PACKAGE_VERSION} - ${PROJECT_DIR}/.travis/dropbox_uploader.sh upload ${PROJECT_DIR}/assets/${GTA5VIEW_EXECUTABLE} gta5view-builds/${PACKAGE_VERSION}/${GTA5VIEW_EXECUTABLE} && \ + ${PROJECT_DIR}/.ci/dropbox_uploader.sh mkdir gta5view-builds/${PACKAGE_VERSION} + ${PROJECT_DIR}/.ci/dropbox_uploader.sh upload ${PROJECT_DIR}/assets/${GTA5VIEW_EXECUTABLE} gta5view-builds/${PACKAGE_VERSION}/${GTA5VIEW_EXECUTABLE} && \ rm -rf ${GTA5VIEW_EXECUTABLE} elif [ "${PACKAGE_CODE}" == "gta5-mods" ]; then - ${PROJECT_DIR}/.travis/dropbox_uploader.sh mkdir gta5-mods/${PACKAGE_VERSION} - ${PROJECT_DIR}/.travis/dropbox_uploader.sh upload ${PROJECT_DIR}/assets/${GTA5VIEW_EXECUTABLE} gta5-mods/${PACKAGE_VERSION}/${GTA5VIEW_EXECUTABLE} && \ + ${PROJECT_DIR}/.ci/dropbox_uploader.sh mkdir gta5-mods/${PACKAGE_VERSION} + ${PROJECT_DIR}/.ci/dropbox_uploader.sh upload ${PROJECT_DIR}/assets/${GTA5VIEW_EXECUTABLE} gta5-mods/${PACKAGE_VERSION}/${GTA5VIEW_EXECUTABLE} && \ rm -rf ${GTA5VIEW_EXECUTABLE} fi diff --git a/.travis/wininstall_build.sh b/.ci/wininstall_build.sh similarity index 94% rename from .travis/wininstall_build.sh rename to .ci/wininstall_build.sh index 4b0bb7f..906145d 100755 --- a/.travis/wininstall_build.sh +++ b/.ci/wininstall_build.sh @@ -15,5 +15,5 @@ qmake ${QMAKE_FLAGS} DEFINES+=GTA5SYNC_BUILDTYPE_DEV "DEFINES+=GTA5SYNC_BUILDCOD make depend && \ make -j 4 && \ cd ${PROJECT_DIR}/assets && \ -makensis -NOCD ${PROJECT_DIR}/.travis/gta5view.nsi && \ +makensis -NOCD ${PROJECT_DIR}/.ci/gta5view.nsi && \ mv -f gta5view_setup.exe gta5view-${EXECUTABLE_VERSION}_setup.exe diff --git a/.travis/wininstall_travis.sh b/.ci/wininstall_ci.sh similarity index 91% rename from .travis/wininstall_travis.sh rename to .ci/wininstall_ci.sh index fa8ef57..34b5ffc 100755 --- a/.travis/wininstall_travis.sh +++ b/.ci/wininstall_ci.sh @@ -9,4 +9,4 @@ docker pull ${DOCKER_IMAGE} && \ docker run --rm \ -v "${PROJECT_DIR}:${PROJECT_DIR_DOCKER}" \ ${DOCKER_IMAGE} \ - /bin/bash -c "export PROJECT_DIR=${PROJECT_DIR_DOCKER} && export QT_SELECT=${QT_SELECT} && export APPLICATION_VERSION=${APPLICATION_VERSION} && export QMAKE_FLAGS_QT4=${QMAKE_FLAGS_QT4} && export QMAKE_FLAGS_QT5=${QMAKE_FLAGS_QT5} && export PACKAGE_VERSION=${PACKAGE_VERSION} && export PACKAGE_BUILD=${PACKAGE_BUILD} && export PACKAGE_CODE=${PACKAGE_CODE} && export EXECUTABLE_VERSION=${EXECUTABLE_VERSION} && export EXECUTABLE_ARCH=${EXECUTABLE_ARCH} && cd ${PROJECT_DIR_DOCKER} && .travis/wininstall_build.sh" + /bin/bash -c "export PROJECT_DIR=${PROJECT_DIR_DOCKER} && export QT_SELECT=${QT_SELECT} && export APPLICATION_VERSION=${APPLICATION_VERSION} && export QMAKE_FLAGS_QT4=${QMAKE_FLAGS_QT4} && export QMAKE_FLAGS_QT5=${QMAKE_FLAGS_QT5} && export PACKAGE_VERSION=${PACKAGE_VERSION} && export PACKAGE_BUILD=${PACKAGE_BUILD} && export PACKAGE_CODE=${PACKAGE_CODE} && export EXECUTABLE_VERSION=${EXECUTABLE_VERSION} && export EXECUTABLE_ARCH=${EXECUTABLE_ARCH} && cd ${PROJECT_DIR_DOCKER} && .ci/wininstall_build.sh" diff --git a/.travis.yml b/.travis.yml index fa7bd35..ddb2cfc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,37 +9,37 @@ service: matrix: include: - env: - - BUILD_SCRIPT=debian_travis.sh + - BUILD_SCRIPT=debian_ci.sh - RELEASE_LABEL="Debian 32-Bit Package" - DEBIAN_VERSION=stretch - DOCKER_USER=i386 - APT_INSTALL=clang - env: - - BUILD_SCRIPT=debian_travis.sh + - BUILD_SCRIPT=debian_ci.sh - RELEASE_LABEL="Debian 64-Bit Package" - DEBIAN_VERSION=stretch - DOCKER_USER=amd64 - APT_INSTALL=clang - env: - - BUILD_SCRIPT=windows_travis.sh + - BUILD_SCRIPT=windows_ci.sh - QT_SELECT=qt5-i686-w64-mingw32 - RELEASE_LABEL="Windows 32-Bit Portable" - env: - - BUILD_SCRIPT=windows_travis.sh + - BUILD_SCRIPT=windows_ci.sh - QT_SELECT=qt5-x86_64-w64-mingw32 - RELEASE_LABEL="Windows 64-Bit Portable" - EXECUTABLE_ARCH=_x64 - env: - - BUILD_SCRIPT=windows_travis.sh + - BUILD_SCRIPT=windows_ci.sh - QT_SELECT=qt5-x86_64-w64-mingw32 - PACKAGE_CODE=Dropbox - env: - - BUILD_SCRIPT=wininstall_travis.sh + - BUILD_SCRIPT=wininstall_ci.sh - QT_SELECT=qt5-x86_64-w64-mingw32 - RELEASE_LABEL="Windows 64-Bit Installer" - os: osx env: - - BUILD_SCRIPT=osx_travis.sh + - BUILD_SCRIPT=osx_ci.sh - RELEASE_LABEL="Mac OS X 64-Bit Disk Image" before_install: diff --git a/.travis/travis.sh b/.travis/travis.sh index e88bc95..68fef79 100755 --- a/.travis/travis.sh +++ b/.travis/travis.sh @@ -20,11 +20,4 @@ if [ "${PACKAGE_CODE}" == "" ]; then export PACKAGE_CODE=GitHub fi -if [ `git name-rev --tags --name-only $(git rev-parse HEAD)` == "undefined" ]; then export APPLICATION_VERSION=`lua -e 'for line in io.lines("config.h") do local m = string.match(line, "#define GTA5SYNC_APPVER \"(.+)\"$"); if m then print(m); os.exit(0) end end'`; else export APPLICATION_VERSION=`git name-rev --tags --name-only $(git rev-parse HEAD)`; fi -export PACKAGE_VERSION=$(grep -oE '^[^\-]*' <<< $APPLICATION_VERSION) -export PACKAGE_BUILD=$(grep -oP '\-\K.+' <<< $APPLICATION_VERSION) -export EXECUTABLE_VERSION=${PACKAGE_VERSION}${PACKAGE_BUILD}${EXECUTABLE_TAG} -if [[ ! ${PACKAGE_BUILD} ]]; then export PACKAGE_BUILD=1; fi -export PROJECT_DIR=$(pwd) - -.travis/${BUILD_SCRIPT} +.ci/ci.sh diff --git a/.travis/ubuntu_travis.sh b/.travis/ubuntu_travis.sh index 50de7d3..d93bcbd 100755 --- a/.travis/ubuntu_travis.sh +++ b/.travis/ubuntu_travis.sh @@ -1,8 +1,8 @@ #!/bin/bash # Install packages -sudo .travis/debian_install.sh && \ +sudo .ci/debian_install.sh && \ # Build gta5view -sudo .travis/debian_build.sh && \ +sudo .ci/debian_build.sh && \ cd ${PROJECT_DIR}