From cdbcc935711d04553a05f981c3941ae4c93e6470 Mon Sep 17 00:00:00 2001 From: Prateek Sunal Date: Thu, 19 Sep 2024 01:04:47 +0530 Subject: [PATCH 1/3] chore: lint fixes --- auth/lib/ui/home/coach_mark_widget.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/auth/lib/ui/home/coach_mark_widget.dart b/auth/lib/ui/home/coach_mark_widget.dart index 9234aa7074..52d97bf26b 100644 --- a/auth/lib/ui/home/coach_mark_widget.dart +++ b/auth/lib/ui/home/coach_mark_widget.dart @@ -5,7 +5,6 @@ import 'package:ente_auth/events/codes_updated_event.dart'; import 'package:ente_auth/l10n/l10n.dart'; import 'package:ente_auth/services/preference_service.dart'; import 'package:ente_auth/utils/platform_util.dart'; -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; class CoachMarkWidget extends StatelessWidget { From 484b05bdb2e8a33a27ea674cade278b6cd152f8e Mon Sep 17 00:00:00 2001 From: Prateek Sunal Date: Wed, 25 Sep 2024 00:16:59 +0530 Subject: [PATCH 2/3] fix: update receipe for linux and windows --- .github/workflows/auth-release.yml | 8 +++++--- auth/linux/packaging/appimage/make_config.yaml | 9 +++++---- auth/linux/packaging/rpm/make_config.yaml | 1 + auth/windows/packaging/exe/make_config.yaml | 1 + 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/auth-release.yml b/.github/workflows/auth-release.yml index d129252f4c..1d9fd7d0de 100644 --- a/.github/workflows/auth-release.yml +++ b/.github/workflows/auth-release.yml @@ -91,7 +91,8 @@ jobs: - name: Build desktop app run: | flutter config --enable-linux-desktop - dart pub global activate flutter_distributor + # dart pub global activate flutter_distributor + dart pub global activate --source git https://github.com/prateekmedia/flutter_distributor --git-ref develop --git-path packages/flutter_distributor flutter_distributor package --platform=linux --targets=deb --skip-clean mv dist/**/*-*-linux.deb artifacts/ente-${{ github.ref_name }}-x86_64.deb env: @@ -158,7 +159,7 @@ jobs: run: | flutter config --enable-linux-desktop # dart pub global activate flutter_distributor - dart pub global activate --source git https://github.com/prateekmedia/flutter_distributor --git-ref pacman --git-path packages/flutter_distributor + dart pub global activate --source git https://github.com/prateekmedia/flutter_distributor --git-ref develop --git-path packages/flutter_distributor # Run below command if it is a beta or nightly if [[ ${{ github.ref }} =~ beta|nightly ]]; then flutter_distributor package --platform=linux --targets=pacman --skip-clean @@ -206,7 +207,8 @@ jobs: - name: Build Windows installer run: | flutter config --enable-windows-desktop - dart pub global activate flutter_distributor + # dart pub global activate flutter_distributor + dart pub global activate --source git https://github.com/prateekmedia/flutter_distributor --git-ref develop --git-path packages/flutter_distributor make innoinstall flutter_distributor package --platform=windows --targets=exe --skip-clean mv dist/**/ente_auth-*-windows-setup.exe artifacts/ente-${{ github.ref_name }}-installer.exe diff --git a/auth/linux/packaging/appimage/make_config.yaml b/auth/linux/packaging/appimage/make_config.yaml index 17211cb477..7249af876b 100644 --- a/auth/linux/packaging/appimage/make_config.yaml +++ b/auth/linux/packaging/appimage/make_config.yaml @@ -1,4 +1,5 @@ display_name: Ente Auth +package_name: enteauth license: GPLv3 metainfo: linux/packaging/ente_auth.appdata.xml @@ -26,9 +27,9 @@ startup_notify: false # include: # - libcurl.so.4 include: - - libffi.so.8 - - libtiff.so.5 - - libjpeg.so.8 + - libffi.so.8 + - libtiff.so.5 + - libjpeg.so.8 supported_mime_type: - - x-scheme-handler/enteauth \ No newline at end of file + - x-scheme-handler/enteauth diff --git a/auth/linux/packaging/rpm/make_config.yaml b/auth/linux/packaging/rpm/make_config.yaml index 6f6c45153a..945cf3f13b 100644 --- a/auth/linux/packaging/rpm/make_config.yaml +++ b/auth/linux/packaging/rpm/make_config.yaml @@ -6,6 +6,7 @@ packager: Ente.io Developers packagerEmail: auth@ente.io license: GPLv3 url: https://github.com/ente-io/ente +package_name: enteauth display_name: Auth diff --git a/auth/windows/packaging/exe/make_config.yaml b/auth/windows/packaging/exe/make_config.yaml index 378d2d4d8c..efd1736446 100644 --- a/auth/windows/packaging/exe/make_config.yaml +++ b/auth/windows/packaging/exe/make_config.yaml @@ -1,4 +1,5 @@ app_id: 9E5F0C93-96A3-4DA9-AE52-1AA6339851FC +package_name: enteauth publisher: ente.io publisher_url: https://github.com/ente-io/ente display_name: Ente Auth From 3292655ff7aa22b4b3363508c1f186bd33bb0ab5 Mon Sep 17 00:00:00 2001 From: Prateek Sunal Date: Fri, 27 Sep 2024 00:21:30 +0530 Subject: [PATCH 3/3] fix(deb): don't include build number in desktop file 'Version' --- auth/linux/packaging/deb/make_config.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/auth/linux/packaging/deb/make_config.yaml b/auth/linux/packaging/deb/make_config.yaml index 022e1ea38e..6fa5b371b8 100644 --- a/auth/linux/packaging/deb/make_config.yaml +++ b/auth/linux/packaging/deb/make_config.yaml @@ -1,5 +1,7 @@ display_name: Ente Auth package_name: enteauth +include_build_number: false + maintainer: name: Ente.io Developers email: auth@ente.io