Merge branch 'release/0.0.3'

FCP-INDI · Aug 31, 2019 · 904017b · 904017b
2 parents bdc13b2 + 65b6ca0
commit 904017b
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 10,860 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -103,21 +103,10 @@ jobs:
           name: Deploy releases
           command: |
             VERSION=v`jq -r '.version' package.json`
-            VERSION_TAG=$([ "${CIRCLE_BRANCH}" == "master" ] && echo "${VERSION}" || echo "${VERSION}-rc")
             TAG=$([ "${CIRCLE_BRANCH}" == "master" ] && echo "latest" || echo "nightly")
             
             RELEASE_OPTS=""
             if [ "${CIRCLE_BRANCH}" != "master" ]; then
-
-              if git tag -l | grep -q "^${VERSION}$"
-              then
-                echo "Warning: Found production tag. Please update the version on package.json."
-                exit 1
-              fi
-
-              git tag --delete "${VERSION_TAG}" || true
-              git push --delete origin "${VERSION_TAG}" || true
-              github-release delete -u FCP-INDI -r C-PAC_GUI --tag "${VERSION_TAG}" || true
               RELEASE_OPTS="--pre-release"
             fi
 
@@ -129,17 +118,18 @@ jobs:
             zip -r /tmp/c-pac_gui-${VERSION_TAG}-browser.zip .
             cd -
 
-            git tag "${VERSION_TAG}"
             git tag "${TAG}"
             git push --tags
 
-            github-release release -u FCP-INDI -r C-PAC_GUI --tag "${VERSION_TAG}" --name "${VERSION_TAG}" ${RELEASE_OPTS}
-            github-release upload -u FCP-INDI -r C-PAC_GUI --tag "${VERSION_TAG}" --name "c-pac_gui-${VERSION_TAG}-linux-amd64.deb" --file /tmp/workspace/dist-linux/c-pac_gui_*_amd64.deb
-            github-release upload -u FCP-INDI -r C-PAC_GUI --tag "${VERSION_TAG}" --name "c-pac_gui-${VERSION_TAG}-linux-amd64.snap" --file /tmp/workspace/dist-linux/c-pac_gui_*_amd64.snap
-            github-release upload -u FCP-INDI -r C-PAC_GUI --tag "${VERSION_TAG}" --name "c-pac_gui-${VERSION_TAG}-linux-amd64.tar.gz" --file /tmp/workspace/dist-linux/c-pac_gui-*.tar.gz
-            github-release upload -u FCP-INDI -r C-PAC_GUI --tag "${VERSION_TAG}" --name "c-pac_gui-${VERSION_TAG}-osx-amd64.dmg" --file /tmp/workspace/dist-macos/C-PAC-*.dmg
-            github-release upload -u FCP-INDI -r C-PAC_GUI --tag "${VERSION_TAG}" --name "c-pac_gui-${VERSION_TAG}-osx-amd64.zip" --file /tmp/workspace/dist-macos/C-PAC-*-mac.zip
-            github-release upload -u FCP-INDI -r C-PAC_GUI --tag "${VERSION_TAG}" --name "c-pac_gui-${VERSION_TAG}-browser.zip" --file /tmp/c-pac_gui-*-browser.zip
+            if [ "${CIRCLE_BRANCH}" == "master" ]; then
+              github-release release -u FCP-INDI -r C-PAC_GUI --tag "${VERSION}" --name "${VERSION}" ${RELEASE_OPTS}
+              github-release upload -u FCP-INDI -r C-PAC_GUI --tag "${VERSION}" --name "c-pac_gui-${VERSION}-linux-amd64.deb" --file /tmp/workspace/dist-linux/c-pac_gui_*_amd64.deb
+              github-release upload -u FCP-INDI -r C-PAC_GUI --tag "${VERSION}" --name "c-pac_gui-${VERSION}-linux-amd64.snap" --file /tmp/workspace/dist-linux/c-pac_gui_*_amd64.snap
+              github-release upload -u FCP-INDI -r C-PAC_GUI --tag "${VERSION}" --name "c-pac_gui-${VERSION}-linux-amd64.tar.gz" --file /tmp/workspace/dist-linux/c-pac_gui-*.tar.gz
+              github-release upload -u FCP-INDI -r C-PAC_GUI --tag "${VERSION}" --name "c-pac_gui-${VERSION}-osx-amd64.dmg" --file /tmp/workspace/dist-macos/C-PAC-*.dmg
+              github-release upload -u FCP-INDI -r C-PAC_GUI --tag "${VERSION}" --name "c-pac_gui-${VERSION}-osx-amd64.zip" --file /tmp/workspace/dist-macos/C-PAC-*-mac.zip
+              github-release upload -u FCP-INDI -r C-PAC_GUI --tag "${VERSION}" --name "c-pac_gui-${VERSION}-browser.zip" --file /tmp/c-pac_gui-*-browser.zip
+            fi
             
             github-release release -u FCP-INDI -r C-PAC_GUI --tag "${TAG}" --name "${TAG}" ${RELEASE_OPTS}
             github-release upload -u FCP-INDI -r C-PAC_GUI --tag "${TAG}" --name "c-pac_gui-${TAG}-linux-amd64.deb" --file /tmp/workspace/dist-linux/c-pac_gui_*_amd64.deb
@@ -167,18 +157,17 @@ jobs:
           name: Deploy web-version
           command: |
             VERSION=v`jq -r '.version' package.json`
-            VERSION_TAG=$([ "${CIRCLE_BRANCH}" == "master" ] && echo "${VERSION}" || echo "${VERSION}-rc")
             TAG=$([ "${CIRCLE_BRANCH}" == "master" ] && echo "latest" || echo "nightly")
             
             git clone --single-branch --branch gh-pages [email protected]:FCP-INDI/C-PAC_GUI.git /tmp/repo
             cd /tmp/repo
 
-            rm -Rf /tmp/repo/versions/${VERSION_TAG} 2> /dev/null | true
-            mkdir -p /tmp/repo/versions/${VERSION_TAG}
-            cp -Rf /tmp/workspace/dist-web-browser /tmp/repo/versions/${VERSION_TAG}/browser
-            cp -Rf /tmp/workspace/dist-web-electron /tmp/repo/versions/${VERSION_TAG}/electron
-
             if [ "${CIRCLE_BRANCH}" == "master" ]; then
+              rm -Rf /tmp/repo/versions/${VERSION} 2> /dev/null | true
+              mkdir -p /tmp/repo/versions/${VERSION}
+              cp -Rf /tmp/workspace/dist-web-browser /tmp/repo/versions/${VERSION}/browser
+              cp -Rf /tmp/workspace/dist-web-electron /tmp/repo/versions/${VERSION}/electron
+
               find . -maxdepth 1 ! -name '.git' ! -name 'versions' ! -name 'versions.txt' ! -name '.' -delete
               cp -Rf /tmp/workspace/dist-web-browser/* /tmp/repo
             fi

diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/yarn.lock b/app/yarn.lock
diff --git a/c-pac/package.json b/c-pac/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@internal/c-pac",
-  "version": "0.0.2",
+  "version": "0.0.0",
   "license": "MIT",
   "main": "index.js",
   "dependencies": {

diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "description": "Configurable Pipeline for the Analysis of Connectomes",
   "homepage": "https://github.com/FCP-INDI/C-PAC_GUI",
   "productName": "C-PAC",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "scripts": {
     "build-dll": "cross-env NODE_ENV=development node --trace-warnings -r @babel/register ./node_modules/webpack/bin/webpack --mode development --config config/webpack.config.renderer.dev.dll.js --colors",
     "build:electron": "cross-env node --trace-warnings -r @babel/register ./node_modules/webpack/bin/webpack --mode production --config config/webpack.config.main.prod.js --colors",