From 939fae0b1a10c455bdb6979c66411c7e6ad1baa6 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Tue, 27 Apr 2021 22:19:01 -0400 Subject: Include the commit SHA in the ISO Update iso-build.yaml with wording change, cat out .zprofile for debugging, and make it so workflow edits trigger builds. --- .github/workflows/iso-build.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/iso-build.yaml b/.github/workflows/iso-build.yaml index acef87fb..797629b0 100644 --- a/.github/workflows/iso-build.yaml +++ b/.github/workflows/iso-build.yaml @@ -9,7 +9,6 @@ on: - main # In case we adopt this convention in the future pull_request: paths-ignore: - - '.github/**' - 'docs/**' - '**.editorconfig' - '**.gitignore' @@ -29,7 +28,11 @@ jobs: - run: find . - run: cat /etc/os-release - run: mkdir -p /tmp/archlive/airootfs/root/archinstall-git; cp -r . /tmp/archlive/airootfs/root/archinstall-git - - run: echo "pip uninstall archinstall -y; cd archinstall-git; python setup.py install; echo 'Type python -m archinstall to launch archinstall'" > /tmp/archlive/airootfs/root/.zprofile + - run: echo "pip uninstall archinstall -y; cd archinstall-git; python setup.py install" > /tmp/archlive/airootfs/root/.zprofile + - run: echo "echo \"This is an unofficial ISO for the development and testing of archinstall. No support will be provided.\"" >> /tmp/archlive/airootfs/root/.zprofile + - run: echo "echo \"This ISO was built from Git SHA $GITHUB_SHA\"" >> /tmp/archlive/airootfs/root/.zprofile + - run: echo "echo \"Type archinstall to launch the installer.\"" >> /tmp/archlive/airootfs/root/.zprofile + - run: cat /tmp/archlive/airootfs/root/.zprofile - run: pacman -Sy; pacman --noconfirm -S git archiso - run: cp -r /usr/share/archiso/configs/releng/* /tmp/archlive - run: echo -e "git\npython\npython-pip\npython-setuptools" >> /tmp/archlive/packages.x86_64 -- cgit v1.2.3-54-g00ecf From 3961f252c87e3811561e845a9689007d17e3628e Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Wed, 28 Apr 2021 07:43:28 -0400 Subject: Allow Sway Nvidia override --- profiles/sway.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/profiles/sway.py b/profiles/sway.py index f132df33..c3a6e31a 100644 --- a/profiles/sway.py +++ b/profiles/sway.py @@ -12,7 +12,10 @@ def _prep_function(*args, **kwargs): for more input before any other installer steps start. """ if "nvidia" in _gfx_driver_packages: - raise archinstall.lib.exceptions.HardwareIncompatibilityError("Sway does not support the proprietary nvidia drivers") + choice = input("The proprietary Nvidia driver is not supported by Sway. It is likely that you will run into issues. Continue anyways? [y/N] ") + if choice.lower() in ("n", ""): + raise archinstall.lib.exceptions.HardwareIncompatibilityError("Sway does not support the proprietary nvidia drivers.") + __builtins__['_gfx_driver_packages'] = archinstall.select_driver() return True -- cgit v1.2.3-54-g00ecf