From 89d6f4e2e332be97bc351c69d604fc76a5a9a725 Mon Sep 17 00:00:00 2001 From: FelisCatus Date: Wed, 20 Sep 2017 16:44:19 -0700 Subject: [PATCH] Start working on 2.5.5. --- .circleci/config.yml | 7 ++++--- omega-target-chromium-extension/overlay/manifest.json | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a95bbe5..4d41089 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -68,9 +68,10 @@ jobs: command: | cd omega-target-chromium-extension mkdir packages - base_ver=$(json "build/package.json" version) - FULL_VER="${base_ver}-ci.${CIRCLE_BUILD_NUM}+${CIRCLE_SHA1}" - echo "export FULL_VER=$FULL_VER" >> $BASH_ENV + base_ver=$(json -f "overlay/manifest.json" version) + commit_rev=$(git rev-parse --short HEAD) + FULL_VER="${base_ver}-${CIRCLE_BUILD_NUM}.ci.${commit_rev}" + echo "export FULL_VER='$FULL_VER'" >> $BASH_ENV cd .. - run: diff --git a/omega-target-chromium-extension/overlay/manifest.json b/omega-target-chromium-extension/overlay/manifest.json index 65f5429..5713409 100644 --- a/omega-target-chromium-extension/overlay/manifest.json +++ b/omega-target-chromium-extension/overlay/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "__MSG_manifest_app_name__", - "version": "2.5.4", + "version": "2.5.5", "description": "__MSG_manifest_app_description__", "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkhwZJT76btQ04EEMOFtZPLESD1TmSVjbLjs0OyesD9Ht8YllFPfJ3qmtbSQGVuvmxH1GK/jUO2QcEWb8bHuOjoRlq20fi5j5Aq90O8FKET+y5D8PxCyi3WmnquiEwaE5cNmaCsw/G2JlO+bZOtdQ/QKOvMxBAegABYimEGfSvCMVUEvpymys0gBhLoch72zPAiJUBkf0z8BtjYTueMRcRXkrSeRPLygUDQnZ1TkQWMYYBp/zqpD5ggxytAklEMQzR9Hn0lqu5s7iuUAgihbysPn/8Wh00Zj5FySpK//KcpG3JS7UWxC28oSt8z5ZR3YimnX+HX3P36V0mC1pgM4o7wIDAQAB", "icons": {