From 342d8aaf718192b1214f3301176c2a6177238309 Mon Sep 17 00:00:00 2001
From: Darrell Roberts <droberts0674@gmail.com>
Date: Thu, 2 Jan 2025 12:45:21 -0500
Subject: [PATCH] update ci

---
 .github/workflows/release.yml |  5 +++--
 Makefile                      |  5 ++---
 minesweeper-iced/Cargo.toml   | 26 +++++++++++++++++++++-----
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d8a9e48..065f2dc 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -69,7 +69,7 @@ jobs:
           sudo add-apt-repository universe
           sudo apt install libfuse2t64
 
-      - name: Build bundle
+      - name: Build app image
         run: |
           export PATH=$HOME/.local/bin:$PATH
           make linux-app-image
@@ -93,7 +93,8 @@ jobs:
         uses: softprops/action-gh-release@v1
         with:
           files: |
-            MineSweeper-x86_64.AppImage
+            *.AppImage
             target/debian/*.deb
+            *.flatpak
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/Makefile b/Makefile
index 609b3d8..17e51d1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,3 @@
-
 PLATFORM := $(shell uname)
 
 all: build
@@ -58,7 +57,7 @@ linux-app-image: clean-dist build
 
 	# Copy contents into AppDir
 	cp target/release/minesweeper-iced dist/AppDir/usr/bin
-	cp assets/minesweeper.desktop dist/AppDir/usr/share/applications
+	cp assets/io.github.darrellroberts.minesweeper.desktop dist/AppDir/usr/share/applications
 	cp -r assets/icons dist/AppDir/usr/share
 
 	# Create app image
@@ -73,7 +72,7 @@ install-local-linux: build
 	mkdir -p ~/.local/share/icons
 	mkdir -p ~/.local/bin
 	cp target/release/minesweeper-iced ~/.local/bin
-	cp assets/minesweeper.desktop ~/.local/share/applications
+	cp assets/io.github.darrellroberts.minesweeper.desktop ~/.local/share/applications
 	cp -r assets/icons ~/.local/share/icons
 
 install:
diff --git a/minesweeper-iced/Cargo.toml b/minesweeper-iced/Cargo.toml
index 7fb9229..4ca3353 100644
--- a/minesweeper-iced/Cargo.toml
+++ b/minesweeper-iced/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "minesweeper-iced"
-version = "0.1.0"
+version = "0.1.4"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -17,8 +17,24 @@ extended-description = """MineSweeper"""
 section = "games"
 priority = "optional"
 assets = [
-    ["target/release/minesweeper-iced", "usr/bin/", "755"],
-    ["../assets/minesweeper.desktop", "usr/share/applications/", "644"],
-    ["../assets/icons/hicolor/32x32/apps/minesweeper.png", "usr/share/icons/hicolor/32x32/apps/", "644"],
-    ["../assets/icons/hicolor/128x128/apps/minesweeper.png", "usr/share/icons/hicolor/128x128/apps/", "644"],
+  [
+    "target/release/minesweeper-iced",
+    "usr/bin/",
+    "755",
+  ],
+  [
+    "../assets/io.github.darrellroberts.minesweeper.desktop",
+    "usr/share/applications/",
+    "644",
+  ],
+  [
+    "../assets/icons/hicolor/32x32/apps/minesweeper.png",
+    "usr/share/icons/hicolor/32x32/apps/",
+    "644",
+  ],
+  [
+    "../assets/icons/hicolor/128x128/apps/minesweeper.png",
+    "usr/share/icons/hicolor/128x128/apps/",
+    "644",
+  ],
 ]