From 566d6e266ad310e36d4157e4231444c5a60176c4 Mon Sep 17 00:00:00 2001 From: Oleg Kalachev Date: Wed, 15 Jun 2022 20:13:46 +0300 Subject: [PATCH] Add /etc/clover_vm_version file (#8) * Add etc assets directory * Name directory for version file `version` * Simplify * Put actual version to /etc/clover_vm_version * Fix * Fix * Fix --- assets/clover_vm_version | 1 + build.sh | 22 ++++++++++++---------- ros_ide_vm.json | 5 +++++ scripts/install_software.sh | 4 ++++ 4 files changed, 22 insertions(+), 10 deletions(-) create mode 100644 assets/clover_vm_version diff --git a/assets/clover_vm_version b/assets/clover_vm_version new file mode 100644 index 0000000..3546645 --- /dev/null +++ b/assets/clover_vm_version @@ -0,0 +1 @@ +unknown diff --git a/build.sh b/build.sh index ff4edaa..4bb9631 100755 --- a/build.sh +++ b/build.sh @@ -5,6 +5,18 @@ set -ex # FIXME: Use system Packer if possible #PACKER=$(which packer) +echo "--- Fill version asset" +# if [[ $GITHUB_REF == refs/tags/*-rc* ]]; then + # remove rc label + # VERSION=${GITHUB_REF#refs/tags/} + # VERSION=${VERSION/-rc*/} +if [[ $GITHUB_REF == refs/tags/* ]]; then + VERSION=${GITHUB_REF#refs/tags/} +else + VERSION=$(git describe --always) +fi +echo $VERSION > assets/clover_vm_version + #if [ "x${PACKER}" == "x" ]; then PACKER="./packer" if [ ! -f ${PACKER} ]; then @@ -32,16 +44,6 @@ ${PACKER} build ros_ide_vm.json echo "--- Marking the VM" -# if [[ $GITHUB_REF == refs/tags/*-rc* ]]; then - # remove rc label - # VERSION=${GITHUB_REF#refs/tags/} - # VERSION=${VERSION/-rc*/} -if [[ $GITHUB_REF == refs/tags/* ]]; then - VERSION=${GITHUB_REF#refs/tags/} -else - VERSION=$(git describe --always) -fi - VM_NAME="clover-devel_${VERSION}.ova" mv ./output-virtualbox-ovf/clover-devel.ova ./output-virtualbox-ovf/${VM_NAME} ls -l output-virtualbox-ovf diff --git a/ros_ide_vm.json b/ros_ide_vm.json index 79ceeb8..b6673c6 100644 --- a/ros_ide_vm.json +++ b/ros_ide_vm.json @@ -63,6 +63,11 @@ "source": "{{user `assetsDir`}}/patches", "destination": "/tmp" }, + { + "type": "file", + "source": "{{user `assetsDir`}}/clover_vm_version", + "destination": "/tmp/clover_vm_version" + }, { "type": "shell", "script": "scripts/install_software.sh", diff --git a/scripts/install_software.sh b/scripts/install_software.sh index adac00e..344060f 100644 --- a/scripts/install_software.sh +++ b/scripts/install_software.sh @@ -154,6 +154,10 @@ sudo -E sh -c 'hostnamectl set-hostname clover-dev; sed -i "s/ubuntu/clover-dev echo "export ROS_HOSTNAME=\`hostname\`.local" >> ${HOME}/.bashrc chmod a+x ${HOME}/Desktop/* +echo "--- Creating /etc/clover_vm_version" +sudo -E sh -c 'mv /tmp/clover_vm_version /etc/clover_vm_version' +cat /etc/clover_vm_version + echo "--- Cleaning up" sudo -E sh -c 'apt-get -y autoremove; apt-get -y autoclean; apt-get -y clean; fstrim -v /'