From d39099e7f4d4d1cf9ba63155d9a7cdffb3a5b188 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Tue, 27 Aug 2024 05:17:57 +0300 Subject: [PATCH] Final Gnome Meta --- .github/build-canary-v3 | 1 + .github/build-nest-v3 | 1 + .github/release-canary-v3 | 1 + .github/release-nest-v3 | 1 + .github/workflows/build-canaryv3.yml | 37 ++++++ .github/workflows/build-nestv3.yml | 37 ++++++ .github/workflows/release-canaryv3.yml | 40 ++++++ .github/workflows/release-nestv3.yml | 40 ++++++ .github/workflows/release.yml | 46 ------- main.sh | 18 ++- pika-build-config/amd64-v3.sh | 10 ++ pika-build-config/i386.sh | 5 + pika-gnome-desktop/debian/changelog | 6 + pika-gnome-desktop/debian/control | 166 ++++++++++++------------ pika-gnome-desktop/debian/source/format | 2 +- release.sh | 8 +- 16 files changed, 279 insertions(+), 140 deletions(-) create mode 100644 .github/build-canary-v3 create mode 100644 .github/build-nest-v3 create mode 100644 .github/release-canary-v3 create mode 100644 .github/release-nest-v3 create mode 100644 .github/workflows/build-canaryv3.yml create mode 100644 .github/workflows/build-nestv3.yml create mode 100644 .github/workflows/release-canaryv3.yml create mode 100644 .github/workflows/release-nestv3.yml delete mode 100644 .github/workflows/release.yml create mode 100755 pika-build-config/amd64-v3.sh create mode 100755 pika-build-config/i386.sh diff --git a/.github/build-canary-v3 b/.github/build-canary-v3 new file mode 100644 index 0000000..56a6051 --- /dev/null +++ b/.github/build-canary-v3 @@ -0,0 +1 @@ +1 \ No newline at end of file diff --git a/.github/build-nest-v3 b/.github/build-nest-v3 new file mode 100644 index 0000000..56a6051 --- /dev/null +++ b/.github/build-nest-v3 @@ -0,0 +1 @@ +1 \ No newline at end of file diff --git a/.github/release-canary-v3 b/.github/release-canary-v3 new file mode 100644 index 0000000..56a6051 --- /dev/null +++ b/.github/release-canary-v3 @@ -0,0 +1 @@ +1 \ No newline at end of file diff --git a/.github/release-nest-v3 b/.github/release-nest-v3 new file mode 100644 index 0000000..56a6051 --- /dev/null +++ b/.github/release-nest-v3 @@ -0,0 +1 @@ +1 \ No newline at end of file diff --git a/.github/workflows/build-canaryv3.yml b/.github/workflows/build-canaryv3.yml new file mode 100644 index 0000000..bff3d86 --- /dev/null +++ b/.github/workflows/build-canaryv3.yml @@ -0,0 +1,37 @@ +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 diff --git a/.github/workflows/build-nestv3.yml b/.github/workflows/build-nestv3.yml new file mode 100644 index 0000000..3c9c34d --- /dev/null +++ b/.github/workflows/build-nestv3.yml @@ -0,0 +1,37 @@ +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 diff --git a/.github/workflows/release-canaryv3.yml b/.github/workflows/release-canaryv3.yml new file mode 100644 index 0000000..436c8ff --- /dev/null +++ b/.github/workflows/release-canaryv3.yml @@ -0,0 +1,40 @@ +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 diff --git a/.github/workflows/release-nestv3.yml b/.github/workflows/release-nestv3.yml new file mode 100644 index 0000000..ed42bb7 --- /dev/null +++ b/.github/workflows/release-nestv3.yml @@ -0,0 +1,40 @@ +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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index 1641898..0000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,46 +0,0 @@ -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 }} diff --git a/main.sh b/main.sh index c61820f..545b304 100755 --- a/main.sh +++ b/main.sh @@ -1,14 +1,24 @@ +#! /bin/bash + +set -e + +VERSION="4.0.0" + +source ./pika-build-config.sh + +echo "$PIKA_BUILD_ARCH" > pika-build-arch + # Clone Upstream -cd ./pika-gnome-desktop +cd ./pika-kde-desktop # Get build deps apt-get build-dep ./ -y # Build package -dh_make --createorig -dpkg-buildpackage +LOGNAME=root dh_make --createorig -y -l -p pika-kde-desktop_"$VERSION" || echo "dh-make: Ignoring Last Error" +dpkg-buildpackage --no-sign # Move the debs to output cd ../ mkdir -p ./output -mv ./*.deb ./output/ +mv ./*.deb ./output/ \ No newline at end of file diff --git a/pika-build-config/amd64-v3.sh b/pika-build-config/amd64-v3.sh new file mode 100755 index 0000000..10285b4 --- /dev/null +++ b/pika-build-config/amd64-v3.sh @@ -0,0 +1,10 @@ +#! /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 diff --git a/pika-build-config/i386.sh b/pika-build-config/i386.sh new file mode 100755 index 0000000..7629d66 --- /dev/null +++ b/pika-build-config/i386.sh @@ -0,0 +1,5 @@ +#! /bin/bash +export PIKA_BUILD_ARCH="i386" +export DEBIAN_FRONTEND="noninteractive" +export DEB_BUILD_OPTIONS="nocheck notest terse" +export DPKG_GENSYMBOLS_CHECK_LEVEL=0 diff --git a/pika-gnome-desktop/debian/changelog b/pika-gnome-desktop/debian/changelog index ebfc2fb..160a7f4 100644 --- a/pika-gnome-desktop/debian/changelog +++ b/pika-gnome-desktop/debian/changelog @@ -1,3 +1,9 @@ +pika-gnome-desktop (4.0.0-101pika1) pika; urgency=medium + + * Update to OS 4 + + -- Ward Nakchbandi Thu, 12 Jan 2023 16:48:00 +0300 + pika-gnome-desktop (3.7.2-100pika1) pikauwu; urgency=medium * Use new settings model diff --git a/pika-gnome-desktop/debian/control b/pika-gnome-desktop/debian/control index 3f5c64e..84224d1 100644 --- a/pika-gnome-desktop/debian/control +++ b/pika-gnome-desktop/debian/control @@ -6,109 +6,111 @@ Standards-Version: 4.6.1 Build-Depends: debhelper-compat (= 13) Rules-Requires-Root: no -Package: pika-gnome-desktop-minimal +Package: pika-gnome-desktop Architecture: linux-any -Depends: ${misc:Depends}, -# BaseOS +Depends: + ${misc:Depends}, +# PikaOS Basic pika-baseos, -# Basic Session - pika-gnome-session, pika-gnome-settings | pika-settings, +# Basic Desktop gdm3, gnome-shell, -# Gnome VRR Session - gnome-shell-vrr, - mutter-vrr, + gnome-session, + gnome-session-xsession, # Fonts fonts-cantarell, fonts-dejavu-core, fonts-freefont-ttf, + fonts-inter-variable, fonts-liberation, + fonts-noto-color-emoji, # Theming - gnome-themes-extra, - adwaita-icon-theme-full, + adwaita-icon-theme, adw-gtk3-theme, - papirus-icon-theme, + gnome-themes-extra, sound-theme-freedesktop, - pika-theme, - pika-gdm-theme, -# Plugins - xdg-desktop-portal-gnome, - chrome-gnome-shell, - ghostscript-x, - gnome-bluetooth, - gnome-online-miners, - gnome-menus, - gnome-video-effects, - inputattach, - libatk-adaptor, - libcanberra-gtk-module, - libpam-gnome-keyring, - network-manager-pptp-gnome, - network-manager-openvpn-gnome, + papirus-icon-theme, +# Desktop Libs appmenu-gtk2-module, appmenu-gtk3-module, - brltty, - language-selector-gnome, - gnome-remote-desktop, - gnome-shell-extension-supergfxctl-gex, - nautilus-share, - gir1.2-gmenu-3.0, -# Applications - gnome-control-center, - gnome-disk-utility, - gnome-system-monitor, - gnome-terminal | kgx, - nautilus, - fonts-noto-color-emoji, - gnome-shell-extension-manager, - gnome-tweaks, + at-spi2-core, baobab, - eog, - firmware-manager, - geary, - gnome-text-editor, - gnome-calculator, - gnome-calendar, - gnome-contacts, - gnome-font-viewer, - gnome-power-manager, - gnome-weather, + brltty, + chrome-gnome-shell, + dconf-cli, + dconf-gsettings-backend, + ghostscript-x, + gir1.2-gmenu-3.0, + gkbd-capplet, + glib-networking, + gsettings-desktop-schemas + gstreamer1.0-packagekit + gstreamer1.0-plugins-base + gstreamer1.0-plugins-good + gucharmap + gvfs-backends + gvfs-fuse + ibus-table-emoji + inputattach + libatk-adaptor + libcanberra-pulse + libglib2.0-bin + libpam-gnome-keyring + libproxy1-plugin-gsettings + libproxy1-plugin-webkit + librsvg2-common + system-config-printer-common + system-config-printer-udev + tracker + xdg-desktop-portal-gnome +# Apps + gnome-bluetooth + gnome-calculator + gnome-calendar + gnome-characters + gnome-clocks + gnome-console | kgx | gnome-terminal + gnome-contacts + gnome-control-center + gnome-disk-utility + gnome-firmware + gnome-font-viewer + gnome-keyring + gnome-logs + gnome-menus + gnome-online-accounts gnome-photos, + gnome-power-manager, + gnome-remote-desktop, + gnome-settings-daemon, + gnome-shell-extension-manager, + gnome-software, gnome-sushi, - gucharmap, - ibus-table-emoji, + gnome-system-monitor, + gnome-text-editor, + gnome-tweaks, + gnome-user-docs, + gnome-user-share, + gnome-video-effects, + gnome-weather, + loupe, + nautilus, + pavucontrol, pika-welcome, seahorse, simple-scan, + totem, + zenity, yelp, - pavucontrol, - gnome-software, +# Extensions + gnome-shell-extension-supergfxctl-gex, + gnome-software-plugin-deb, gnome-software-plugin-flatpak, -## Last to replace mime information - file-roller, -Description: PikaOS Minimal Gnome Desktop Metapackage -Recommends: firefox, pika-gnome-settings - -Package: pika-gnome-desktop -Architecture: linux-any -Depends: ${misc:Depends}, -# Pull minimal desktop - pika-gnome-desktop-minimal, -# Essential Apps - build-essential, - wget, - git, - curl, -# Gaming Utils - pika-gameutils-meta, -# AMDGPU Utils - pika-amdgpu-switcher, - pika-rocm-meta, -Recommends: - va-driver-all, - vdpau-driver-all, - vlc, - pika-codecs-meta, - pika-office-meta, + gnome-software-plugin-fwupd, + nautilus-share, + network-manager-openvpn-gnome, + network-manager-pptp-gnome, + gnome-bluetooth-sendto, Description: PikaOS Gnome Desktop Metapackage +Recommends: firefox, pika-gnome-settings diff --git a/pika-gnome-desktop/debian/source/format b/pika-gnome-desktop/debian/source/format index 89ae9db..163aaf8 100644 --- a/pika-gnome-desktop/debian/source/format +++ b/pika-gnome-desktop/debian/source/format @@ -1 +1 @@ -3.0 (native) +3.0 (quilt) diff --git a/release.sh b/release.sh index 21ee3e7..f38fc8e 100755 --- a/release.sh +++ b/release.sh @@ -1,8 +1,2 @@ # send debs to server -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 pikauwu-main /srv/www/incoming/' - -# publish the repo -ssh ferreo@direct.pika-os.com 'aptly publish update -batch -skip-contents -force-overwrite pikauwu filesystem:pikarepo:' +rsync -azP --include './' --include '*.deb' --exclude '*' ./output/ ferreo@direct.pika-os.com:/srv/www/cockatiel-incoming/ \ No newline at end of file