From 4fbe1b5fd71725e2843fe519d108b7f84510fc30 Mon Sep 17 00:00:00 2001 From: Sohrab Behdani Date: Mon, 17 Feb 2025 01:30:49 +0330 Subject: [PATCH 01/11] Removed systemd-boot --- .forgejo/workflows/build.yaml | 50 +++++++++++++++++++++++++++++++++++ iso/packages.x86_64 | 4 +-- iso/pacman.conf | 4 +-- 3 files changed, 54 insertions(+), 4 deletions(-) create mode 100644 .forgejo/workflows/build.yaml diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml new file mode 100644 index 0000000..8755d41 --- /dev/null +++ b/.forgejo/workflows/build.yaml @@ -0,0 +1,50 @@ +name: Build and Deploy ISO +on: + release: + types: [published] + +jobs: + build_iso: + runs-on: ubuntu-latest + container: + image: archlinux/archlinux:base-devel + privileged: true + + env: + Desktop: "plasma" + steps: + - name: Install Node.js + run: pacman -Sy --noconfirm nodejs npm git sudo + - name: Checkout code + uses: actions/checkout@v4 + - name: Update system + run: pacman -Syyuu --noconfirm + - name: Check user + run: whoami + - name: Build ISO + run: | + sudo ./build.sh + echo "Renaming the output ISO file" + mv out/*.iso out/ParchLinux-${{ env.Desktop }}-latest.iso + echo "Generating MD5 checksum" + md5sum out/ParchLinux-${{ env.Desktop }}-latest.iso > out/md5sum.txt + echo "Build completed. Files generated:" + ls -lh out/ + - name: Setup dependencies + run: pacman -Syu --noconfirm sshpass rsync + + - name: Determine remote directory + run: | + if [[ "${{ github.event.release.tag_name }}" == *"beta"* ]]; then + echo "REMOTE_DIR=/srv/http/beta/${{ env.Desktop }}/" >> $GITHUB_ENV + else + echo "REMOTE_DIR=/srv/http/${{ env.Desktop }}/" >> $GITHUB_ENV + fi + + - name: Deploy files + env: + PASS: ${{ secrets.PASS }} + HOST: ${{ secrets.HOST }} + run: | + sshpass -p "$PASS" ssh -o StrictHostKeyChecking=no parch@$HOST "rm -rf $REMOTE_DIR && mkdir -p $REMOTE_DIR" + sshpass -p "$PASS" rsync -avz out/ParchLinux-${{ env.Desktop }}-latest.iso out/md5sum.txt parch@$HOST:$REMOTE_DIR diff --git a/iso/packages.x86_64 b/iso/packages.x86_64 index e160b38..99f2310 100644 --- a/iso/packages.x86_64 +++ b/iso/packages.x86_64 @@ -8,6 +8,7 @@ gst-plugins-good amd-ucode arch-install-scripts b43-fwcutter +broadcom-wl-dkms base base-devel bind @@ -168,7 +169,6 @@ tuba nautilus-open-in-ptyxis gnome-shell-extension-persian-calendar gnome-shell-extension-appindicator -kernel-install-mkinitcpio #videocodec jasper @@ -208,7 +208,7 @@ gnome-parch os-prober paru parch-branding -parch-pacman-systemd +parch-pacman parch-gnome-backgrounds vazirmatn-fonts hack-nerd-fonts diff --git a/iso/pacman.conf b/iso/pacman.conf index fc117c3..08403f4 100644 --- a/iso/pacman.conf +++ b/iso/pacman.conf @@ -74,7 +74,7 @@ LocalFileSigLevel = Optional [ppr] SigLevel = Optional TrustedOnly -Server = https://git.parchlinux.com/repo/ppr/-/raw/main/x86_64/ +Server = https://git.parchlinux.com/repos/ppr/raw/branch/main/x86_64/ [core] Include = /etc/pacman.d/mirrorlist @@ -96,7 +96,7 @@ Include = /etc/pacman.d/mirrorlist [pcp] SigLevel = Optional TrustedOnly -Server = https://git.parchlinux.com/repo/pcp/-/raw/main/x86_64/ +Server = https://git.parchlinux.com/repos/pcp/raw/branch/main/x86_64/ # An example of a custom package repository. See the pacman manpage for From 1f438a52ef7aa83e64dbb03e6aeaeaa5b22d531d Mon Sep 17 00:00:00 2001 From: Sohrab Behdani Date: Mon, 17 Feb 2025 01:33:57 +0330 Subject: [PATCH 02/11] fixed workflow --- .forgejo/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 8755d41..f9c14c4 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -11,7 +11,7 @@ jobs: privileged: true env: - Desktop: "plasma" + Desktop: "gnome" steps: - name: Install Node.js run: pacman -Sy --noconfirm nodejs npm git sudo From 8465e1b7f810da4fc4f01f92136668be7ec781e3 Mon Sep 17 00:00:00 2001 From: Sohrab Behdani Date: Mon, 17 Feb 2025 01:36:32 +0330 Subject: [PATCH 03/11] fixed build.sh --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index ae91d1f..b018801 100755 --- a/build.sh +++ b/build.sh @@ -45,7 +45,7 @@ main() { install() { set -e 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 + wget https://git.parchlinux.com/repos/ppr/raw/branch/main/x86_64/archiso-99-1-any.pkg.tar.zst sudo pacman -U archiso-99-1-any.pkg.tar.zst --noconfirm } From fd85e8cb657105291a078ffea80b61944399bb00 Mon Sep 17 00:00:00 2001 From: Sohrab Behdani Date: Mon, 24 Feb 2025 22:33:24 +0330 Subject: [PATCH 04/11] added parch-grub --- iso/packages.x86_64 | 1 + 1 file changed, 1 insertion(+) diff --git a/iso/packages.x86_64 b/iso/packages.x86_64 index 99f2310..77fa04c 100644 --- a/iso/packages.x86_64 +++ b/iso/packages.x86_64 @@ -207,6 +207,7 @@ gnome-initial-setup gnome-parch os-prober paru +parch-grub parch-branding parch-pacman parch-gnome-backgrounds From 4d4e0e66753454326d3f690f93d047f4fc2ab04b Mon Sep 17 00:00:00 2001 From: Sohrab Behdani Date: Mon, 24 Feb 2025 22:45:24 +0330 Subject: [PATCH 05/11] added parch-grub --- .forgejo/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index f9c14c4..af63c7d 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -14,7 +14,7 @@ jobs: Desktop: "gnome" steps: - name: Install Node.js - run: pacman -Sy --noconfirm nodejs npm git sudo + run: pacman -Syyu --noconfirm nodejs npm git sudo - name: Checkout code uses: actions/checkout@v4 - name: Update system From 9116c823bdc02e37875bd3e4dba1ad10856474fe Mon Sep 17 00:00:00 2001 From: Sohrab Behdani Date: Mon, 3 Mar 2025 13:18:04 +0330 Subject: [PATCH 06/11] Added pipewire-alsa --- iso/packages.x86_64 | 1 + 1 file changed, 1 insertion(+) diff --git a/iso/packages.x86_64 b/iso/packages.x86_64 index 77fa04c..c4eba8b 100644 --- a/iso/packages.x86_64 +++ b/iso/packages.x86_64 @@ -1,6 +1,7 @@ alsa-utils pipewire pipewire-pulse +pipewire-alsa ttf-apple-emoji gstreamer-vaapi gst-plugin-pipewire From 8817357a20840c4802f8c73179ea2136687923c0 Mon Sep 17 00:00:00 2001 From: Sohrab Behdani Date: Wed, 26 Mar 2025 16:59:46 +0330 Subject: [PATCH 07/11] Added Keyring --- iso/packages.x86_64 | 1 + 1 file changed, 1 insertion(+) diff --git a/iso/packages.x86_64 b/iso/packages.x86_64 index c4eba8b..94382a1 100644 --- a/iso/packages.x86_64 +++ b/iso/packages.x86_64 @@ -138,6 +138,7 @@ openssl bluez bluez-utils parch-bluetooth +parchlinux-keyring #Desktop firefox From 46f48e27f0d1020bc0f5e439c20808414b42fa2d Mon Sep 17 00:00:00 2001 From: Sohrab Behdani Date: Wed, 2 Apr 2025 17:17:43 +0330 Subject: [PATCH 08/11] fixed keyring on build --- iso/pacman.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/iso/pacman.conf b/iso/pacman.conf index 08403f4..b9f7b47 100644 --- a/iso/pacman.conf +++ b/iso/pacman.conf @@ -73,7 +73,7 @@ LocalFileSigLevel = Optional #Include = /etc/pacman.d/mirrorlist [ppr] -SigLevel = Optional TrustedOnly +SigLevel = Never Server = https://git.parchlinux.com/repos/ppr/raw/branch/main/x86_64/ [core] @@ -95,7 +95,7 @@ Include = /etc/pacman.d/mirrorlist #Include = /etc/pacman.d/mirrorlist [pcp] -SigLevel = Optional TrustedOnly +SigLevel = Never Server = https://git.parchlinux.com/repos/pcp/raw/branch/main/x86_64/ From 662e7aeaa7f21fbbc3d39b9ba81474d4702571f6 Mon Sep 17 00:00:00 2001 From: Sohrab Behdani Date: Wed, 2 Apr 2025 17:19:57 +0330 Subject: [PATCH 09/11] removed useless packages --- iso/packages.x86_64 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/iso/packages.x86_64 b/iso/packages.x86_64 index 94382a1..b5ac413 100644 --- a/iso/packages.x86_64 +++ b/iso/packages.x86_64 @@ -214,8 +214,7 @@ parch-branding parch-pacman parch-gnome-backgrounds vazirmatn-fonts -hack-nerd-fonts -parch-emoji-ios +parch-emoji-ios-estedad sof-firmware text-engine extension-manager From 30eff9174670e595d7a3419b327262e7e90b1c80 Mon Sep 17 00:00:00 2001 From: Sohrab Behdani Date: Wed, 2 Apr 2025 17:53:46 +0330 Subject: [PATCH 10/11] estedad --- iso/packages.x86_64 | 2 -- 1 file changed, 2 deletions(-) diff --git a/iso/packages.x86_64 b/iso/packages.x86_64 index b5ac413..b255ccf 100644 --- a/iso/packages.x86_64 +++ b/iso/packages.x86_64 @@ -32,7 +32,6 @@ edk2-shell efibootmgr espeakup ethtool -exfatprogs f2fs-tools fatresize fsarchiver @@ -213,7 +212,6 @@ parch-grub parch-branding parch-pacman parch-gnome-backgrounds -vazirmatn-fonts parch-emoji-ios-estedad sof-firmware text-engine From 082c651aef71f488b8cb1cefd4df3ae4ad9814a5 Mon Sep 17 00:00:00 2001 From: Sohrab Behdani Date: Wed, 2 Apr 2025 17:56:14 +0330 Subject: [PATCH 11/11] return of vazir --- iso/packages.x86_64 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iso/packages.x86_64 b/iso/packages.x86_64 index b255ccf..0a7b395 100644 --- a/iso/packages.x86_64 +++ b/iso/packages.x86_64 @@ -212,7 +212,7 @@ parch-grub parch-branding parch-pacman parch-gnome-backgrounds -parch-emoji-ios-estedad +parch-emoji-ios sof-firmware text-engine extension-manager