From 31e6daedbea8f27ca7f0b0a22a4f26dae4d39da9 Mon Sep 17 00:00:00 2001
From: jasio <54361578+jaasio@users.noreply.github.com>
Date: Tue, 28 Jun 2022 20:13:54 +0200
Subject: [PATCH 1/8] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index e8c3f9d..413842c 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-
+
From ebc80d6050e0838cb2e96912f8549a8cb6336d97 Mon Sep 17 00:00:00 2001
From: jasio
Date: Sun, 3 Jul 2022 14:21:16 +0200
Subject: [PATCH 2/8] Update README.md
---
README.md | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index 413842c..101da98 100644
--- a/README.md
+++ b/README.md
@@ -7,9 +7,13 @@
Crystal ISO
-
-
-
+
+
+
+
+
+
+
Build or download the Arch-based Crystal Linux iso.
From 883009c6fd6be239ccfb68f955f8ead379087760 Mon Sep 17 00:00:00 2001
From: jasio
Date: Sat, 9 Jul 2022 19:43:13 +0200
Subject: [PATCH 3/8] plz dont build a new iso
---
README.md | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index 101da98..ccf28ab 100644
--- a/README.md
+++ b/README.md
@@ -7,13 +7,15 @@
Crystal ISO
-
+
-
-
+
+
+
+
Build or download the Arch-based Crystal Linux iso.
From 9966f21b0c43f4f7b1a01d2192674218765dbc98 Mon Sep 17 00:00:00 2001
From: Oro <93224879+orowith2os@users.noreply.github.com>
Date: Fri, 15 Jul 2022 14:02:47 -0500
Subject: [PATCH 4/8] Update README to add extra instructions
Adds instructions for building inside of distrobox, and some information about how to build with docker/podman. May need more information on how to open using bare docker/podman.
---
README.md | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/README.md b/README.md
index ccf28ab..71170b6 100644
--- a/README.md
+++ b/README.md
@@ -32,3 +32,11 @@ You will have to use Arch or Arch-Based distros to build this ISO File.
* Run `./build_iso.sh`
* If you get an error about `/tmp/` running out of space, reboot (to clear tmpfs), then re-run with a dir to use as temp (e.g. `./build_iso.sh FOOBAR`)
* If you also add a second arg as in `./build_iso.sh /some/folder testing`, you'll pull from our testing repo
+
+### How to build inside of Docker or Podman:
+* The container **MUST** be ran as root to build.
+ * Other than needing to be ran as root, it should function correctly. You may need to install a few more dependencies aside from the ones listed here.
+
+ To enter a distrobox container as root, run `distrobox enter --root boxnamehere -- bash`
+
+ (the `-- bash` is to ensure the container opens properly. Install your host shell afterwards to get it to open using your host shell.)
From 8acde60c102b2c1c00950d14a827412fe7036b3a Mon Sep 17 00:00:00 2001
From: Matt C
Date: Thu, 21 Jul 2022 08:07:38 -0400
Subject: [PATCH 5/8] Testing if workflow works with crystal docker image
---
.github/workflows/build.yml | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a90117c..a6db2c6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,13 +10,20 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.SECRET_TOKEN }}
container:
- image: archlinux:base-devel
+ image: crystallinux:crystal
options: --privileged
steps:
- name: Build
run: |
- pacman-key --init && pacman -Syu --needed --noconfirm && pacman -S --noconfirm --needed bind && nslookup repo.getcryst.al && pacman -S git archiso pacman-contrib --needed --noconfirm && git clone https://github.com/crystal-linux/iso/ && cd iso && bash build_iso.sh
+ pacman -Syu --needed --noconfirm
+ pacman -S --noconfirm --needed bind
+ nslookup repo.getcryst.al
+ pacman -S git archiso pacman-contrib --needed --noconfirm
+ git clone https://github.com/crystal-linux/iso/
+ cd iso
+ bash build_iso.sh
+
- name: Get current date
id: date
From d3217d6d07d7e4aeb41f223f85c64f37df103649 Mon Sep 17 00:00:00 2001
From: Matt C
Date: Thu, 21 Jul 2022 08:09:25 -0400
Subject: [PATCH 6/8] Grr is this all
---
.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 a6db2c6..bd2bee9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,7 +10,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.SECRET_TOKEN }}
container:
- image: crystallinux:crystal
+ image: crystallinux/crystal
options: --privileged
steps:
From 318d44d55e457a14a313d74fd68d8dc0036584a1 Mon Sep 17 00:00:00 2001
From: Matt C
Date: Thu, 21 Jul 2022 08:14:24 -0400
Subject: [PATCH 7/8] MD5SUMS go brr
---
.github/workflows/build.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bd2bee9..797116c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,6 +23,7 @@ jobs:
git clone https://github.com/crystal-linux/iso/
cd iso
bash build_iso.sh
+ md5sum *.iso > MD5SUMS
- name: Get current date
@@ -32,7 +33,7 @@ jobs:
- name: Upload
uses: ncipollo/release-action@v1
with:
- artifacts: "iso/*.iso"
+ artifacts: "iso/*.iso,iso/MD5SUMS"
token: ${{ secrets.SECRET_TOKEN }}
tag: ${{ steps.date.outputs.date }}
From d448cdf0c927b9ea74a220dff0fe35de5c5578f7 Mon Sep 17 00:00:00 2001
From: Michal
Date: Fri, 29 Jul 2022 14:25:20 +0100
Subject: [PATCH 8/8] Update packages.x86_64
---
crystal/packages.x86_64 | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/crystal/packages.x86_64 b/crystal/packages.x86_64
index cb20b60..9fe80c8 100644
--- a/crystal/packages.x86_64
+++ b/crystal/packages.x86_64
@@ -10,7 +10,6 @@ openssh
syslinux
networkmanager
zsh
-ckbcomp
curl
openbsd-netcat
memtest86+
@@ -38,7 +37,7 @@ pfetch
grub
# Our in-house
-jade_gui
+jade-gui
jade
onyx
amethyst