Skip to content

Commit 89ffe67

Browse files
bootstrap: skip unsupported cpu for software installed on github
1 parent c8724de commit 89ffe67

4 files changed

Lines changed: 7 additions & 1 deletion

File tree

.github/workflows/bootstrap_on_archlinux.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ jobs:
4343
echo "BOOTSTRAP_SKIP_APPS_DESKTOP_ENVIRONMENT_INSTALL=0" >> "$GITHUB_ENV"
4444
echo "BOOTSTRAP_SKIP_BROWSER_EXTENSION_SETUP=0" >> "$GITHUB_ENV"
4545
echo "BOOTSTRAP_SKIP_OS_SOFTWARE_UPDATE_SETUP=0" >> "$GITHUB_ENV"
46+
echo "BOOTSTRAP_SKIP_UNSUPPORTED_CPU_SETUP=0" >> "$GITHUB_ENV"
4647
- name: Bootstrap machine
4748
if: contains(inputs.bootstrap_type, 'machine')
4849
run: bash bootstrap.sh -d -b machine -s ${{ inputs.user_profile }}

.github/workflows/bootstrap_on_fedora.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ jobs:
5858
echo "BOOTSTRAP_SKIP_APPS_GUI_INSTALL=0" >> "$GITHUB_ENV"
5959
echo "BOOTSTRAP_SKIP_APPS_DESKTOP_ENVIRONMENT_INSTALL=0" >> "$GITHUB_ENV"
6060
echo "BOOTSTRAP_SKIP_BROWSER_EXTENSION_SETUP=0" >> "$GITHUB_ENV"
61+
echo "BOOTSTRAP_SKIP_UNSUPPORTED_CPU_SETUP=0" >> "$GITHUB_ENV"
6162
- name: Bootstrap machine
6263
if: contains(inputs.bootstrap_type, 'machine')
6364
run: bash bootstrap.sh -d -b machine -s ${{ inputs.user_profile }}

.github/workflows/bootstrap_on_macos.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ jobs:
3434
echo "BOOTSTRAP_SKIP_APPS_DESKTOP_ENVIRONMENT_INSTALL=0" >> "$GITHUB_ENV"
3535
echo "BOOTSTRAP_SKIP_TIMEMACHINE_SETUP=0" >> "$GITHUB_ENV"
3636
echo "BOOTSTRAP_SKIP_BROWSER_EXTENSION_SETUP=0" >> "$GITHUB_ENV"
37+
echo "BOOTSTRAP_SKIP_UNSUPPORTED_CPU_SETUP=0" >> "$GITHUB_ENV"
3738
- name: Bootstrap machine
3839
if: contains(inputs.bootstrap_type, 'machine')
3940
run: bash bootstrap.sh -d -b machine -s ${{ inputs.user_profile }}

install/bootstrap_apps_cli.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,10 @@ if is_profile_admin_or_similar; then
365365
is_macos && homebrew_brew_install "virt-manager" # QEMU Manager
366366
is_fedora && fedora_dnf_install "virt-manager"
367367
is_archl && archlinux_pacman_install "virt-manager"
368-
is_macos && homebrew_brew_install "multipass" # Ubuntu's multipass
368+
if ! test "$BOOTSTRAP_SKIP_UNSUPPORTED_CPU_SETUP" = "0"
369+
then
370+
is_macos && homebrew_brew_install "multipass" # Ubuntu's multipass
371+
fi
369372

370373
# ISO
371374
homebrew_brew_install "xorriso" # ISO9660+RR manipulation tool to kickstart a fedora vm with virt-install

0 commit comments

Comments
 (0)