From 515c341bb1b167d633f574aa5f967c5495ebce8a Mon Sep 17 00:00:00 2001 From: "K.B.Dharun Krishna" Date: Sun, 28 Jul 2024 17:16:46 +0530 Subject: [PATCH] cleanup: update files Signed-off-by: K.B.Dharun Krishna --- .gitattributes | 1 + .github/FUNDING.yml | 4 --- .github/dependabot.yml | 2 +- .github/workflows/orchid.yml | 4 +-- .gitignore | 2 +- BACKERS.md | 20 +++++++++----- LICENSE => LICENSE.txt | 0 README.md | 51 +++++++++++++++--------------------- etc/terraform.conf | 2 +- 9 files changed, 41 insertions(+), 45 deletions(-) create mode 100644 .gitattributes delete mode 100644 .github/FUNDING.yml rename LICENSE => LICENSE.txt (100%) diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..6313b56c --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text=auto eol=lf diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index 25a690f3..00000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1,4 +0,0 @@ -# These are supported funding model platforms - -github: vanilla-os -liberapay: fabricators diff --git a/.github/dependabot.yml b/.github/dependabot.yml index bc63aca3..b18fd293 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -3,4 +3,4 @@ updates: - package-ecosystem: 'github-actions' directory: '/' schedule: - interval: 'monthly' + interval: 'weekly' diff --git a/.github/workflows/orchid.yml b/.github/workflows/orchid.yml index af0ea5c1..376a4ee5 100644 --- a/.github/workflows/orchid.yml +++ b/.github/workflows/orchid.yml @@ -1,4 +1,4 @@ -name: VanillaOS orchid +name: Build ISO on: workflow_dispatch: @@ -32,5 +32,5 @@ jobs: - uses: actions/upload-artifact@v4 with: - name: VanillaOS 2 Beta ${{ env.CURRENT_DATE }} ${{ github.run_number }} + name: VanillaOS 2 Orchid ${{ env.CURRENT_DATE }} path: builds/ diff --git a/.gitignore b/.gitignore index 52e3d408..30b99ab6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ builds/ -tmp/ \ No newline at end of file +tmp/ diff --git a/BACKERS.md b/BACKERS.md index 3c736667..a2ef1fd4 100644 --- a/BACKERS.md +++ b/BACKERS.md @@ -1,19 +1,27 @@ -🏆 Platinum Sponsor\ +# Backers + +## 🏆 Platinum Sponsor + [Be the first!](https://github.com/sponsors/Vanilla-OS) -🥇 Gold Sponsor\ +## 🥇 Gold Sponsor + [Be the first!](https://github.com/sponsors/Vanilla-OS) -🥈 Silver Sponsor\ +## 🥈 Silver Sponsor + [Be the first!](https://github.com/sponsors/Vanilla-OS) -🥉 Bronze Sponsors\ +## 🥉 Bronze Sponsors + [Be the first!](https://github.com/sponsors/Vanilla-OS) -🍺 Generous Backers\ +## 🍺 Generous Backers + - [quentincaffeino](https://github.com/quentincaffeino) -☕️ Backer +## ☕️ Backer + - [thunlix](https://github.com/thunlix) - [purplehepatica](https://github.com/purplehepatica) - [omegaleo](https://github.com/omegaleo) diff --git a/LICENSE b/LICENSE.txt similarity index 100% rename from LICENSE rename to LICENSE.txt diff --git a/README.md b/README.md index e521653c..7d525786 100644 --- a/README.md +++ b/README.md @@ -1,47 +1,38 @@
-## ISO Builder +## Vanilla OS Live ISO Builder -This ISO builder was basically a combination of previous efforts from Ubuntu +Get the latest Vanilla OS ISOs from the [Releases page](https://github.com/Vanilla-OS/live-iso/releases). + +--- + +This ISO builder is a combination of previous efforts from Ubuntu Budgie (budgie-remix at the time), some stuff from livecd-rootfs from launchpad and Elementary OS, thanks to the amazing devs from all around! Elem Link: https://github.com/elementary/os ------------- -
-> Releases usually follows the Ubuntu release cycle i.e. `22.10, 23.04..`. Releases named `22.10-r1` means that the release is still 22.10 with just a refreshed of the repositories and packages, this is meant to help users getting the latest release with updated packages, with more fixes and features OTB. - -## Why not just fork from livecd-rootfs? - -The Ubuntu ISO's are built with ubuntu-cdimage scripts and with livecd-rootfs, -but it has a lot of extra scripts that are hard to navigate all at once unless -you have previous experience and is a bottomless well of asterisks attached to it. -It's better to get something not perfect, but close enough. +--- ## Building Locally -As UCR is built with the Debian version of `live-build`, not the Ubuntu patched version, it's easiest to build an iso in a vanilla-pico VM or container. This prevents messing up your host system too. - -The following example uses Docker and assumes you have Docker correctly installed and set up: - - 1) Clone this project & `cd` into it: +1.) Clone this project & `cd` into it: - ``` - git clone https://github.com/Vanilla-OS/live-iso.git && cd live-iso - ``` +```sh +git clone https://github.com/Vanilla-OS/live-iso.git && cd live-iso +``` - 2) Configure the channel in the `etc/terraform.conf` (unstable, all). +2.) Configure the channel in the `etc/terraform.conf` (unstable, all). - 3) Run the build: +3.) Run the build: - ``` - docker run --privileged -i -v /proc:/proc \ - -v ${PWD}:/working_dir \ - -w /working_dir \ - ghcr.io/vanilla-os/pico:main \ - /bin/bash -s etc/terraform.conf < build.sh - ``` +```sh +docker run --privileged -i -v /proc:/proc \ + -v ${PWD}:/working_dir \ + -w /working_dir \ + ghcr.io/vanilla-os/pico:main \ + /bin/bash -s etc/terraform.conf < build.sh + ``` - 4) When done, your image will be in the `builds` folder. +4.) When done, your image will be in the `builds` folder. diff --git a/etc/terraform.conf b/etc/terraform.conf index 5cf7f082..2b84aefc 100644 --- a/etc/terraform.conf +++ b/etc/terraform.conf @@ -14,7 +14,7 @@ CODENAME="orchid" VERSION="2" # distribution channel -CHANNEL="testing" +CHANNEL="stable" # distribution name NAME="Vanilla OS"