From bf6bd655b42a9fdc43657728e71401c27899ffe7 Mon Sep 17 00:00:00 2001
From: Stealth1226 <rishawniyer06@gmail.com>
Date: Tue, 31 Aug 2021 19:55:54 +0530
Subject: [PATCH 1/2] init ci

---
 .github/workflows/build.yml | 31 +++++++++++++++++++++++++++++++
 crystal/packages.x86_64     |  2 +-
 deps.sh                     |  4 ++++
 mkarchiso                   |  4 ++--
 4 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 .github/workflows/build.yml
 create mode 100644 deps.sh

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..0709a7d
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,31 @@
+name: build
+on: 
+  push:
+    branches:
+      - main
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    env: 
+       GITHUB_TOKEN: ${{ secrets.SECRET_TOKEN }}
+    container:
+      image: archlinux:base-devel
+      options: --privileged
+
+    steps:
+      - name: Build 
+        run: |
+         pacman -Syu --needed --noconfirm && pacman -S git --needed --noconfirm && git clone https://github.com/Stealth1226/iso/ && cd iso && bash deps.sh && bash build_iso.sh
+
+      - name: Get current date
+        id: date
+        run: echo "::set-output name=date::$(date +'%Y-%m-%d')"
+
+      - name: Upload 
+        uses: ncipollo/release-action@v1
+        with:
+           artifacts: "iso/*.iso"
+           token: ${{ secrets.SECRET_TOKEN }}
+           tag: ${{ steps.date.outputs.date }} 
+        
+           
diff --git a/crystal/packages.x86_64 b/crystal/packages.x86_64
index edd8486..ad4ced2 100644
--- a/crystal/packages.x86_64
+++ b/crystal/packages.x86_64
@@ -25,7 +25,7 @@ gparted
 
 # Things we're hosting
 arch-install-scripts
-amethyst
+ame
 base
 filesystem
 crystal-cli-boot
diff --git a/deps.sh b/deps.sh
new file mode 100644
index 0000000..76068c6
--- /dev/null
+++ b/deps.sh
@@ -0,0 +1,4 @@
+#! /bin/bash
+
+pacman -Syu --needed --noconfirm
+pacman -S  archiso pacman-contrib --noconfirm
diff --git a/mkarchiso b/mkarchiso
index ab920dd..fa3fbb2 100755
--- a/mkarchiso
+++ b/mkarchiso
@@ -316,9 +316,9 @@ _make_packages() {
     fi
 
     if [[ "${quiet}" = "y" ]]; then
-        pacstrap -C "${work_dir}/pacman.conf" -c -G -M -- "${airootfs_dir}" "${pkg_list[@]}" &> /dev/null
+        yes '' | pacstrap -C "${work_dir}/pacman.conf" -c -G -M -- "${airootfs_dir}" "${pkg_list[@]}" &> /dev/null
     else
-        pacstrap -C "${work_dir}/pacman.conf" -c -G -M -- "${airootfs_dir}" "${pkg_list[@]}"
+        yes '' | pacstrap -C "${work_dir}/pacman.conf" -c -G -M -- "${airootfs_dir}" "${pkg_list[@]}"
     fi
 
     if [[ -n "${gpg_key}" ]]; then

From a985bee413ce325d80e8c30eefbbcb49e9caa47e Mon Sep 17 00:00:00 2001
From: Stealth1226 <rishawniyer06@gmail.com>
Date: Wed, 1 Sep 2021 16:57:04 +0530
Subject: [PATCH 2/2] clone crystal iso repo [skip ci]

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0709a7d..9ad71d5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
       - name: Build 
         run: |
-         pacman -Syu --needed --noconfirm && pacman -S git --needed --noconfirm && git clone https://github.com/Stealth1226/iso/ && cd iso && bash deps.sh && bash build_iso.sh
+         pacman -Syu --needed --noconfirm && pacman -S git --needed --noconfirm && git clone https://github.com/crystalux-project/iso/ && cd iso && bash deps.sh && bash build_iso.sh
 
       - name: Get current date
         id: date