Release 2.0 - Outlook

Author: AdityaGarg8

.github/workflows/outlook.yml .github/workflows/release.yml.github/workflows/outlook.yml renamed to .github/workflows/release.yml

@@ -1,15 +1,38 @@
 ---
-name: Release - Outlook
+name: Release - Debian and Fedora
 
 on:
   workflow_dispatch:
     inputs:
       version:
-        description: 'Version of the deb package'
+        description: 'Version of the deb and rpm package'
         required: true
 
 jobs:
+  Release-GitHub:
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Checkout Repo"
+        uses: actions/checkout@v4
+
+      - name: Create tag
+        if: github.ref == 'refs/heads/Mainline'
+        uses: rickstaa/action-create-tag@v1
+        with:
+          tag: "v${{ github.event.inputs.version }}"
+
+      - name: Release
+        if: github.ref == 'refs/heads/main'
+        uses: softprops/action-gh-release@v2
+        with:
+          files: |
+            ${{ github.workspace }}/git-send-outlook
+          tag_name: "v${{ github.event.inputs.version }}"
+          draft: false
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   Release-Debian:
+    needs: [Release-GitHub]
     runs-on: ubuntu-latest
     steps:
       - name: "Checkout Repo"
@@ -39,7 +62,7 @@ jobs:
           Version: ${{ github.event.inputs.version }}
           Section: utils
           Priority: optional
-          Depends: python3-msal, python3-keyring
+          Depends: python3-msal, python3-keyring, python3-trustme, python3-pyqt6, python3-pyqt6.qtwebengine
           Enhances: git
           Architecture: all
           Maintainer: Aditya Garg <gargaditya08@live.com>
@@ -66,6 +89,7 @@ jobs:
           GPG_SIGNING_EMAIL: ${{ secrets.GPG_SIGNING_EMAIL }}
           GH_TOKEN: ${{ secrets.PAT }}
   Release-Fedora:
+    needs: [Release-GitHub]
     runs-on: ubuntu-latest
     steps:
       - name: "Checkout Repo"
@@ -78,15 +102,18 @@ jobs:
           Name:           git-credential-outlook
           Version:        ${{ github.event.inputs.version }}
           Release:        1%{?dist}
-          Summary:        A git credential helper that uses Outlook credentials
+          Summary:        Git credential helper for Microsoft Outlook accounts.
 
-          License:        MIT
+          License:        Apache-2.0
           URL:            https://github.com/AdityaGarg8/git-credential-outlook-and-gmail
           Source0:        %{url}/archive/refs/tags/v${{ github.event.inputs.version }}.tar.gz
 
           BuildArch:      noarch
           Requires:       python-msal
           Requires:       python-keyring
+          Requires:       python-trustme
+          Requires:       python-pyqt6
+          Requires:       python-pyqt6-webengine
 
           %description
           Git credential helper for Microsoft Outlook accounts.
@@ -100,7 +127,7 @@ jobs:
           install -D -m0755 git-credential-outlook %{buildroot}%{_bindir}/git-credential-outlook
 
           %files
-          %license LICENSE.outlook
+          %license LICENSE
           %doc README.md
           %{_bindir}/git-credential-outlook
           EOF

LICENSE.outlook

@@ -23,29 +23,16 @@ It is a simple python script, based on https://github.com/ag91/M365-IMAP. It doe
 
 ### All platforms
 
-- Download the python script `git-credential-outlook` from [here](https://raw.githubusercontent.com/AdityaGarg8/git-credential-outlook/refs/heads/main/git-credential-outlook).
-- Install `msal` and `keyring` pip modules:
+- Download the python script `git-credential-outlook` from [here](https://github.com/AdityaGarg8/git-credential-outlook-and-gmail/releases/latest).
 
-  On Ubuntu/Debian run:
+- Make sure that the script is [located in the path](https://superuser.com/a/284351/62691) and [is executable](https://askubuntu.com/a/229592/18504).
 
-  ```bash
-  sudo apt-get install python3-msal python3-keyring
-  ```
-
-  On Fedora run:
-
-  ```bash
-  sudo dnf install python-msal python-keyring
-  ```
-
-  On other distros:
+- Install the required pip modules:
 
   ```bash
-  pip install msal keyring
+  pip install msal keyring trustme PyQt6 PyQt6-WebEngine
   ```
 
-- Place the script anywhere in your `$PATH`, like `/usr/local/bin`.
-
 ### Linux
 
 #### Ubuntu/Debian
@@ -79,18 +66,10 @@ sudo dnf install -y git-credential-outlook
   git credential-outlook --authenticate
   ```
 
-  The output should be something like this:
-
+- You can also add `--device` to authenticate on another device like in case of systems without a GUI.
   ```bash
-  user@hostname:~$ git credential-outlook --authenticate
-  Choose an authentication method:
-  1. Open your browser and login.
-  2. Paste a device code manually on a webpage.
-  Enter 1 or 2:
+  git credential-outlook --authenticate --device
   ```
-- Here we have 2 methods, clearly mentioned in the above message. You simply have to follow the on-screen instructions after choosing any one.
-
-  **Note: The first method if choosen will show an error of certificate not being valid after authentication. This is normal and expected since a self generated SSL certificate has been used to authenticate here. You can safely proceed further here.**
 
 ## Usage