.github/build-canary-v3

@@ -1 +0,0 @@
-1

.github/build-nest-v3

@@ -1 +0,0 @@
-1

.github/release-canary-v3

@@ -1 +0,0 @@
-2

.github/release-nest-v3

@@ -1 +0,0 @@
-1

.github/workflows/build-canaryv3.yml

@@ -1,37 +0,0 @@
-name: PikaOS Package Build Only (Canary) (amd64-v3)
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - '.github/build-canary-v3'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/pikaos-linux/pikaos-builder:canaryv3
-      volumes:
-        - /proc:/proc
-      options: --privileged -it
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Install SSH key
-      uses: shimataro/ssh-key-action@v2
-      with:
-        key: ${{ secrets.SSH_KEY }}
-        name: id_rsa
-        known_hosts: ${{ secrets.KNOWN_HOSTS }}
-        if_key_exists: replace
-    
-    - name: Update APT Cache
-      run: apt-get update -y
-
-    - name: Set Build Config
-      run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh
-
-    - name: Build Package
-      run: ./main.sh

.github/workflows/build-nestv3.yml

@@ -1,37 +0,0 @@
-name: PikaOS Package Build Only (amd64-v3)
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - '.github/build-nest-v3'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/pikaos-linux/pikaos-builder:nestv3
-      volumes:
-        - /proc:/proc
-      options: --privileged -it
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Install SSH key
-      uses: shimataro/ssh-key-action@v2
-      with:
-        key: ${{ secrets.SSH_KEY }}
-        name: id_rsa
-        known_hosts: ${{ secrets.KNOWN_HOSTS }}
-        if_key_exists: replace
-    
-    - name: Update APT Cache
-      run: apt-get update -y
-
-    - name: Set Build Config
-      run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh
-
-    - name: Build Package
-      run: ./main.sh

.github/workflows/release-canaryv3.yml

@@ -1,40 +0,0 @@
-name: PikaOS Package Build & Release (Canary) (amd64-v3)
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - '.github/release-canary-v3'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/pikaos-linux/pikaos-builder:canaryv3
-      volumes:
-        - /proc:/proc
-      options: --privileged -it
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Install SSH key
-      uses: shimataro/ssh-key-action@v2
-      with:
-        key: ${{ secrets.SSH_KEY }}
-        name: id_rsa
-        known_hosts: ${{ secrets.KNOWN_HOSTS }}
-        if_key_exists: replace
-    
-    - name: Update APT Cache
-      run: apt-get update -y
-
-    - name: Set Build Config
-      run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh
-
-    - name: Build Package
-      run: ./main.sh
-
-    - name: Release Package
-      run: ./release.sh

.github/workflows/release-nestv3.yml

@@ -1,40 +0,0 @@
-name: PikaOS Package Build & Release (amd64-v3)
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - '.github/release-nest-v3'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/pikaos-linux/pikaos-builder:nestv3
-      volumes:
-        - /proc:/proc
-      options: --privileged -it
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Install SSH key
-      uses: shimataro/ssh-key-action@v2
-      with:
-        key: ${{ secrets.SSH_KEY }}
-        name: id_rsa
-        known_hosts: ${{ secrets.KNOWN_HOSTS }}
-        if_key_exists: replace
-    
-    - name: Update APT Cache
-      run: apt-get update -y
-
-    - name: Set Build Config
-      run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh
-
-    - name: Build Package
-      run: ./main.sh
-
-    - name: Release Package
-      run: ./release.sh

.github/workflows/release.yml

@@ -0,0 +1,46 @@
+name: PikaOS Package Release
+
+on:
+  workflow_dispatch
+
+jobs:
+  build:
+    runs-on: self-hosted
+    container:
+      image: ghcr.io/pikaos-linux/pika-package-container:latest
+      volumes:
+        - /proc:/proc
+      options: --privileged -it
+
+    steps:
+    - uses: actions/checkout@v3
+  
+    - name: Import GPG key
+      id: import_gpg
+      uses: crazy-max/ghaction-import-gpg@v5
+      with:
+        gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+        passphrase: ${{ secrets.PASSPHRASE }}
+
+    - name: Install SSH key
+      uses: shimataro/ssh-key-action@v2
+      with:
+        key: ${{ secrets.SSH_KEY }}
+        name: id_rsa
+        known_hosts: ${{ secrets.KNOWN_HOSTS }}
+        if_key_exists: replace
+    
+    - name: Build Package
+      run: ./main.sh
+
+    - name: Release Package
+      run: ./release.sh
+
+    - name: Purge cache
+      uses: strrife/cloudflare-chunked-purge-action@master
+      env:
+        # Zone is required by both authentication methods
+        CLOUDFLARE_ZONE: ${{ secrets.CLOUDFLARE_ZONE }}
+
+        CLOUDFLARE_TOKEN: ${{ secrets.CLOUDFLARE_TOKEN }}
+        PURGE_URLS: ${{ vars.PURGE_URLS }}

LICENSE.md

@@ -1,6 +1,6 @@
-MIT License (With DPKG packaging compatibility)
+MIT License
 
-Copyright (c) 2024 PikaOS
+Copyright (c) 2023 PikaOS
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,6 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-
-Notes:
-The files covered by this license are any files and directories in the root of this repository (including but not limited to: `main.sh`, `release.sh`, and `.github`), with the exception of the `debian` directory and its contents if `debian/copyright` exists, and declares any files or directories as a different LICENSE/COPYRIGHT.

main.sh

@@ -1,23 +1,17 @@
 #! /bin/bash
 
-set -e
+# Get logos
-
+wget https://github.com/PikaOS-Linux/pika-branding/raw/main/logos/pika-logo-nv.png -O ./pika-refind-theme/usr/share/pika-refind/theme/refind-dark/icons/os_pika.png
-VERSION="1.6"
+cp ./pika-refind-theme/usr/share/pika-refind/theme/refind-dark/icons/os_pika.png ./pika-refind-theme/usr/share/pika-refind/theme/refind-dark/icons/os_linux.png
-
+DEBIAN_FRONTEND=noninteractive
-source ./pika-build-config.sh
-
-echo "$PIKA_BUILD_ARCH" > pika-build-arch
 
 # Clone Upstream
-wget https://github.com/PikaOS-Linux/pika-branding/raw/main/logos/pika-logo-nv.png -O ./pika-refind-theme/usr/share/pika-refind/theme/refind-dark/icons/os_pikaos.png
-cp ./pika-refind-theme/usr/share/pika-refind/theme/refind-dark/icons/os_pikaos.png ./pika-refind-theme/usr/share/pika-refind/theme/refind-dark/icons/os_pika.png
 cd ./pika-refind-theme
 
 # Get build deps
 apt-get build-dep ./ -y
 
 # Build package
-LOGNAME=root dh_make --createorig -y -l -p pika-refind-theme_"$VERSION" || echo "dh-make: Ignoring Last Error"
 dpkg-buildpackage --no-sign
 
 # Move the debs to output

pika-build-config/amd64-v3.sh

@@ -1,10 +0,0 @@
-#! /bin/bash
-export PIKA_BUILD_ARCH="amd64-v3"
-export DEBIAN_FRONTEND="noninteractive"
-export DEB_BUILD_MAINT_OPTIONS="optimize=+lto -march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
-export DEB_CFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
-export DEB_CPPFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
-export DEB_CXXFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
-export DEB_LDFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
-export DEB_BUILD_OPTIONS="nocheck notest terse"
-export DPKG_GENSYMBOLS_CHECK_LEVEL=0

pika-build-config/i386.sh

@@ -1,5 +0,0 @@
-#! /bin/bash
-export PIKA_BUILD_ARCH="i386"
-export DEBIAN_FRONTEND="noninteractive"
-export DEB_BUILD_OPTIONS="nocheck notest terse"
-export DPKG_GENSYMBOLS_CHECK_LEVEL=0

pika-refind-theme/debian/changelog

@@ -1,15 +1,3 @@
-pika-refind-theme (1.6-101pika2) pika; urgency=medium
-
-  * Update to PikaOS 4
-
- -- ferreo <harderthanfire@gmail.com>  Wed, 18 Jan 2023 21:48:14 +0000
-
-pika-refind-theme (1.5-100pika1) pikauwu; urgency=medium
-
-  * Update to pikauwu
-
- -- ferreo <harderthanfire@gmail.com>  Wed, 18 Jan 2023 21:48:14 +0000
-
 pika-refind-theme (1.5-99pika7.lunar) lunar; urgency=medium
 
   * Fix invalid resolution

pika-refind-theme/debian/rules

@@ -4,5 +4,77 @@
 ## Output every command that modifies files on the build system.
 export DH_VERBOSE = 1
 
+## === Set paths env vars ===
+
+## Source directory, called upon by $(srcdir)
+#srcdir = $(shell debian/scripts/get_pwd.sh)
+## The Root of package number one, called upon by $(pkgdir1)
+#pkgdir1 = $(srcdir)/debian/pkgdir1
+## The Root of package number two, you can add as many of these as you like
+#pkgdir2 = $(srcdir)/debian/pkgdir2
+
+## If building a singular package you can remove the number, and as you guessed you call upon it with $(pkgdir)
+# pkgdir = $(srcdir)/debian/pkgdir
+
+## === End end of region ===
+
+## === the chain of command ===
+## debuild runs a chain of dh functions in the following order:
+## dh_testdir
+## dh_clean
+## dh_auto_clean
+## dh_update_autotools_config
+## dh_autoreconf
+## dh_auto_configure
+## dh_prep
+## dh_build
+## dh_auto_build
+## dh_install
+## dh_auto_install
+## dh_installdocs
+## dh_installchangelogs
+## dh_perl
+## dh_link
+## dh_strip_nondeterminism
+## dh_compress
+## dh_fixperms
+## dh_missing
+## dh_dwz
+## dh_strip
+## dh_makeshlibs
+## dh_shlibdeps
+## dh_installdeb
+## dh_gencontrol
+## but you are most likely to only need to override the following:
+## dh_clean
+## dh_auto_configure
+## dh_build
+## dh_install
+
+## === End end of region ===
+
+## === overriding dh functions ===
+## by default all dh functions will run a specific command based on the build system selected by "dh $@"
+## if you have a makefile that does everything you need this is fine,
+## but most likely you have no MakeFile and you want to add your own commands
+## Note : overrides must be places above %:
+## So here's a few examples:
+
+## overriding dh_clean to make it not delete rust vendor files:
+#override_dh_clean:
+#	echo "disabled"
+
+## overriding dh_auto_configure to add custom configs:
+#override_dh_auto_configure:
+#		$(srcdir)/configure -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_DATADIR=/usr/share -DCMAKE_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu -DBUILD_PLUGIN=OFF
+
+## overriding dh_install to install files to a package:
+#override_dh_auto_configure:
+#		mkdir -p $(pkgdir1)/usr/bin
+#		cp $(srcdir)/pikman $(pkgdir1)/usr/bin/
+
+## === End end of region ===
+
+## This here will start the build:
 %:
 	dh $@

pika-refind-theme/debian/source/format

@@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)