From 1b1fa73fd9dd872f449bf3911c9daae9089e6afb Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Sat, 11 Apr 2020 21:21:33 +0200 Subject: [PATCH] Fix Travis CI --- .build/deploy-branch.sh | 2 +- .build/install.sh | 2 +- .build/release.sh | 2 +- .travis.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.build/deploy-branch.sh b/.build/deploy-branch.sh index d8284a7..ca0fda7 100755 --- a/.build/deploy-branch.sh +++ b/.build/deploy-branch.sh @@ -4,7 +4,7 @@ set -e [ -n "$PICO_BUILD_ENV" ] || { echo "No Pico build environment specified" >&2; exit 1; } # get current Pico milestone -VERSION="$(php -r "require_once('$PICO_PROJECT_DIR/lib/Pico.php'); echo Pico::VERSION;")" +VERSION="$(php -r "require_once('$PICO_PROJECT_DIR/lib/Pico.php'); echo picocms\Pico\Pico::VERSION;")" MILESTONE="Pico$([[ "$VERSION" =~ ^([0-9]+\.[0-9]+)\. ]] && echo " ${BASH_REMATCH[1]}")" echo "Deploying $PROJECT_REPO_BRANCH branch ($MILESTONE)..." diff --git a/.build/install.sh b/.build/install.sh index dff079c..738f648 100755 --- a/.build/install.sh +++ b/.build/install.sh @@ -24,7 +24,7 @@ if [ -z "$COMPOSER_ROOT_VERSION" ] && [ -n "$PROJECT_REPO_BRANCH" ]; then if [ -z "$PICO_VERSION_PATTERN" ]; then PICO_VERSION_PATTERN="$(php -r " require_once('$PICO_PROJECT_DIR/lib/Pico.php'); - echo preg_replace('/\.[0-9]+-dev$/', '.x-dev', Pico::VERSION); + echo preg_replace('/\.[0-9]+-dev$/', '.x-dev', picocms\Pico\Pico::VERSION); ")" fi diff --git a/.build/release.sh b/.build/release.sh index 7a2cc1d..b8fb653 100755 --- a/.build/release.sh +++ b/.build/release.sh @@ -16,7 +16,7 @@ echo if [ -z "$VERSION" ]; then PICO_VERSION="$(php -r " require_once('$PICO_PROJECT_DIR/lib/Pico.php'); - echo preg_replace('/-(?:dev|n|nightly)(?:[.-]?[0-9]+)?(?:[.-]dev)?$/', '', Pico::VERSION); + echo preg_replace('/-(?:dev|n|nightly)(?:[.-]?[0-9]+)?(?:[.-]dev)?$/', '', picocms\Pico\Pico::VERSION); ")" VERSION="v$PICO_VERSION-dev+${PROJECT_REPO_BRANCH:-master}" diff --git a/.travis.yml b/.travis.yml index 5d7ee4e..ee54509 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,7 @@ jobs: install: - install.sh --deploy script: - - '[ "$PROJECT_REPO_TAG" == "v$(php -r "require_once(\"lib/Pico.php\"); echo Pico::VERSION;")" ]' + - '[ "$PROJECT_REPO_TAG" == "v$(php -r "require_once(\"lib/Pico.php\"); echo picocms\Pico\Pico::VERSION;")" ]' - deploy-release.sh before_deploy: - release.sh "$PROJECT_REPO_TAG"