Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
hillelcoren committed Nov 1, 2023
2 parents 00e709c + 500548c commit 4b1cf7f
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 20 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ on:
branches:
- master

concurrency:
group: ci-release-${{ github.ref }}-1
cancel-in-progress: true
#concurrency:
# group: ci-release-${{ github.ref }}-1
# cancel-in-progress: true

jobs:
build-main:
Expand Down
27 changes: 12 additions & 15 deletions .github/workflows/flatpak.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ on:
# branches:
# - master

concurrency:
group: ci-release-${{ github.ref }}-1
cancel-in-progress: true
#concurrency:
# group: ci-release-${{ github.ref }}-1
# cancel-in-progress: true

env:
project-id: com.invoiceninja.app
Expand All @@ -17,8 +17,8 @@ jobs:
build-flutter-app:
name: Build Flutter app
env:
api_secret: ${{secrets.api_secret}}
commit_secret: ${{secrets.commit_secret}}
api_secret: ${{ secrets.api_secret }}
commit_secret: ${{ secrets.commit_secret }}
runs-on: ubuntu-20.04
steps:
- name: Checkout code
Expand All @@ -43,13 +43,12 @@ jobs:
- name: Prepare App
run: |
cp lib/.env.dart.example lib/.env.dart
sed -i 's/secret/${{secrets.api_secret}}/g' lib/.env.dart
sed -i 's/secret/${{ secrets.api_secret }}/g' lib/.env.dart
echo "const FLUTTER_VERSION = const <String, String>" > lib/flutter_version.dart
flutter --version --machine >> lib/flutter_version.dart
echo ";" >> lib/flutter_version.dart
- name: Build Flutter linux version
#working-directory: ${{ github.workspace }}/counter_app
run: |
archiveName=Invoice-Ninja-Linux-Portable.tar.gz
baseDir=$(pwd)
Expand All @@ -63,26 +62,24 @@ 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: linux-artifacts
path: output/*
name: Invoice-Ninja-Archive
path: Invoice-Ninja-Linux-Portable.tar.gz

- name: Download artifacts
uses: actions/download-artifact@v3
with:
path: artifacts

- name: Create Draft Release & Upload artifacts
- name: Create Release
uses: marvinpinto/action-automatic-releases@v1.2.1
with:
repo_token: "${{secrets.commit_secret}}"
draft: true
repo_token: "${{ secrets.commit_secret }}"
draft: false
prerelease: false
title: "Latest Release"
automatic_release_tag: "v5.0.128"
files: |
${{ github.workspace }}/artifacts/linux-artifacts/*
${{ github.workspace }}/artifacts/Invoice-Ninja-Archive
# build-flatpak:
# name: Build flatpak
Expand Down
24 changes: 22 additions & 2 deletions flatpak/com.invoiceninja.app.metainfo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,27 @@
<control>touch</control>
</supports>
<description>
<p>Create invoices, accept payments, track expenses &amp; time tasks</p>
<p>Create. Send. Get Paid.</p>
<p>Invoice Ninja is a leading source-code available platform for SMB’s to invoice, accept payments, track expenses & time billable-tasks. Designed for freelancers and small to medium size businesses, Invoice Ninja is a suite of apps to help you get paid.</p>
<p>
• Incredibly easy to use<br/>
Invoice Ninja was built to serve freelancers and business owners with a complete suite of invoicing &amp; payment tools to advance your business.
</p>
<p>
• Invoicing &amp; Payments<br/>
Every feature is geared towards accurate and secure invoicing and getting you paid. With Invoice Ninja you can send beautiful branded invoices with minimum of effort and maximum professionalism.
</p>
<p>
• Time Tracker &amp; Projects<br/>
Create projects and individual tasks per project. When done, simply “Send task to invoice” and all details will be sent ready for your clients to pay!
</p>
<p>
• Track Vendors &amp; Expenses<br/>
With Invoice Ninja, all your earnings, expenses, clients and vendors are stored and managed in one system. Categorize your vendors &amp; re-invoice expenses to clients, or simply run expense reports.
</p>
<p>
All of these features combine to help you receive the money you deserve and reduce the amount of time you spend on repetitive invoicing tasks. Spend less time on paperwork and more time at your craft.
</p>
</description>
<launchable type="desktop-id">com.invoiceninja.app.desktop</launchable>
<screenshots>
Expand All @@ -27,6 +47,6 @@
</screenshots>
<content_rating type="oars-1.1"/>
<releases>
<release version="5.0.127" date="2023-10-31"/>
<release version="5.0.128" date="2023-11-01"/>
</releases>
</component>

0 comments on commit 4b1cf7f

Please sign in to comment.