Fix justfile and CI hopefully

sandorex · Aug 26, 2024 · ee5c8e0 · ee5c8e0
1 parent 50ea1c8
commit ee5c8e0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/.github/workflows/builder.yaml b/.github/workflows/builder.yaml
@@ -40,12 +40,12 @@ jobs:
           prerelease: true
           body: "Latest dev build"
           files: | # NOTE: files have to be overriden otherwise they will stay outdated so no version in name
-            CompacityFonts.zip
+            package/CompacityFonts.zip
 
       - name: Release Tagged Build
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')
         with:
           fail_on_unmatched_files: true
           files: |
-            *.zip
+            package/*.zip
diff --git a/justfile b/justfile
@@ -86,12 +86,18 @@ package *target: (build target)
     # move to package build dir
     cd "{{ PACKAGE_DIR }}"
 
+    if command -v 7za &>/dev/null; then
+        _7ZIP=7za
+    else
+        _7ZIP=7z
+    fi
+
     # package each font
     for i in $FONTS; do
         echo "Packaging font $i"
-        7za a "Compacity${i^}.zip" "{{ BUILD_DIR }}/Compacity${i^}"* >/dev/null
+        "$_7ZIP" a "Compacity${i^}.zip" "{{ BUILD_DIR }}/Compacity${i^}"* >/dev/null
     done
 
     # package all the fonts for the CI
-    7za a CompacityFonts.zip "{{ BUILD_DIR }}"/* >/dev/null
+    "$_7ZIP" a CompacityFonts.zip "{{ BUILD_DIR }}"/* >/dev/null