diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..142e8c6 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,43 @@ +stages: + - build + - deploy + +image: archlinux/archlinux:base-devel + +variables: + Desktop: "cosmic" + +build_iso: + stage: build + script: + - ./build.sh + - echo "Renaming the output ISO file" + - mv out/*.iso out/ParchLinux-$Desktop-latest.iso + - echo "Generating MD5 checksum" + - md5sum out/ParchLinux-$Desktop-latest.iso > out/md5sum.txt + - echo "Build completed. Files generated:" + - ls -lh out/ + artifacts: + paths: + - out/ParchLinux-$Desktop-latest.iso + - out/md5sum.txt + rules: + - if: $CI_COMMIT_TAG + +deploy_iso: + stage: deploy + dependencies: + - build_iso + script: + - echo "Installing sshpass and rsync" + - pacman -Syu --noconfirm sshpass rsync + - echo "Determining the remote directory based on the tag" + - if [[ "$CI_COMMIT_TAG" == *"beta"* ]]; then export REMOTE_DIR="/srv/http/beta/$Desktop/"; else export REMOTE_DIR="/srv/http/$Desktop/"; fi + - echo "Removing old ISO files from remote directory" + - sshpass -p "$PASS" ssh -o StrictHostKeyChecking=no parch@$SSH_ROOT rm -rf "$REMOTE_DIR/" + - echo "Creating new directory on remote host" + - sshpass -p "$PASS" ssh -o StrictHostKeyChecking=no parch@$SSH_ROOT mkdir -p "$REMOTE_DIR/" + - echo "Uploading new ISO via rsync" + - sshpass -p "$PASS" rsync -r out/ParchLinux-$Desktop-latest.iso out/md5sum.txt parch@$SSH_ROOT:"$REMOTE_DIR/" + rules: + - if: $CI_COMMIT_TAG diff --git a/README.md b/README.md index 0acc702..c5ee622 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,10 @@ -# Parch Linux iso template +# Parch Linux Cosmic -## Use this template for making releases \ No newline at end of file +Cosmic is a DE made by System76 in Rust and Iced. + + +Parch Linux Cosmic features Cosmic DE with a Touch of Parch Linux itself. + + +## Note: +> currently cosmic is in alpha stage and it is not fully finished, use Parch Linux Cosmic only for testing. diff --git a/build.sh b/build.sh index aa5da84..ae91d1f 100755 --- a/build.sh +++ b/build.sh @@ -33,8 +33,7 @@ main() { install echo -e "$Blue### Install complete ###$reset" echo -e "$Green### Start build $reponame with archiso ###$reset" - build - makezip + build fi else echo -e "$Red###OS can't supported###$reset" @@ -42,19 +41,19 @@ main() { fi } + install() { set -e - pacman -Sy; pacman --noconfirm -S --needed git archiso github-cli p7zip + pacman -Sy; pacman --noconfirm -S --needed git wget github-cli p7zip reflector rsync + wget https://git.parchlinux.com/repo/ppr/-/raw/main/x86_64/archiso-99-1-any.pkg.tar.zst + sudo pacman -U archiso-99-1-any.pkg.tar.zst --noconfirm } + + build() { set -e mkarchiso -v iso/ } -makezip() { - cd out - 7z -v500m a "$(ls *.iso)".zip "$(ls *.iso)" - md5sum * > md5sums.txt -} main diff --git a/iso/packages.x86_64 b/iso/packages.x86_64 index 9a3ee42..65ce6dd 100644 --- a/iso/packages.x86_64 +++ b/iso/packages.x86_64 @@ -31,7 +31,6 @@ f2fs-tools fatresize fsarchiver git -gnu-netcat gpart gpm gptfdisk @@ -93,8 +92,6 @@ python python-psutil python-systemd refind -#reflector -reiserfsprogs rp-pppoe rsync rxvt-unicode-terminfo @@ -136,26 +133,30 @@ openssl gvfs gvfs-mtp networkmanager -android-file-transfer boost sddm #Desktop -cosmic-session-git +cosmic + +#Essential Apps +nheko +firefox #systemutils btop xdg-user-dirs neofetch-git fastfetch +kernel-install-mkinitcpio #ParchLinux Core Packages parch-welcome -calamares-parch-beta -calamares-git +calamares-parch +calamares os-prober paru parch-emoji-ios -vazirmatn-fonts +ttf-vazirmatn parch-branding -parch-pacman +parch-pacman-systemd diff --git a/iso/pacman.conf b/iso/pacman.conf index 4b2730c..fc117c3 100644 --- a/iso/pacman.conf +++ b/iso/pacman.conf @@ -74,7 +74,7 @@ LocalFileSigLevel = Optional [ppr] SigLevel = Optional TrustedOnly -Server = https://raw.githubusercontent.com/parchlinux/ppr/main/x86_64/ +Server = https://git.parchlinux.com/repo/ppr/-/raw/main/x86_64/ [core] Include = /etc/pacman.d/mirrorlist @@ -96,11 +96,9 @@ Include = /etc/pacman.d/mirrorlist [pcp] SigLevel = Optional TrustedOnly -Server = https://raw.githubusercontent.com/parchlinux/pcp/main/x86_64/ +Server = https://git.parchlinux.com/repo/pcp/-/raw/main/x86_64/ + -[chaotic-aur] -SigLevel = Never -Server = https://geo-mirror.chaotic.cx/$repo/$arch # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. #[custom]