CopterExpress/clover_vm
1
0
Fork 0
mirror of https://github.com/CopterExpress/clover_vm.git synced 2026-05-26 07:07:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add /etc/clover_vm_version file (#8)

Browse Source 
* Add etc assets directory

* Name directory for version file `version`

* Simplify

* Put actual version to /etc/clover_vm_version

* Fix

* Fix

* Fix
This commit is contained in:
Oleg Kalachev
2022-06-15 20:13:46 +03:00
committed by GitHub
parent bf0aff7fd9
commit 566d6e266a
4 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
assets/clover_vm_version Normal file
View File

@@ -0,0 +1 @@
unknown

22
build.sh
View File

@@ -5,6 +5,18 @@ set -ex
# FIXME: Use system Packer if possible # FIXME: Use system Packer if possible
#PACKER=$(which packer) #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 #if [ "x${PACKER}" == "x" ]; then
PACKER="./packer" PACKER="./packer"
if [ ! -f ${PACKER} ]; then if [ ! -f ${PACKER} ]; then
@@ -32,16 +44,6 @@ ${PACKER} build ros_ide_vm.json
echo "--- Marking the VM" 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" VM_NAME="clover-devel_${VERSION}.ova"
mv ./output-virtualbox-ovf/clover-devel.ova ./output-virtualbox-ovf/${VM_NAME} mv ./output-virtualbox-ovf/clover-devel.ova ./output-virtualbox-ovf/${VM_NAME}
ls -l output-virtualbox-ovf ls -l output-virtualbox-ovf

5
ros_ide_vm.json
View File

@@ -63,6 +63,11 @@
"source": "{{user `assetsDir`}}/patches", "source": "{{user `assetsDir`}}/patches",
"destination": "/tmp" "destination": "/tmp"
}, },
{
"type": "file",
"source": "{{user `assetsDir`}}/clover_vm_version",
"destination": "/tmp/clover_vm_version"
},
{ {
"type": "shell", "type": "shell",
"script": "scripts/install_software.sh", "script": "scripts/install_software.sh",

4
scripts/install_software.sh
View File

@@ -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 echo "export ROS_HOSTNAME=\`hostname\`.local" >> ${HOME}/.bashrc
chmod a+x ${HOME}/Desktop/* 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" echo "--- Cleaning up"
sudo -E sh -c 'apt-get -y autoremove; apt-get -y autoclean; apt-get -y clean; fstrim -v /' sudo -E sh -c 'apt-get -y autoremove; apt-get -y autoclean; apt-get -y clean; fstrim -v /'