chore: improve github action (#105)

* fix build step

* fix ci

* fix build

* fix ci on linux

* .

* fix flatpak

* .

* .

* .

* fix snap

* .

* .

* .

* .

* fix

* .

* .

* fix path

* .

* .

* fix upload artifacts

* fix build on arm

* fix snap arm

* .

* .

script/bundle-freebsd

@@ -0,0 +1 @@
+# TODO

script/bundle-linux

@@ -83,7 +83,7 @@ coop_dir="${temp_dir}/coop.app"
 # Binary
 mkdir -p "${coop_dir}/bin" "${coop_dir}/libexec"
 cp "${target_dir}/${target_triple}/release/coop" "${coop_dir}/libexec/coop"
-cp "${target_dir}/${target_triple}/release/cli" "${coop_dir}/bin/coop"
+cp "${target_dir}/${target_triple}/release/coop" "${coop_dir}/bin/coop"
 
 # Libs
 find_libs() {

script/bundle-snap

@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+set -euxo pipefail
+
+if [ "$#" -ne 1 ]; then
+  echo "Usage: $0 <release_version>"
+  exit 1
+fi
+
+# Get system architecture
+ARCH=$(uname -m)
+case "$ARCH" in
+  x86_64) ARCH_SUFFIX="x86_64" ;;
+  aarch64) ARCH_SUFFIX="aarch64" ;;
+  *) echo "Unsupported architecture: $ARCH"; exit 1 ;;
+esac
+
+# Setup GUI files
+mkdir -p snap/gui
+export DO_STARTUP_NOTIFY="true"
+export APP_NAME="Coop"
+export APP_ICON="\${SNAP}/meta/gui/coop.png"
+export APP_ARGS="%U"
+envsubst < "crates/coop/resources/coop.desktop.in" > "snap/gui/coop.desktop"
+cp "crates/coop/resources/icon.png" "snap/gui/coop.png"
+
+# Generate snapcraft.yaml with version and architecture
+RELEASE_VERSION="$1" ARCH_SUFFIX="$ARCH_SUFFIX" envsubst < crates/coop/resources/snap/snapcraft.yaml.in > snap/snapcraft.yaml
+
+# Clean previous builds
+snapcraft clean
+
+# Build snap with architecture in filename
+SNAP_NAME="coop_${1}_${ARCH_SUFFIX}.snap"
+snapcraft --destructive-mode --output "$SNAP_NAME"
+
+echo "Created snap package: $SNAP_NAME"

script/flatpak/bundle-flatpak

@@ -4,18 +4,32 @@ set -euo pipefail
 cd "$(dirname "$0")/../.."
 shopt -s extglob
 
-script/bundle-linux --flatpak
-archive_match="zed(-[a-zA-Z0-9]+)?-linux-$(uname -m)\.tar\.gz"
+# Get system architecture
+ARCH=$(uname -m)
+case "$ARCH" in
+  x86_64) ARCH_SUFFIX="x86_64" ;;
+  aarch64) ARCH_SUFFIX="aarch64" ;;
+  *) echo "Unsupported architecture: $ARCH"; exit 1 ;;
+esac
+
+archive_match="coop(-[a-zA-Z0-9]+)?-linux-${ARCH_SUFFIX}\.tar\.gz"
 archive=$(ls "target/release" | grep -E ${archive_match})
 
 export ARCHIVE="$archive"
 export APP_ID="su.reya.coop"
 export APP_NAME="Coop"
-export BRANDING_LIGHT="#99c1f1"
-export BRANDING_DARK="#1a5fb4"
+export BRANDING_LIGHT="#FFE629"
+export BRANDING_DARK="#FFE629"
 export ICON_FILE="icon"
+export CHANNEL="stable"
 
+# Generate manifest
 envsubst < "crates/coop/resources/flatpak/manifest-template.json" > "$APP_ID.json"
+
+# Build Flatpak
 flatpak-builder --user --install --force-clean build "$APP_ID.json"
-flatpak build-bundle ~/.local/share/flatpak/repo "target/release/$APP_ID.flatpak" "$APP_ID"
-echo "Created 'target/release/$APP_ID.flatpak'"
+
+# Create bundle with architecture suffix
+OUTPUT_FILE="target/release/${APP_ID}_${ARCH_SUFFIX}.flatpak"
+flatpak build-bundle ~/.local/share/flatpak/repo "$OUTPUT_FILE" "$APP_ID"
+echo "Created '$OUTPUT_FILE'"

script/snap-build

@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-
-set -euxo pipefail
-
-if [ "$#" -ne 1 ]; then
-  echo "Usage: $0 <release_version>"
-  exit 1
-fi
-
-mkdir -p snap/gui
-
-export DO_STARTUP_NOTIFY="true"
-export APP_NAME="Coop"
-export APP_CLI="coop"
-export APP_ICON="\${SNAP}/meta/gui/coop.png"
-export APP_ARGS="%U"
-envsubst < "crates/coop/resources/coop.desktop.in" > "snap/gui/coop.desktop"
-cp "crates/coop/resources/icon.png" "snap/gui/coop.png"
-
-RELEASE_VERSION="$1" envsubst < crates/coop/resources/snap/snapcraft.yaml.in > snap/snapcraft.yaml
-
-# Clean seems to be needed to actually check that the snapcraft.yaml
-# works.  For example, when a `stage-package` is removed, it will
-# still remain on rebuild.
-snapcraft clean
-
-snapcraft