Merging in latest changes from master and resolved conflicts.

1 files changed, 25 insertions, 25 deletions

diff --git a/.github/workflows/iso-build.yaml b/.github/workflows/iso-build.yaml
index 6b89a50c..106bac4a 100644
--- a/.github/workflows/iso-build.yaml
+++ b/.github/workflows/iso-build.yaml
@@ -9,12 +9,12 @@ on:
       - main # In case we adopt this convention in the future
   pull_request:
     paths-ignore:
-    - 'docs/**'
-    - '**.editorconfig'
-    - '**.gitignore'
-    - '**.md'
-    - 'LICENSE'
-    - 'PKGBUILD'
+      - 'docs/**'
+      - '**.editorconfig'
+      - '**.gitignore'
+      - '**.md'
+      - 'LICENSE'
+      - 'PKGBUILD'
 
 jobs:
   build:
@@ -23,22 +23,22 @@ jobs:
       image: archlinux:latest
       options: --privileged
     steps:
-    - uses: actions/checkout@v2
-    - run: pwd
-    - 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" > /tmp/archlive/airootfs/root/.zprofile
-    - run: echo "echo \"This is an unofficial ISO for 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 
-    - run: find /tmp/archlive
-    - run: cd /tmp/archlive;  mkarchiso -v -w work/ -o out/ ./
-    - uses: actions/upload-artifact@v2
-      with:
-        name: Arch Live ISO
-        path: /tmp/archlive/out/*.iso
+      - uses: actions/checkout@v2
+      - run: pwd
+      - 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" > /tmp/archlive/airootfs/root/.zprofile
+      - run: echo "echo \"This is an unofficial ISO for 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
+      - run: find /tmp/archlive
+      - run: cd /tmp/archlive;  mkarchiso -v -w work/ -o out/ ./
+      - uses: actions/upload-artifact@v2
+        with:
+          name: Arch Live ISO
+          path: /tmp/archlive/out/*.iso