From b592fb821d0d553cb1b9bdc5b31833d1c7e64a06 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Wed, 1 Nov 2023 08:45:46 +0200 Subject: [PATCH 1/2] Flatpak --- .github/workflows/build.yml | 2 +- flatpak/com.invoiceninja.app.desktop | 10 +++---- flatpak/com.invoiceninja.app.metainfo.xml | 35 ++++++++--------------- snap/snapcraft.yaml | 2 +- 4 files changed, 19 insertions(+), 30 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d4457fb99f3..8553a0bc644 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ jobs: uses: actions/checkout@v1 - name: Setup Flutter - uses: subosito/flutter-action@v1 + uses: subosito/flutter-action@v2 with: flutter-version: '3.13.6' #channel: 'stable' diff --git a/flatpak/com.invoiceninja.app.desktop b/flatpak/com.invoiceninja.app.desktop index 1b9f9a99f1d..2b0704d5a37 100644 --- a/flatpak/com.invoiceninja.app.desktop +++ b/flatpak/com.invoiceninja.app.desktop @@ -3,10 +3,10 @@ Version=1.0 Type=Application Name=Invoice Ninja -Comment=An example app that counts -Categories=Utility;Amusement; +Comment=Create invoices, accept payments, track expenses & time tasks +Categories=Productivity; -Icon=com.example.FlutterApp -Exec=flutter_flatpak_example +Icon=com.invoiceninja.app +Exec=invoiceninja_client Terminal=false -StartupWMClass=flutter_flatpak_example \ No newline at end of file +StartupWMClass=invoiceninja_client \ No newline at end of file diff --git a/flatpak/com.invoiceninja.app.metainfo.xml b/flatpak/com.invoiceninja.app.metainfo.xml index 8a463263448..12a985f5b15 100644 --- a/flatpak/com.invoiceninja.app.metainfo.xml +++ b/flatpak/com.invoiceninja.app.metainfo.xml @@ -4,40 +4,29 @@ https://www.freedesktop.org/software/appstream/metainfocreator/#/ --> - com.example.FlutterApp - Flutter App - An example app that counts - Kristen McWilliam - https://github.com/Merrit/flutter_flatpak_example - MIT - MIT + com.invoiceninja.app + Invoice Ninja + Create invoices, accept payments, track expenses & time tasks + Hillel Coren + https://invoiceninja.com + AAL + AAL pointing keyboard touch -

Fast and beautiful counting app. For all your counting needs!

-

Features

-
    -
  • Counts!
    • -
  • Cooks!
    • -
  • Cleans!
    • -
  • Comets!
    • -
  • Dinosaurs!
    • -
  • .. Burritos?
    • -
  • Burritos!!
    • -
  • -
+

Create invoices, accept payments, track expenses & time tasks

 - com.example.FlutterApp.desktop + com.invoiceninja.app.desktop - https://raw.githubusercontent.com/Merrit/flutter_flatpak_example/main/screenshots/screenshot.png + https://github.com/invoiceninja/flutter-mobile/blob/master/samples/screenshots/1.png - + - + \ No newline at end of file diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 35bbce8a185..4d1c820b287 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,6 +1,6 @@ name: invoiceninja version: '5.0.127' -summary: Create invoices, accept payments, track expenses & time-tasks +summary: Create invoices, accept payments, track expenses & time tasks description: "### Note: if the app fails to run using `snap run invoiceninja` it may help to run `/snap/invoiceninja/current/bin/invoiceninja` instead Create. Send. Get Paid. From 2a125a366659e66cf60b0225ecd05a9f88b9fc1f Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Wed, 1 Nov 2023 12:02:23 +0200 Subject: [PATCH 2/2] Update app version --- .github/workflows/build.yml | 5 +++++ .github/workflows/flatpak.yml | 27 +++++++++++++++++++++++++-- assets/images/logo.svg | 2 ++ lib/constants.dart | 2 +- pubspec.foss.yaml | 2 +- pubspec.yaml | 2 +- snap/snapcraft.yaml | 2 +- 7 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 assets/images/logo.svg diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8553a0bc644..c6843318652 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,6 +4,11 @@ on: push: branches: - master + +concurrency: + group: ci-release-${{ github.ref }}-1 + cancel-in-progress: true + jobs: build-main: name: Build Web - MAIN diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml index 4f31fa439ce..61e8310f02c 100644 --- a/.github/workflows/flatpak.yml +++ b/.github/workflows/flatpak.yml @@ -6,6 +6,10 @@ on: # branches: # - master +concurrency: + group: ci-release-${{ github.ref }}-1 + cancel-in-progress: true + env: project-id: com.invoiceninja.app @@ -14,6 +18,7 @@ jobs: name: Build Flutter app env: api_secret: ${{secrets.api_secret}} + commit_secret: ${{secrets.commit_secret}} runs-on: ubuntu-20.04 steps: - name: Checkout code @@ -58,8 +63,26 @@ jobs: - name: Upload app archive to workflow uses: actions/upload-artifact@v3 with: - name: Invoice-Ninja-Archive - path: Invoice-Ninja-Linux-Portable.tar.gz + #name: Invoice-Ninja-Archive + #path: Invoice-Ninja-Linux-Portable.tar.gz + name: linux-artifacts + path: output/* + + - name: Download artifacts + uses: actions/download-artifact@v3 + with: + path: artifacts + + - name: Create Draft Release & Upload artifacts + uses: marvinpinto/action-automatic-releases@v1.2.1 + with: + repo_token: "${{secrets.commit_secret}}" + draft: true + prerelease: false + title: "Latest Release" + automatic_release_tag: "v5.0.128" + files: | + ${{ github.workspace }}/artifacts/linux-artifacts/* # build-flatpak: # name: Build flatpak diff --git a/assets/images/logo.svg b/assets/images/logo.svg new file mode 100644 index 00000000000..8e838c8f887 --- /dev/null +++ b/assets/images/logo.svg @@ -0,0 +1,2 @@ + +Invoice Ninja icon \ No newline at end of file diff --git a/lib/constants.dart b/lib/constants.dart index 2722e3861bd..011fbf0555d 100644 --- a/lib/constants.dart +++ b/lib/constants.dart @@ -4,7 +4,7 @@ class Constants { } // TODO remove version once #46609 is fixed -const String kClientVersion = '5.0.127'; +const String kClientVersion = '5.0.128'; const String kMinServerVersion = '5.0.4'; const String kAppName = 'Invoice Ninja'; diff --git a/pubspec.foss.yaml b/pubspec.foss.yaml index 7acc0400db8..450d2b66c35 100644 --- a/pubspec.foss.yaml +++ b/pubspec.foss.yaml @@ -1,6 +1,6 @@ name: invoiceninja_flutter description: Client for Invoice Ninja -version: 5.0.127+127 +version: 5.0.128+128 homepage: https://invoiceninja.com documentation: https://invoiceninja.github.io publish_to: none diff --git a/pubspec.yaml b/pubspec.yaml index 209d8d69ebd..2805ca5ca0d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: invoiceninja_flutter description: Client for Invoice Ninja -version: 5.0.127+127 +version: 5.0.128+128 homepage: https://invoiceninja.com documentation: https://invoiceninja.github.io publish_to: none diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 4d1c820b287..20900ff0adb 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,5 +1,5 @@ name: invoiceninja -version: '5.0.127' +version: '5.0.128' summary: Create invoices, accept payments, track expenses & time tasks description: "### Note: if the app fails to run using `snap run invoiceninja` it may help to run `/snap/invoiceninja/current/bin/invoiceninja` instead