Do some better linting (#13)
* Do some better linting * Update names, Packer version, and more * Do not lint on push * More linting and scripting * Cleanup shellcheck lint * Add Packer format check * Fix Packer formatting * Limit to only one * Remove generated HCL files * Only lint checked files * Use pipes instead * Improve attempt to build Actually go back to attempting to build boxes on GitHub. Maybe it will work better with this structure * Change to using environment files * Initialize plugins, first * More verbose usage of the file * Do the output properly this time * PACKER_LOG set to 1 * No need for python3 anymore * Limit to only one result * Choose a specific CPU model * Init separately * Update actions version * Add version outputting * Correct actions version * Try to execute qemu properly * Fix CPU model name * Do not over-subscribe GitHub runners * Try type instead of command to guard runs * Do not write to non-existent folder * Cache packer plugins * Use ~ instead of /home/greg * Try the proper path * Move to intelligent matrix * Set global env path * Add lots of waits for VBoxManage on hosted runners * Add more waits * Add more waits
This commit is contained in:
+5
-5
@@ -13,15 +13,15 @@ if [ ! -e /etc/fedora-release ]; then
|
||||
fi
|
||||
|
||||
# In CentOS 7, blkid returns duplicate devices
|
||||
swap_device_uuid=`sudo /sbin/blkid -t TYPE=swap -o value -s UUID | uniq`
|
||||
swap_device_label=`sudo /sbin/blkid -t TYPE=swap -o value -s LABEL | uniq`
|
||||
swap_device_uuid=$(sudo /sbin/blkid -t TYPE=swap -o value -s UUID | uniq)
|
||||
swap_device_label=$(sudo /sbin/blkid -t TYPE=swap -o value -s LABEL | uniq)
|
||||
if [ -n "$swap_device_uuid" ]; then
|
||||
swap_device=`readlink -f /dev/disk/by-uuid/"$swap_device_uuid"`
|
||||
swap_device=$(readlink -f /dev/disk/by-uuid/"$swap_device_uuid")
|
||||
elif [ -n "$swap_device_label" ]; then
|
||||
swap_device=`readlink -f /dev/disk/by-label/"$swap_device_label"`
|
||||
swap_device=$(readlink -f /dev/disk/by-label/"$swap_device_label")
|
||||
fi
|
||||
|
||||
if [ ! -z "${swap_device}" -a -e "${swap_device}" ]; then
|
||||
if [ -n "${swap_device}" ] && [ -e "${swap_device}" ]; then
|
||||
sudo /sbin/swapoff "$swap_device"
|
||||
sudo dd if=/dev/zero of="$swap_device" bs=1M || :
|
||||
sudo /sbin/mkswap ${swap_device_label:+-L "$swap_device_label"} ${swap_device_uuid:+-U "$swap_device_uuid"} "$swap_device"
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
set -ex
|
||||
|
||||
# Configure vagrant user's SSH key
|
||||
# shellcheck disable=SC2174
|
||||
mkdir -m 0700 -p ~vagrant/.ssh
|
||||
curl -L -o ~vagrant/.ssh/authorized_keys "https://raw.githubusercontent.com/hashicorp/vagrant/master/keys/vagrant.pub"
|
||||
chmod 600 ~vagrant/.ssh/authorized_keys
|
||||
|
||||
Reference in New Issue
Block a user