Implement current suggestions

.editorconfig

@@ -14,3 +14,8 @@ trim_trailing_whitespace = true
 
 [{CMakeLists.txt,*.cmake}]
 indent_size = 2
+insert_final_newline = true
+
+[*.{json,xml.in,desktop.in}]
+indent_size = 2
+insert_final_newline = true

.github/workflows/release.yml

@@ -4,9 +4,7 @@ on:
   push:
     branches:
       - master
-
-env:
-  APP_ID: org.legoisland.Isle
+      - flatpak
 
 jobs:
   build:
@@ -118,8 +116,8 @@ jobs:
       - name: Build Flatpak
         uses: flatpak/flatpak-github-actions/flatpak-builder@v6
         with:
-          bundle: ${{ env.APP_ID }}.${{ matrix.arch }}.flatpak
-          manifest-path: packaging/linux/flatpak/${{ env.APP_ID }}.json
+          bundle: org.legoisland.Isle.${{ matrix.arch }}.flatpak
+          manifest-path: packaging/linux/flatpak/org.legoisland.Isle.json
           arch: ${{ matrix.arch }}
   
   release:

packaging/CMakeLists.txt

@@ -6,9 +6,9 @@ set(APP_SPDX "LGPL-3.0-or-later")
 string(TIMESTAMP BUILD_DATE UTC)
 
 # The following will need to be refined if we wish to post actual releases to a repo such as Flathub
-if(DEFINED ENV{GITHUB_RUN_ATTEMPT})
+if(DEFINED ENV{GITHUB_ACTIONS} AND ENV{GITHUB_ACTIONS} EQUAL TRUE)
     # Use the sequential run# of the current pipeline when running in GH Actions
-    set(SEMANTIC_VERSION "${PROJECT_VERSION}~build$ENV{GITHUB_RUN_ATTEMPT}")
+    set(SEMANTIC_VERSION "${PROJECT_VERSION}~build$ENV{GITHUB_RUN_NUMBER}")
 else()
     # Don't worry about the build number for local builds
     set(SEMANTIC_VERSION "${PROJECT_VERSION}")

packaging/linux/isledecomp.desktop.in

@@ -28,8 +28,10 @@ Actions=play;configure
 
 [Desktop Action play]
 Name=Play Game
+Icon=currenttrack_play
 Exec=isle
 
 [Desktop Action configure]
 Name=Configure Settings
-Exec=config
+Icon=settings
+Exec=isle-config

packaging/linux/isledecomp.metainfo.xml.in

@@ -84,6 +84,6 @@
   </keywords>
 
   <releases>
-    <release version="@SEMANTIC_VERSION@" type="development" date="@BUILD_DATE@"/>
+    <release version="@SEMANTIC_VERSION@" type="development" date="@BUILD_DATE@" />
   </releases>
-</component>
+</component>