From 77615eed9c3b22e8081c19b45c19aeab51dfe5f0 Mon Sep 17 00:00:00 2001 From: Vadzim Ramanenka Date: Mon, 19 Mar 2018 12:48:50 +0300 Subject: [PATCH] Remove build/version hash/bower related code --- .gitignore | 2 - .travis.yml | 33 ---------------- bower.json | 19 --------- build.sh | 65 ------------------------------- config.php | 2 +- package.json | 4 +- src/php/Helpers/VersionHelper.php | 22 +---------- 7 files changed, 3 insertions(+), 144 deletions(-) delete mode 100644 .travis.yml delete mode 100644 bower.json delete mode 100755 build.sh diff --git a/.gitignore b/.gitignore index cf41e9c..17f81a0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,4 @@ .idea/ -bower_components/ -/dist/ /config_override.php .DS_Store diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 4b095f1..0000000 --- a/.travis.yml +++ /dev/null @@ -1,33 +0,0 @@ -language: php -php: - - '7.0' - - '5.6' - - '5.4' - -branches: - only: - - master - - /^v.*$/ - -install: - - npm install - - npm install -g bower - - bower install - - composer install - -script: - - echo "assume script is successful" - -before_deploy: npm run build - -deploy: - provider: releases - file: - - xhprof-viewer.tar.gz - - xhprof-viewer.zip - skip_cleanup: true - api-key: - secure: "CKD7oFN5iYDHpfB/sO86AeID5B9nipJCWywAA5vTiEHehsBNTJQ7x02e97lT0jmgLRVJHowcWixWKr/f8H2SN2xZ8bakN263fZFsuN23qjjPzyqUw0VzUedU9lLf17EF7WnDRdxf1wRHF13BUZz8YMqekqUZCt8tAF7D26Ncz2AeNHBZzZENH0EoYOZot1DXJA603OsA+Xb5vC4/0YcwgzWAj+yRETP69eDpJb4HG/t1jYsfSbpnkFau/CLtv6M3EYXq1VLcXCn3qg3dUat3IW0aczhb2R0+SNMtwv8hyc1D42EKOp1lCayEWG+kN67l98fmby0jQfV2g1ZOaP/5wELR9/wnCzo3dXBe7D24BxVryDF+/ihEV1vWRWgwzCJ7vmS86NCFH1z0IVM3Jpl/qtDs9qv+jTMtO2BLROFAiO5r0jwUM5BOgEoqk1VGWPuAe4poAlEXP3v6Ag6wzQPmLmDylZE9BoMWVfwxHRQf3oITJlPgwfNQlRoJCFQcb/wyfNZPAalSxcW8OPsztG9DDTxjL7yevUep+u4fLpOxY6qUEawBDYkzjfkKBYirA/WSONSsrlwh88x4NLxtLVmUofH3rRxF9VxomXt+z8aJpi4Msl+3iLB3wNJT2/ZVqMtf3Nev6G3mr7mRRMXIEWmWnrUdykELGhElhYqjzGadfXg=" - on: - tags: true - php: 5.6 diff --git a/bower.json b/bower.json deleted file mode 100644 index f78936f..0000000 --- a/bower.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "xhprof-viewer", - "description": "Extended xhprof viewer that supports both OOTB file format as well as extended file format with sql count and wall time.", - "main": "", - "authors": [ - "Vadzim Ramanenka " - ], - "moduleType": [], - "homepage": "", - "private": true, - "dependencies": { - "jquery": "~2.1.4", - "bootstrap": "~3.3.6", - "font-awesome": "~4.5.0", - "bootstrap-datepicker": "~1.5.0", - "highlightjs": "~8.9.1", - "lexer": "^1.7.8" - } -} diff --git a/build.sh b/build.sh deleted file mode 100755 index 7cc2f50..0000000 --- a/build.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/usr/bin/env sh -# -# © 2016 SugarCRM Inc. Licensed by SugarCRM under the Apache 2.0 license. -# - -if [ "$npm_package_name" != "xhprof-viewer" ]; then - echo 'Run `npm run build` instead'; - exit 1; -fi; - -npm install -bower install -composer install - -if [ -a 'dist' ]; then - rm -r ./dist -fi; - -package_name=$npm_package_name-$npm_package_version -archive_name=$npm_package_name -if [ -a "$archive_name.tar.gz" ]; then - rm $archive_name.tar.gz -fi; - -mkdir -p dist/$package_name -rsync -Rr --exclude=.DS_Store \ - src \ - vendor \ - xhprof \ - config.php \ - templates \ - index.php \ - README.md \ - LICENSE \ - CONTRIBUTING.md \ - CONTRIBUTOR_TERMS.pdf \ - THIRD_PARTY_LICENSES.pdf \ - bower_components/jquery/dist/jquery.min.js \ - bower_components/bootstrap/dist/css/bootstrap.min.css \ - bower_components/bootstrap/dist/js/bootstrap.min.js \ - bower_components/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 \ - bower_components/bootstrap-datepicker/dist/js/bootstrap-datepicker.min.js \ - bower_components/bootstrap-datepicker/dist/css/bootstrap-datepicker.min.css \ - bower_components/font-awesome/css/font-awesome.min.css \ - bower_components/font-awesome/fonts/fontawesome-webfont.woff2 \ - bower_components/highlightjs/styles/default.css \ - bower_components/highlightjs/highlight.pack.min.js \ - bower_components/highlightjs/highlight.pack.min.js \ - bower_components/lexer/lexer.js \ - \ - dist/$package_name || (echo 'Failed to rsync' 1>&2 && exit 1); - -cd dist/ - -sed -i.bak "s/VIEWER_VERSION/$npm_package_version/g" \ - $package_name/config.php -rm $package_name/config.php.bak - -tar -czf "../$archive_name.tar.gz" $package_name -zip -qr "../$archive_name.zip" $package_name - -cd .. -rm -r dist -ls $archive_name.tar.gz -ls $archive_name.zip diff --git a/config.php b/config.php index f19a10a..26af411 100755 --- a/config.php +++ b/config.php @@ -4,7 +4,7 @@ */ $config = array( - 'version' => 'VIEWER_VERSION', + 'version' => '1.1.0', 'profile_files_dir' => '/tmp/profile_files', ); diff --git a/package.json b/package.json index 36d6593..3b9f988 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,10 @@ { "name": "xhprof-viewer", - "version": "1.0.9", "private": true, "description": "Extended xhprof viewer that supports both OOTB file format as well as extended file format with sql count and wall time.", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", - "env": "env", - "build": " ./build.sh" + "env": "env" }, "repository": { "type": "git", diff --git a/src/php/Helpers/VersionHelper.php b/src/php/Helpers/VersionHelper.php index 06fd273..c6874cb 100644 --- a/src/php/Helpers/VersionHelper.php +++ b/src/php/Helpers/VersionHelper.php @@ -19,26 +19,6 @@ public function getCurrentVersion() { global $config; $version = $config['version']; - - if ($version == 'VIEWER_VERSION') { - return $this->getHeadHash(); - } else { - return array('type' => 'version', 'version' => $version); - } - } - - /** - * Returns git HEAD hash as version - * - * @return array|bool - */ - protected function getHeadHash() - { - $output = exec('git rev-parse --verify HEAD', $outputLines, $code); - if ($code) { - return false; - } - - return array('type' => 'hash', 'version' => $output); + return array('type' => 'version', 'version' => $version); } }