From dd4ae277b1ec304dd669b7645a0d337615ba1acf Mon Sep 17 00:00:00 2001
From: grossmj <grossmj@gns3.net>
Date: Mon, 28 Jan 2019 15:56:48 +0800
Subject: [PATCH] Prepare for first 2.2 alpha release.

---
 .circleci/config.yml | 72 ++++++++++++++++++++++----------------------
 scripts/welcome.py   |  4 +--
 2 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b5e9d8bd..861b9dac 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -105,20 +105,20 @@ jobs:
                 git checkout bionic-stable
               fi
             "
-#      - run:
-#          name: Release VirtualBox VM
-#          command: |
-#            source env_vars
-#            ssh root@${DEVICE_IP} "
-#              set -e
-#
-#              cd gns3-vm
-#
-#              if [ ! -e \"GNS3 VM VirtualBox ${GNS3_NUMBER}.zip\" ];
-#              then
-#                ./release_virtualbox.sh ${GNS3_VERSION}
-#              fi
-#            "
+      - run:
+          name: Release VirtualBox VM
+          command: |
+            source env_vars
+            ssh root@${DEVICE_IP} "
+              set -e
+
+              cd gns3-vm
+
+              if [ ! -e \"GNS3 VM VirtualBox ${GNS3_NUMBER}.zip\" ];
+              then
+                ./release_virtualbox.sh ${GNS3_VERSION}
+              fi
+            "
       - run:
           name: Release VMWare VM
           command: |
@@ -130,26 +130,26 @@ jobs:
 
               if [ ! -e \"GNS3 VM VMware Workstation ${GNS3_NUMBER}.zip\" ];
               then
-                ./vmware.sh
-                ./release_vmware.sh ${GNS3_VERSION} GNS3VM.VMware.dev.zip
+                #./vmware.sh
+                ./release_vmware.sh ${GNS3_VERSION} # GNS3VM.VMware.dev.zip
+              fi
+            "
+      - run:
+          name: Release VMWare ESXI VM
+          command: |
+            source env_vars
+            ssh root@${DEVICE_IP} "
+              set -e
+
+              cd gns3-vm
+
+              cp \"GNS3 VM VMware Workstation ${GNS3_NUMBER}.zip\" /tmp/GNS3VM.VMware.${GNS3_NUMBER}.zip
+
+              if [ ! -e \"GNS3 VM VMware ESXI ${GNS3_NUMBER}.zip\" ];
+              then
+                ./release_vmware_esxi.sh ${GNS3_VERSION}
               fi
             "
-#      - run:
-#          name: Release VMWare ESXI VM
-#          command: |
-#            source env_vars
-#            ssh root@${DEVICE_IP} "
-#              set -e
-#
-#              cd gns3-vm
-#
-#              cp \"GNS3 VM VMware Workstation ${GNS3_NUMBER}.zip\" /tmp/GNS3VM.VMware.${GNS3_NUMBER}.zip
-#
-#              if [ ! -e \"GNS3 VM VMware ESXI ${GNS3_NUMBER}.zip\" ];
-#              then
-#                ./release_vmware_esxi.sh ${GNS3_VERSION}
-#              fi
-#            "
       - run:
           name: Gather arifacts from device
           command: |
@@ -171,15 +171,15 @@ jobs:
             cd gns3-build
             pip3 install -r requirements.txt
             cd ..
-            #python3 gns3-build/upload.py ${CIRCLE_TAG} artifacts/GNS3\ VM\ VirtualBox\ *.zip
+            python3 gns3-build/upload.py ${CIRCLE_TAG} artifacts/GNS3\ VM\ VirtualBox\ *.zip
             python3 gns3-build/upload.py ${CIRCLE_TAG} artifacts/GNS3\ VM\ VMware\ Workstation\ *.zip
-            #python3 gns3-build/upload.py ${CIRCLE_TAG} artifacts/GNS3\ VM\ VMware\ ESXI\ *.zip
+            python3 gns3-build/upload.py ${CIRCLE_TAG} artifacts/GNS3\ VM\ VMware\ ESXI\ *.zip
             echo "Deploying on SourceForge"
             ssh-keyscan -H frs.sourceforge.net >> ~/.ssh/known_hosts
             mkdir -p artifacts/release
-            #cp artifacts/GNS3\ VM\ VirtualBox\ *.zip artifacts/release/GNS3.VM.VirtualBox.${CIRCLE_TAG}.zip
+            cp artifacts/GNS3\ VM\ VirtualBox\ *.zip artifacts/release/GNS3.VM.VirtualBox.${CIRCLE_TAG}.zip
             cp artifacts/GNS3\ VM\ VMware\ Workstation\ *.zip artifacts/release/GNS3.VM.VMware.Workstation.${CIRCLE_TAG}.zip
-            #cp artifacts/GNS3\ VM\ VMware\ ESXI\ *.zip artifacts/release/GNS3.VM.VMware.ESXI.${CIRCLE_TAG}.zip
+            cp artifacts/GNS3\ VM\ VMware\ ESXI\ *.zip artifacts/release/GNS3.VM.VMware.ESXI.${CIRCLE_TAG}.zip
             scp artifacts/release/* gns3build@frs.sourceforge.net:"/home/frs/project/gns-3/Releases/${CIRCLE_TAG}/"
 
       - store_artifacts:
diff --git a/scripts/welcome.py b/scripts/welcome.py
index 7037650c..6343fb61 100644
--- a/scripts/welcome.py
+++ b/scripts/welcome.py
@@ -230,11 +230,13 @@ def vm_information():
         content += "The GNS3 server is not installed, please manually install it or download a pre-installed VM.\n\n"
     else:
         content = """GNS3 server version: {gns3_version}
+Release channel: {release_channel}
 VM version: {gns3vm_version}
 Ubuntu version: {ubuntu_version}
 Qemu version: {qemu_version}
 KVM support available: {kvm}\n\n""".format(
             gns3vm_version=gns3vm_version(),
+            release_channel=get_release_channel(),
             gns3_version=version,
             ubuntu_version=ubuntu_version(),
             qemu_version=qemu_version(),
@@ -246,8 +248,6 @@ def vm_information():
     else:
         content += "eth0 is not configured. Please manually configure by selecting the 'Network' entry in the menu."
 
-    content += "\n\nRelease channel: " + get_release_channel()
-
     try:
         d.msgbox(content)
     except: