diff --git a/.github/workflows/build-utm.yml b/.github/workflows/build-utm.yml index a9391b99a..674422b10 100644 --- a/.github/workflows/build-utm.yml +++ b/.github/workflows/build-utm.yml @@ -22,33 +22,33 @@ jobs: key: rocky-iso-${{ hashFiles('setup/xvm/_common.sh','setup/xvm/download_rocky_iso.sh') }} restore-keys: | rocky-iso-${{ hashFiles('setup/xvm/_common.sh','setup/xvm/download_rocky_iso.sh') }} - # - name: Cache first stage VM - # uses: actions/cache@v4 - # with: - # path: | - # setup/xvm/output/xvm_stage1.qcow2 - # setup/xvm/output/xvm_key.pub - # setup/xvm/output/xvm_key - # setup/xvm/output/AAVMF_VARS.fd - # setup/xvm/input/firmware/AAVMF_CODE.fd - # key: xvm-stage1-${{ runner.os }}-${{ hashFiles('setup/xvm/_common.sh','setup/xvm/download_rocky_iso.sh','setup/xvm/build_vm_stage1.sh','setup/xvm/download_firmware.sh','setup/xvm/create_oemdrv.sh','setup/xvm/kickstart/ks.cfg') }} - # restore-keys: | - # xvm-stage1-${{ runner.os }}-${{ hashFiles('setup/xvm/_common.sh','setup/xvm/download_rocky_iso.sh','setup/xvm/build_vm_stage1.sh','setup/xvm/download_firmware.sh','setup/xvm/create_oemdrv.sh','setup/xvm/kickstart/ks.cfg') }} + - name: Cache first stage VM + uses: actions/cache@v4 + with: + path: | + setup/xvm/output/xvm_stage1.qcow2 + setup/xvm/output/xvm_key.pub + setup/xvm/output/xvm_key + setup/xvm/output/AAVMF_VARS.fd + setup/xvm/input/firmware/AAVMF_CODE.fd + key: xvm-stage1-${{ runner.os }}-${{ hashFiles('setup/xvm/_common.sh','setup/xvm/download_rocky_iso.sh','setup/xvm/build_vm_stage1.sh','setup/xvm/download_firmware.sh','setup/xvm/create_oemdrv.sh','setup/xvm/kickstart/ks.cfg') }} + restore-keys: | + xvm-stage1-${{ runner.os }}-${{ hashFiles('setup/xvm/_common.sh','setup/xvm/download_rocky_iso.sh','setup/xvm/build_vm_stage1.sh','setup/xvm/download_firmware.sh','setup/xvm/create_oemdrv.sh','setup/xvm/kickstart/ks.cfg') }} - name: Download Rocky ISO run: | cd $GITHUB_WORKSPACE/setup/xvm/ bash download_rocky_iso.sh - # - name: Install Homebrew - # run: | - # /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" - # - name: Install QEMU - # run: | - # sysctl machdep.cpu - # brew install qemu - # - name: Create VM and install Rocky 9 - # run: | - # cd $GITHUB_WORKSPACE/setup/xvm/ - # bash build_vm_stage1.sh + - name: Install Homebrew + run: | + /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" + - name: Install QEMU + run: | + sysctl machdep.cpu + brew install qemu + - name: Create VM and install Rocky 9 + run: | + cd $GITHUB_WORKSPACE/setup/xvm/ + bash build_vm_stage1.sh # - name: Install MagAO-X software # run: | # cd $GITHUB_WORKSPACE/setup/xvm/