Cleanup 0.42.0 and remove nightly

Nightly is no longer possible for the main package (Hyprland) because of GCC 14 requirement, so I see no reason to continue supporting this anymore. It was a bad idea to begin with.
Makrennel · Aug 13, 2024 · 59b4b33 · 59b4b33
1 parent 319fa44
commit 59b4b33
Show file tree

Hide file tree

Showing 18 changed files with 17 additions and 1,202 deletions.
diff --git a/.github/workflows/build-x86_64-glibc.yml b/.github/workflows/build-x86_64-glibc.yml
@@ -69,6 +69,7 @@ jobs:
           common/travis/prepare.sh &&
           common/travis/fetch-xtools.sh
 
+      # All declared individually for logging purposes
       # Common Deps
       - name: Build tomlplusplus
         run: (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg tomlplusplus)
@@ -90,6 +91,9 @@ jobs:
       - name: Build hyprwayland-scanner
         run: (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprwayland-scanner)
 
+      - name: Build aquamarine
+        run: (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg aquamarine)
+
       - name: Build hyprland
         run: (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprland)
 
@@ -108,81 +112,11 @@ jobs:
       - name: Build hyprpaper
         run: (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprpaper)
 
-      # Nightly Builds
-      - name: Build hyprutils-nightly
-        run: |
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprutils.git
-          cd hyprutils
-          sed -i "/^version/ s/$/.$(git rev-list --count HEAD).$(git show -s --format=%h)/" ~/void-pkgs/void-packages/srcpkgs/hyprutils-nightly/template
-          (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprutils-nightly)
-
-      - name: Build hyprlang-nightly
-        run: |
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprlang.git
-          cd hyprlang
-          sed -i "/^version/ s/$/.$(git rev-list --count HEAD).$(git show -s --format=%h)/" ~/void-pkgs/void-packages/srcpkgs/hyprlang-nightly/template
-          (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprlang-nightly)
-
-      - name: Build hyprcursor-nightly
-        run: |
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprcursor.git
-          cd hyprcursor
-          sed -i "/^version/ s/$/.$(git rev-list --count HEAD).$(git show -s --format=%h)/" ~/void-pkgs/void-packages/srcpkgs/hyprcursor-nightly/template
-          (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprcursor-nightly)
-
-      - name: Build hyprwayland-scanner-nightly
-        run: |
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprwayland-scanner.git
-          cd hyprwayland-scanner
-          sed -i "/^version/ s/$/.$(git rev-list --count HEAD).$(git show -s --format=%h)/" ~/void-pkgs/void-packages/srcpkgs/hyprwayland-scanner-nightly/template
-          (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprwayland-scanner-nightly)
-
-      - name: Build hyprland-nightly
-        run: |
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprland.git
-          cd hyprland
-          sed -i "/^version/ s/$/.$(git rev-list --count HEAD).$(git show -s --format=%h)/" ~/void-pkgs/void-packages/srcpkgs/hyprland-nightly/template
-          (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprland-nightly)
-
-      - name: Build hyprland-protocols-nightly
-        run: |
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprland-protocols.git
-          cd hyprland-protocols
-          sed -i "/^version/ s/$/.$(git rev-list --count HEAD).$(git show -s --format=%h)/" ~/void-pkgs/void-packages/srcpkgs/hyprland-protocols-nightly/template
-          (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprland-protocols-nightly)
-
-      - name: Build xdg-desktop-portal-hyprland-nightly
-        run: |
-          git clone --filter=tree:0 https://github.com/hyprwm/xdg-desktop-portal-hyprland.git
-          cd xdg-desktop-portal-hyprland
-          sed -i "/^version/ s/$/.$(git rev-list --count HEAD).$(git show -s --format=%h)/" ~/void-pkgs/void-packages/srcpkgs/xdg-desktop-portal-hyprland-nightly/template
-          (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg xdg-desktop-portal-hyprland-nightly)
-
-      - name: Build hypridle-nightly
-        run: |
-          git clone --filter=tree:0 https://github.com/hyprwm/hypridle.git
-          cd hypridle
-          sed -i "/^version/ s/$/.$(git rev-list --count HEAD).$(git show -s --format=%h)/" ~/void-pkgs/void-packages/srcpkgs/hypridle-nightly/template
-          (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hypridle-nightly)
-
-      - name: Build hyprlock-nightly
-        run: |
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprlock.git
-          cd hyprlock
-          sed -i "/^version/ s/$/.$(git rev-list --count HEAD).$(git show -s --format=%h)/" ~/void-pkgs/void-packages/srcpkgs/hyprlock-nightly/template
-          (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprlock-nightly)
-
-      - name: Build hyprpaper-nightly
-        run: |
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprpaper.git
-          cd hyprpaper
-          sed -i "/^version/ s/$/.$(git rev-list --count HEAD).$(git show -s --format=%h)/" ~/void-pkgs/void-packages/srcpkgs/hyprpaper-nightly/template
-          (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprpaper-nightly)
-
       # Sometimes xbps-src builds a bunch of other junk I don't want to be liable for distributing
       - name: Copy relevant packages to new directory to be packaged
         run: |
           mkdir ~/packages
+          cp ~/hostdir/binpkgs/aquamarine*.xbps ~/packages
           cp ~/hostdir/binpkgs/hypr*.xbps ~/packages
           cp ~/hostdir/binpkgs/xdg-desktop-portal-hyprland*.xbps ~/packages
           cp ~/hostdir/binpkgs/sdbus-cpp*.xbps ~/packages

diff --git a/.github/workflows/build-x86_64-musl.yml b/.github/workflows/build-x86_64-musl.yml
@@ -69,6 +69,7 @@ jobs:
           common/travis/prepare.sh &&
           common/travis/fetch-xtools.sh
 
+      # All declared individually for logging purposes
       # Common Deps
       - name: Build tomlplusplus
         run: (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg tomlplusplus)
@@ -89,6 +90,9 @@ jobs:
       - name: Build hyprwayland-scanner
         run: (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprwayland-scanner)
 
+      - name: Build aquamarine
+        run: (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg aquamarine)
+
       - name: Build hyprland
         run: (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprland)
 
@@ -107,81 +111,11 @@ jobs:
       - name: Build hyprpaper
         run: (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprpaper)
 
-      # Nightly Builds
-      - name: Build hyprutils-nightly
-        run: |
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprutils.git
-          cd hyprutils
-          sed -i "/^version/ s/$/.$(git rev-list --count HEAD).$(git show -s --format=%h)/" ~/void-pkgs/void-packages/srcpkgs/hyprutils-nightly/template
-          (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprutils-nightly)
-
-      - name: Build hyprlang-nightly
-        run: |
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprlang.git
-          cd hyprlang
-          sed -i "/^version/ s/$/.$(git rev-list --count HEAD).$(git show -s --format=%h)/" ~/void-pkgs/void-packages/srcpkgs/hyprlang-nightly/template
-          (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprlang-nightly)
-
-      - name: Build hyprcursor-nightly
-        run: |
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprcursor.git
-          cd hyprcursor
-          sed -i "/^version/ s/$/.$(git rev-list --count HEAD).$(git show -s --format=%h)/" ~/void-pkgs/void-packages/srcpkgs/hyprcursor-nightly/template
-          (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprcursor-nightly)
-
-      - name: Build hyprwayland-scanner-nightly
-        run: |
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprwayland-scanner.git
-          cd hyprwayland-scanner
-          sed -i "/^version/ s/$/.$(git rev-list --count HEAD).$(git show -s --format=%h)/" ~/void-pkgs/void-packages/srcpkgs/hyprwayland-scanner-nightly/template
-          (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprwayland-scanner-nightly)
-
-      - name: Build hyprland-nightly
-        run: |
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprland.git
-          cd hyprland
-          sed -i "/^version/ s/$/.$(git rev-list --count HEAD).$(git show -s --format=%h)/" ~/void-pkgs/void-packages/srcpkgs/hyprland-nightly/template
-          (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprland-nightly)
-
-      - name: Build hyprland-protocols-nightly
-        run: |
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprland-protocols.git
-          cd hyprland-protocols
-          sed -i "/^version/ s/$/.$(git rev-list --count HEAD).$(git show -s --format=%h)/" ~/void-pkgs/void-packages/srcpkgs/hyprland-protocols-nightly/template
-          (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprland-protocols-nightly)
-
-      - name: Build xdg-desktop-portal-hyprland-nightly
-        run: |
-          git clone --filter=tree:0 https://github.com/hyprwm/xdg-desktop-portal-hyprland.git
-          cd xdg-desktop-portal-hyprland
-          sed -i "/^version/ s/$/.$(git rev-list --count HEAD).$(git show -s --format=%h)/" ~/void-pkgs/void-packages/srcpkgs/xdg-desktop-portal-hyprland-nightly/template
-          (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg xdg-desktop-portal-hyprland-nightly)
-
-      - name: Build hypridle-nightly
-        run: |
-          git clone --filter=tree:0 https://github.com/hyprwm/hypridle.git
-          cd hypridle
-          sed -i "/^version/ s/$/.$(git rev-list --count HEAD).$(git show -s --format=%h)/" ~/void-pkgs/void-packages/srcpkgs/hypridle-nightly/template
-          (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hypridle-nightly)
-
-      - name: Build hyprlock-nightly
-        run: |
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprlock.git
-          cd hyprlock
-          sed -i "/^version/ s/$/.$(git rev-list --count HEAD).$(git show -s --format=%h)/" ~/void-pkgs/void-packages/srcpkgs/hyprlock-nightly/template
-          (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprlock-nightly)
-
-      - name: Build hyprpaper-nightly
-        run: |
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprpaper.git
-          cd hyprpaper
-          sed -i "/^version/ s/$/.$(git rev-list --count HEAD).$(git show -s --format=%h)/" ~/void-pkgs/void-packages/srcpkgs/hyprpaper-nightly/template
-          (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprpaper-nightly)
-
       # Sometimes xbps-src builds a bunch of other junk I don't want to be liable for distributing
       - name: Copy relevant packages to new directory to be packaged
         run: |
           mkdir ~/packages
+          cp ~/hostdir/binpkgs/aquamarine*.xbps ~/packages
           cp ~/hostdir/binpkgs/hypr*.xbps ~/packages
           cp ~/hostdir/binpkgs/xdg-desktop-portal-hyprland*.xbps ~/packages
           cp ~/hostdir/binpkgs/sdbus-cpp*.xbps ~/packages