sandwichfarm
diff --git a/‎.github/workflows/aur-release.yml‎
Lines changed: 79 additions & 0 deletions b/‎.github/workflows/aur-release.yml‎
Lines changed: 79 additions & 0 deletions
diff --git a/‎.github/workflows/feature-build-cleanup.yml‎
Lines changed: 52 additions & 0 deletions b/‎.github/workflows/feature-build-cleanup.yml‎
Lines changed: 52 additions & 0 deletions
diff --git a/‎.github/workflows/feature-build.yml‎
Lines changed: 11 additions & 2 deletions b/‎.github/workflows/feature-build.yml‎
Lines changed: 11 additions & 2 deletions
diff --git a/‎.github/workflows/pre-release.yml‎
Lines changed: 5 additions & 18 deletions b/‎.github/workflows/pre-release.yml‎
Lines changed: 5 additions & 18 deletions
diff --git a/‎.github/workflows/release.yml‎
Lines changed: 44 additions & 26 deletions b/‎.github/workflows/release.yml‎
Lines changed: 44 additions & 26 deletions
diff --git a/‎.github/workflows/test.yml‎
Lines changed: 1 addition & 1 deletion b/‎.github/workflows/test.yml‎
Lines changed: 1 addition & 1 deletion
@@ -0,0 +1,79 @@
+name: Publish AUR (hyprlax)
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  aur:
+    if: ${{ github.event.release.prerelease == false }}
+    runs-on: ubuntu-latest
+    container: archlinux:base-devel
+    steps:
+      - name: Install tools
+        run: |
+          pacman -Syu --noconfirm git openssh wget sed which base-devel wayland wayland-protocols
+
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Prepare PKGBUILD for release tag
+        id: prep
+        env:
+          TAG: ${{ github.event.release.tag_name }}
+        run: |
+          set -euo pipefail
+          if [[ -z "${TAG:-}" ]]; then echo "Missing tag"; exit 1; fi
+          PKGVER="${TAG#v}"
+          echo "pkgver=${PKGVER}" >> "$GITHUB_OUTPUT"
+          WORKDIR=/tmp/aur-hyprlax
+          mkdir -p "$WORKDIR"
+          cp packaging/arch/hyprlax/PKGBUILD "$WORKDIR/PKGBUILD"
+          # Update pkgver in PKGBUILD
+          sed -i "s/^pkgver=.*/pkgver=${PKGVER}/" "$WORKDIR/PKGBUILD"
+          # Fetch source tarball and compute sha256
+          TARBALL_URL="https://github.com/sandwichfarm/hyprlax/archive/refs/tags/${TAG}.tar.gz"
+          wget -O /tmp/src.tar.gz "$TARBALL_URL"
+          SHA256=$(sha256sum /tmp/src.tar.gz | awk '{print $1}')
+          # Ensure source filename has v${pkgver}
+          sed -i "s|^source=.*|source=(\"hyprlax-v${PKGVER}.tar.gz::${TARBALL_URL}\")|" "$WORKDIR/PKGBUILD"
+          sed -i "s/^sha256sums=.*/sha256sums=('${SHA256}')/" "$WORKDIR/PKGBUILD"
+          # Generate .SRCINFO
+          cd "$WORKDIR"
+          makepkg --printsrcinfo > .SRCINFO
+          ls -la
+
+      - name: Configure SSH for AUR
+        env:
+          AUR_SSH_PRIVATE_KEY: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
+        run: |
+          set -euo pipefail
+          if [[ -z "${AUR_SSH_PRIVATE_KEY:-}" ]]; then
+            echo "AUR_SSH_PRIVATE_KEY secret is not set" >&2
+            exit 1
+          fi
+          install -m 700 -d ~/.ssh
+          echo "$AUR_SSH_PRIVATE_KEY" > ~/.ssh/id_ed25519
+          chmod 600 ~/.ssh/id_ed25519
+          ssh-keyscan -t ed25519 aur.archlinux.org >> ~/.ssh/known_hosts
+
+      - name: Push to AUR (hyprlax)
+        env:
+          PKGDIR: /tmp/aur-hyprlax
+        run: |
+          set -euo pipefail
+          cd /tmp
+          git clone ssh://aur@aur.archlinux.org/hyprlax.git aur-hyprlax-repo
+          cd aur-hyprlax-repo
+          # Copy updated files
+          cp -f "$PKGDIR/PKGBUILD" "$PKGDIR/.SRCINFO" .
+          if git diff --quiet --no-index . "$PKGDIR"; then
+            echo "No changes to push to AUR"
+            exit 0
+          fi
+          git config user.name "github-actions"
+          git config user.email "actions@github.com"
+          git add PKGBUILD .SRCINFO
+          git commit -m "release: ${GITHUB_REF#refs/tags/}"
+          git push
+
@@ -0,0 +1,52 @@
+name: Feature Build Cleanup
+
+on:
+  pull_request:
+    types: [converted_to_draft, closed]
+
+jobs:
+  cleanup-comment:
+    runs-on: ubuntu-latest
+    
+    steps:
+      - name: Remove build artifact comment
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const comments = await github.rest.issues.listComments({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number
+            });
+            
+            const botComment = comments.data.find(comment => 
+              comment.user.type === 'Bot' && 
+              comment.body.includes('🤖 **Build Artifact Available**')
+            );
+            
+            if (botComment) {
+              const eventType = context.payload.action;
+              let updateBody = '';
+              
+              if (eventType === 'converted_to_draft') {
+                updateBody = `🤖 **Build Artifact Paused**
+                
+                This PR has been converted to draft. Build artifacts are only generated for PRs ready for review.
+                
+                Mark this PR as "Ready for review" to generate a new build artifact.`;
+              } else if (eventType === 'closed') {
+                updateBody = `🤖 **Build Artifact Expired**
+                
+                This PR has been closed. The build artifact links above may no longer work.`;
+              }
+              
+              if (updateBody) {
+                await github.rest.issues.updateComment({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  comment_id: botComment.id,
+                  body: updateBody
+                });
+              }
+            }
@@ -89,11 +89,20 @@ jobs:
             libwayland-dev \
             libegl1-mesa-dev \
             libgles2-mesa-dev \
-            libx11-dev \
-            libxext-dev \
             wayland-scanner++ \
             pkg-config
       
+      - name: Generate VERSION file
+        if: steps.pr_info.outputs.skip != 'true'
+        run: |
+          # Sanitize branch name (replace / with -)
+          BRANCH_NAME=$(echo "${{ steps.pr_info.outputs.head_ref }}" | sed 's/\//-/g')
+          # Get short commit hash
+          SHORT_SHA=$(echo "${{ steps.pr_info.outputs.head_sha }}" | cut -c1-7)
+          # Create VERSION file with branch-commit format
+          echo "${BRANCH_NAME}-${SHORT_SHA}" > VERSION
+          echo "Generated version: $(cat VERSION)"
+      
       - name: Build hyprlax
         if: steps.pr_info.outputs.skip != 'true'
         run: |
 
@@ -62,19 +62,17 @@ jobs:
             wayland-protocols \
             libegl1-mesa-dev \
             libgles2-mesa-dev \
-            libx11-dev \
-            libxext-dev \
             check
       
       - name: Build binary
         env:
           CC: ${{ matrix.cc }}
           ARCH: ${{ matrix.arch }}
         run: |
-          # Add pre-release version info to build
-          VERSION=${{ github.ref_name }}
+          # Extract version from tag (remove 'v' prefix)
+          VERSION="${GITHUB_REF_NAME#v}"
+          echo "$VERSION" > VERSION
           echo "Building pre-release version: $VERSION"
-          echo "#define HYPRLAX_VERSION \"$VERSION-PRE\"" > src/version.h
           
           make clean
           make
@@ -88,21 +86,14 @@ jobs:
         run: |
           # Rename binaries to match release workflow naming
           mv hyprlax hyprlax-${{ matrix.arch }}
-          mv hyprlax-ctl hyprlax-ctl-${{ matrix.arch }}
           chmod +x hyprlax-${{ matrix.arch }}
-          chmod +x hyprlax-ctl-${{ matrix.arch }}
       
       - name: Upload hyprlax artifact
         uses: actions/upload-artifact@v4
         with:
           name: hyprlax-${{ matrix.arch }}
           path: hyprlax-${{ matrix.arch }}
 
-      - name: Upload hyprlax-ctl artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: hyprlax-ctl-${{ matrix.arch }}
-          path: hyprlax-ctl-${{ matrix.arch }}
 
   create-pre-release:
     needs: [validate-branch, build-pre-release]
@@ -187,20 +178,17 @@ jobs:
           ### 🔧 Installation (Testing Only)
           
           \`\`\`bash
-          # Download binaries
+          # Download binary
           wget https://github.com/sandwichfarm/hyprlax/releases/download/${VERSION}/hyprlax-x86_64
-          wget https://github.com/sandwichfarm/hyprlax/releases/download/${VERSION}/hyprlax-ctl-x86_64
           
           # Make executable and install (at your own risk)
-          chmod +x hyprlax-x86_64 hyprlax-ctl-x86_64
+          chmod +x hyprlax-x86_64
           sudo mv hyprlax-x86_64 /usr/local/bin/hyprlax
-          sudo mv hyprlax-ctl-x86_64 /usr/local/bin/hyprlax-ctl
           \`\`\`
           
           ### 📦 Available Builds
           
           - \`hyprlax-x86_64\` - Main hyprlax binary for Intel/AMD 64-bit
-          - \`hyprlax-ctl-x86_64\` - Control client for Intel/AMD 64-bit
           
           *Note: ARM64 builds not available for pre-releases. Please build from source.*
           
@@ -245,7 +233,6 @@ jobs:
           prerelease: true  # ALWAYS true for pre-releases
           files: |
             hyprlax-x86_64
-            hyprlax-ctl-x86_64
             SHA256SUMS
           fail_on_unmatched_files: true
           generate_release_notes: false  # We generate our own
 
@@ -3,13 +3,40 @@ name: Release
 on:
   push:
     tags:
-      - 'v*'
+      # Only match stable version tags (no dash)
+      # v1.0.0, v2.1.3 etc. (NOT v1.0.0-beta.1)
+      - 'v[0-9]+.[0-9]+.[0-9]+' 
 
 permissions:
   contents: write
 
 jobs:
+  validate-branch:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      
+      - name: Validate tag is from master
+        run: |
+          # Get the branch containing this tag
+          BRANCH=$(git branch -r --contains ${{ github.ref_name }} | grep -v HEAD | head -1 | sed 's/.*origin\///')
+          echo "Stable release tag ${{ github.ref_name }} is on branch: $BRANCH"
+          
+          # Stable releases must be from master branch
+          if [[ "$BRANCH" != "master" ]] && [[ "$BRANCH" != "main" ]]; then
+            echo "::error::Stable release tags must be created from master/main branch!"
+            echo "Current branch is: $BRANCH"
+            echo "For pre-releases from feature branches, use version tags like v1.0.0-beta.1"
+            exit 1
+          fi
+          
+          echo "✅ Stable release tag is correctly on master/main branch"
+
   build:
+    needs: validate-branch
     strategy:
       matrix:
         include:
@@ -34,6 +61,13 @@ jobs:
           pkg-config \
           make
 
+    - name: Write VERSION file from tag
+      run: |
+        # Extract version from tag (remove 'v' prefix)
+        VERSION="${GITHUB_REF_NAME#v}"
+        echo "$VERSION" > VERSION
+        echo "Building version: $VERSION"
+
     - name: Build
       env:
         CC: ${{ matrix.cc }}
@@ -45,26 +79,17 @@ jobs:
       id: binary
       run: |
         echo "hyprlax_name=hyprlax-${{ matrix.arch }}" >> $GITHUB_OUTPUT
-        echo "ctl_name=hyprlax-ctl-${{ matrix.arch }}" >> $GITHUB_OUTPUT
 
-    - name: Rename binaries
+    - name: Rename binary
       run: |
         mv hyprlax ${{ steps.binary.outputs.hyprlax_name }}
-        mv hyprlax-ctl ${{ steps.binary.outputs.ctl_name }}
         chmod +x ${{ steps.binary.outputs.hyprlax_name }}
-        chmod +x ${{ steps.binary.outputs.ctl_name }}
 
     - name: Upload hyprlax artifact
       uses: actions/upload-artifact@v4
       with:
         name: ${{ steps.binary.outputs.hyprlax_name }}
         path: ${{ steps.binary.outputs.hyprlax_name }}
-        
-    - name: Upload hyprlax-ctl artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: ${{ steps.binary.outputs.ctl_name }}
-        path: ${{ steps.binary.outputs.ctl_name }}
 
   release:
     needs: build
@@ -84,17 +109,12 @@ jobs:
         # Move all binaries to root
         find ./binaries -type f -name 'hyprlax-*' -exec mv {} . \;
         
-        # Check if we have the x86_64 binaries
+        # Check if we have the x86_64 binary
         if [ ! -f hyprlax-x86_64 ]; then
           echo "Error: hyprlax-x86_64 binary not found!"
           exit 1
         fi
         
-        if [ ! -f hyprlax-ctl-x86_64 ]; then
-          echo "Error: hyprlax-ctl-x86_64 binary not found!"
-          exit 1
-        fi
-        
         # Create checksums
         sha256sum hyprlax-* > SHA256SUMS
         
@@ -127,25 +147,24 @@ jobs:
         body: |
           ## Release ${{ steps.version.outputs.version }}
           
-          Smooth parallax wallpaper animations for Hyprland.
+          Multi-compositor parallax wallpaper engine for Linux.
           
           ### Installation
           
-          Download the binaries:
-          - `hyprlax-x86_64` - Main hyprlax binary for x86_64 systems
-          - `hyprlax-ctl-x86_64` - Control client for x86_64 systems
+          Download the binary:
+          - `hyprlax-x86_64` - hyprlax binary for x86_64 systems (control interface integrated)
           
           ```bash
-          # Download both binaries
+          # Download binary
           wget https://github.com/${{ github.repository }}/releases/download/${{ steps.version.outputs.version }}/hyprlax-x86_64
-          wget https://github.com/${{ github.repository }}/releases/download/${{ steps.version.outputs.version }}/hyprlax-ctl-x86_64
           
           # Make executable and install
-          chmod +x hyprlax-x86_64 hyprlax-ctl-x86_64
+          chmod +x hyprlax-x86_64
           sudo mv hyprlax-x86_64 /usr/local/bin/hyprlax
-          sudo mv hyprlax-ctl-x86_64 /usr/local/bin/hyprlax-ctl
           ```
           
+          **Note:** The control interface is now integrated. Use `hyprlax ctl <command>` for runtime control.
+          
           For ARM64 and other architectures, please build from source.
           
           ### Changes
@@ -158,7 +177,6 @@ jobs:
           
         files: |
           hyprlax-x86_64
-          hyprlax-ctl-x86_64
           SHA256SUMS
         draft: false
         prerelease: ${{ contains(steps.version.outputs.version, '-') }}
@@ -110,7 +110,7 @@ jobs:
           --suppress=unusedFunction \
           --suppress=constVariablePointer \
           --inline-suppr \
-          src/ipc.c src/hyprlax-ctl.c
+          src/ipc.c src/hyprlax_ctl.c
     
     - name: Check code formatting
       run: |