simplify CI, use better fix for locale issue (#19)

Author: Samueru-sama

.github/workflows/blank.yml

@@ -4,7 +4,7 @@ concurrency:
   cancel-in-progress: true
 on:
   schedule:
-    - cron: "0 21 * * 0"
+    - cron: "0 7 1/14 * *"
   workflow_dispatch:
 
 jobs:
@@ -22,61 +22,46 @@ jobs:
             arch: aarch64
     container: ghcr.io/pkgforge-dev/archlinux:latest
     steps:
-    - uses: actions/checkout@v4
+      - uses: actions/checkout@v4
 
-    - name: Get dependencies
-      run: chmod +x ./get-dependencies.sh && ./get-dependencies.sh
+      - name: Get dependencies
+        run: chmod +x ./get-dependencies.sh && ./get-dependencies.sh
 
-    - name: Make AppImage
-      run: chmod +x ./*-appimage.sh && ./*-appimage.sh
+      - name: Make AppImage
+        run: chmod +x ./*-appimage.sh && ./*-appimage.sh
 
-    - name: Upload artifact
-      uses: actions/[email protected]
-      with:
-        name: AppImage-${{ matrix.arch }}
-        path: "dist"
-
-    - name: Upload version file
-      uses: actions/[email protected]
-      with:
-        name: version
-        path: ~/version
-        overwrite: true
+      - name: Upload artifact
+        uses: actions/[email protected]
+        with:
+          name: AppImage-${{ matrix.arch }}
+          path: dist
 
   release:
-      if: ${{ github.ref_name == 'main' }}
-      needs: [build]
-      permissions: write-all
-      runs-on: ubuntu-latest
-
-      steps:
-        - uses: actions/[email protected]
-          with:
-            name: AppImage-x86_64
-
-        - uses: actions/[email protected]
-          with:
-            name: AppImage-aarch64
-
-        - uses: actions/[email protected]
-          with:
-            name: version
+    if: ${{ github.ref_name == 'main' }}
+    needs: [build]
+    permissions: write-all
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/[email protected]
+        with:
+          pattern: AppImage-*
+          merge-multiple: true
 
-        - name: Read version and Get date
-          run: |
-            echo "VERSION=$(cat version)" >> "${GITHUB_ENV}"
-            echo "DATE=$(date +'%Y-%m-%d_%s')" >> "$GITHUB_ENV"
+      - name: Read version and Get date
+        run: |
+          echo "VERSION=$(cat version)" >> "${GITHUB_ENV}"
+          echo "DATE=$(date +'%Y-%m-%d_%s')" >> "$GITHUB_ENV"
 
-        - name: Release Artifacts
-          uses: softprops/[email protected]
-          with:
-            name: "rofi: ${{ env.VERSION }}"
-            tag_name: "${{ env.VERSION }}@${{ env.DATE }}"
-            prerelease: false
-            draft: false
-            generate_release_notes: false
-            fail_on_unmatched_files: false
-            make_latest: true
-            files: |
-              *.AppImage*
-              *.AppBundle*
+      - name: Release Artifacts
+        uses: softprops/[email protected]
+        with:
+          name: "rofi: ${{ env.VERSION }}"
+          tag_name: "${{ env.VERSION }}@${{ env.DATE }}"
+          prerelease: false
+          draft: false
+          generate_release_notes: false
+          fail_on_unmatched_files: false
+          make_latest: true
+          files: |
+            *.AppImage*
+            *.AppBundle*

get-dependencies.sh

@@ -2,7 +2,6 @@
 
 set -ex
 EXTRA_PACKAGES="https://raw.githubusercontent.com/pkgforge-dev/Anylinux-AppImages/refs/heads/main/useful-tools/get-debloated-pkgs.sh"
-PATCH="$PWD"/locale-fix.patch
 
 echo "Installing build dependencies..."
 echo "---------------------------------------------------------------"
@@ -43,7 +42,6 @@ echo "Building rofi..."
 echo "---------------------------------------------------------------"
 git clone --depth 1 "https://github.com/davatorium/rofi.git" ./rofi && (
 	cd ./rofi
-	patch -p1 -i "$PATCH"
 	meson --prefix /usr . build
 	meson compile -C build
 	meson install -C build

locale-fix.patch

@@ -4,22 +4,22 @@ set -eux
 
 ARCH="$(uname -m)"
 VERSION="$(cat ~/version)"
-SHARUN="https://raw.githubusercontent.com/pkgforge-dev/Anylinux-AppImages/refs/heads/execv-hook/useful-tools/quick-sharun.sh"
+SHARUN="https://raw.githubusercontent.com/pkgforge-dev/Anylinux-AppImages/refs/heads/main/useful-tools/quick-sharun.sh"
 URUNTIME="https://raw.githubusercontent.com/pkgforge-dev/Anylinux-AppImages/refs/heads/main/useful-tools/uruntime2appimage.sh"
-UPDATER="https://raw.githubusercontent.com/pkgforge-dev/Anylinux-AppImages/refs/heads/main/useful-tools/self-updater.bg.hook"
 
 export UPINFO="gh-releases-zsync|${GITHUB_REPOSITORY%/*}|${GITHUB_REPOSITORY#*/}|latest|*$ARCH.AppImage.zsync"
 export OUTNAME=rofi-"$VERSION"-anylinux-"$ARCH".AppImage
 export DESKTOP=/usr/share/applications/rofi.desktop
 export ICON=/usr/share/icons/hicolor/scalable/apps/rofi.svg
 export URUNTIME_PRELOAD=1 # really needed here
 export EXEC_WRAPPER=1 # needed here since this will launch other processes
+export LOCALE_FIX=1 # crashes when it cannot switch to host locale
 
 # ADD LIBRARIES
 wget --retry-connrefused --tries=30 "$SHARUN" -O ./quick-sharun
 chmod +x ./quick-sharun
 ./quick-sharun /usr/bin/rofi*
-echo 'unset ARGV0' > ./AppDir/.env
+echo 'unset ARGV0' >> ./AppDir/.env
 
 # MAKE APPIMAGE WITH URUNTIME
 wget --retry-connrefused --tries=30 "$URUNTIME" -O ./uruntime2appimage
@@ -46,5 +46,6 @@ zsyncmake ./*.AppBundle -u ./*.AppBundle
 mkdir -p ./dist
 mv -v ./*.AppImage*  ./dist
 mv -v ./*.AppBundle* ./dist
+mv -v ~/version      ./dist
 
 echo "All Done!"