ci: more changes to nfpm config

.gitlab-ci.yml

@@ -192,6 +192,13 @@ desktop/linux/amd64:
   image: dock.mau.dev/tulir/gomuks-build-docker/wails:linux-amd64
   variables:
     PLATFORM: linux
+  after_script:
+  - mv desktop/bin/gomuks-desktop .
+  - mv desktop/build/nfpm/bin/gomuks-desktop.deb .
+  artifacts:
+    paths:
+    - gomuks-desktop
+    - gomuks-desktop.deb
   tags:
   - linux
   - amd64
@@ -201,6 +208,13 @@ desktop/linux/arm64:
   image: dock.mau.dev/tulir/gomuks-build-docker/wails:linux-arm64-native
   variables:
     PLATFORM: linux
+  after_script:
+  - mv desktop/bin/gomuks-desktop .
+  - mv desktop/build/nfpm/bin/gomuks-desktop.deb .
+  artifacts:
+    paths:
+    - gomuks-desktop
+    - gomuks-desktop.deb
   tags:
   - linux
   - arm64

desktop/build/Taskfile.linux.yml

@@ -31,8 +31,8 @@ tasks:
     cmds:
       #- task: create:appimage
       - task: create:deb
-      - task: create:rpm
-      - task: create:aur
+      #- task: create:rpm
+      #- task: create:aur
 
   create:appimage:
     summary: Creates an AppImage
@@ -102,15 +102,14 @@ tasks:
     summary: Generates a `.desktop` file
     dir: build
     cmds:
-      - mkdir -p {{.ROOT_DIR}}/build/nfpm/bin
-      - wails3 generate .desktop -name "{{.APP_NAME}}" -exec "{{.EXEC}}" -icon "{{.ICON}}" -outputfile {{.ROOT_DIR}}/build/nfpm/bin/{{.APP_NAME}}.desktop -categories "{{.CATEGORIES}}"
+      - mkdir -p {{.ROOT_DIR}}/build
+      - wails3 generate .desktop -name "{{.APP_NAME}}" -exec "{{.EXEC}}" -icon "{{.ICON}}" -outputfile {{.ROOT_DIR}}/build/{{.APP_NAME}}.desktop -categories "{{.CATEGORIES}}"
     vars:
       APP_NAME: '{{.APP_NAME}}'
       EXEC: '{{.APP_NAME}}'
       ICON: 'appicon'
       CATEGORIES: 'Network;InstantMessaging;Chat;'
-      #OUTPUTFILE: '{{.ROOT_DIR}}/build/appimage/{{.APP_NAME}}.desktop'
-      OUTPUTFILE: '{{.ROOT_DIR}}/build/nfpm/bin/{{.APP_NAME}}.desktop'
+      OUTPUTFILE: '{{.ROOT_DIR}}/build/{{.APP_NAME}}.desktop'
 
   run:
     cmds:

desktop/build/nfpm/nfpm.yaml

@@ -9,7 +9,7 @@ platform: "linux"
 version: "0.4.0"
 section: "default"
 priority: "extra"
-maintainer: ${GIT_COMMITTER_NAME} <${GIT_COMMITTER_EMAIL}>
+maintainer: Tulir Asokan <tulir@maunium.net>
 description: "A Matrix client written in Go and React"
 vendor: ""
 homepage: "https://wails.io"
@@ -35,8 +35,8 @@ depends:
 # depends:
 #   - gtk3
 #   - libwebkit2gtk
-# recommends:
-#   - whatever
+recommends:
+  - ffmpeg
 # suggests:
 #   - something-else
 # conflicts: