.github/workflows/release.yml

@@ -30,6 +30,10 @@ jobs:
         known_hosts: ${{ secrets.KNOWN_HOSTS }}
         if_key_exists: replace
     
+
+    - name: Update apt cache
+      run: apt-get update
+
     - name: Build Package
       run: ./main.sh
 

.github/workflows/release_i386.yml

@@ -7,7 +7,7 @@ jobs:
   build:
     runs-on: self-hosted
     container:
-      image: ubuntu:23.04
+      image: ghcr.io/pikaos-linux/pika-i386-package-container:latest
       volumes:
         - /proc:/proc
       options: --privileged -it
@@ -15,9 +15,6 @@ jobs:
     steps:
     - uses: actions/checkout@v3
   
-    - name: Install needed packages
-      run: apt update && apt install software-properties-common sudo git bc gpg gpg-agent bison build-essential ccache cpio fakeroot flex git kmod libelf-dev libncurses5-dev libssl-dev lz4 qtbase5-dev rsync schedtool wget zstd tar reprepro dpkg-sig devscripts dh-make -y
-
     - name: Import GPG key
       id: import_gpg
       uses: crazy-max/ghaction-import-gpg@v5
@@ -33,6 +30,10 @@ jobs:
         known_hosts: ${{ secrets.KNOWN_HOSTS }}
         if_key_exists: replace
     
+
+    - name: Update apt cache
+      run: apt-get update
+
     - name: Build Package
       run: ./main32.sh
 

debian/changelog

@@ -1,3 +1,9 @@
+wayland (1.22.0-99pika5) pikauwu; urgency=medium
+
+  * pikauwu
+
+ -- Ferrreo <harderthanfire@gmail.com>  Fri, 08 Jul 2022 18:26:04 +0200
+
 wayland (1.22.0-99pika4) lunar; urgency=medium
 
   * Everything is 4

hooks/01pikarepo

@@ -1,2 +0,0 @@
-#echo "deb [trusted=yes] https://ppa.pika-os.com/ lunar main" >> /etc/apt/sources.list
-apt-get update

main32.sh

@@ -1,12 +1,9 @@
-# Add dependent repositories
-sudo dpkg --add-architecture i386
-wget -q -O - https://ppa.pika-os.com/key.gpg | sudo apt-key add -
-touch /etc/apt/sources.list.d/pika.list
-echo 'deb https://ppa.pika-os.com/ lunar main' > /etc/apt/sources.list.d/pika.list
-add-apt-repository ppa:pikaos/pika
-add-apt-repository ppa:kubuntu-ppa/backports
-apt update
+#! /bin/bash
+
+DEBIAN_FRONTEND=noninteractive
+
 # Clone Upstream
+
 wget -nv https://gitlab.freedesktop.org/wayland/wayland/-/archive/1.22.0/wayland-1.22.0.tar.gz
 tar -xf ./wayland-1.22.0.tar.gz
 mv ./wayland-1.22.0.tar.gz ./wayland_1.22.0.orig.tar.gz
@@ -15,24 +12,12 @@ cp -vf ./control32 ./wayland-1.22.0/debian/control
 cd ./wayland-1.22.0/
 
 # Get build deps
-ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime
-DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata
-apt-get build-dep -y ./
-debuild -S -uc -us
-cd ../
+apt-get build-dep ./ -y
 
-apt-get install -y pbuilder debootstrap devscripts debhelper sbuild debhelper ubuntu-dev-tools piuparts
-
-apt install -y debian-archive-keyring
-cp -rvf ./pbuilderrc /etc/pbuilderrc
-mkdir -p /var/cache/pbuilder/hook.d/
-cp -rvf ./hooks/* /var/cache/pbuilder/hook.d/
-rm -rf /var/cache/apt/
-mkdir -p /pbuilder-results
-DIST=lunar ARCH=i386 pbuilder create --distribution lunar --architecture i386 --debootstrapopts --include=ca-certificates
-echo 'starting build'
-DIST=lunar ARCH=i386 pbuilder build ./*.dsc --distribution lunar --architecture i386 --debootstrapopts --include=ca-certificates
+# Build package
+dpkg-buildpackage --no-sign
 
 # Move the debs to output
+cd ../
 mkdir -p ./output
-mv /var/cache/pbuilder/result/*.deb ./output/ || sudo mv ../*.deb ./output/
+mv ./*.deb ./output/

pbuilderrc

@@ -1,6 +0,0 @@
-USENETWORK=yes
-OTHERMIRROR="deb [trusted=yes] http://ppa.pika-os.com/ lunar main"
-HOOKDIR="/var/cache/pbuilder/hook.d/"
-APTCACHEHARDLINK=no
-export DEBIAN_FRONTEND="noninteractive"
-#OTHERMIRROR="deb [trusted=yes] https://ppa.pika-os.com/ lunar main"

release.sh

@@ -2,7 +2,7 @@
 rsync -azP --include './' --include '*.deb' --exclude '*' ./output/ ferreo@direct.pika-os.com:/srv/www/incoming/
 
 # add debs to repo
-ssh ferreo@direct.pika-os.com 'aptly repo add -force-replace -remove-files pika-main /srv/www/incoming/'
+ssh ferreo@direct.pika-os.com 'aptly repo add -force-replace -remove-files pikauwu-main /srv/www/incoming/'
 
 # publish the repo
-ssh ferreo@direct.pika-os.com 'aptly publish update -batch -skip-contents -force-overwrite lunar filesystem:pikarepo:'
+ssh ferreo@direct.pika-os.com 'aptly publish update -batch -skip-contents -force-overwrite pikauwu filesystem:pikarepo:'