split into two actions: flatpak-builder & flat-manager

Author: bilelmoussaoui

.github/workflows/docker.yml

@@ -82,6 +82,6 @@ jobs:
         with:
           allow: security.insecure
           context: docker
-          file: docker/${{ matrix.runtime.name }}.Dockerfile
+          file: flatpak-builder/docker/${{ matrix.runtime.name }}.Dockerfile
           push: true
           tags: bilelmoussaoui/flatpak-github-actions:${{ matrix.runtime.name }}

.github/workflows/flatpak-test.yml

@@ -13,10 +13,10 @@ jobs:
       options: --privileged
     steps:
       - uses: actions/checkout@v2
-      - uses: bilelmoussaoui/flatpak-github-actions@master
+      - uses: ./flatpak-builder
         with:
           bundle: org.example.MyApp.Devel.flatpak
-          manifest-path: ./tests/test-project/org.example.MyApp.yaml
+          manifest-path: ./flatpak-builder/tests/test-project/org.example.MyApp.yaml
           cache-key: flatpak-builder-${{ github.sha }}
   tests:
     name: Tests
@@ -31,4 +31,6 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
       - run: npm install --also=dev
+        working-directory: flatpak-builder
       - run: npm test
+        working-directory: flatpak-builder

.gitignore

@@ -3,4 +3,5 @@ flatpak_app
 repo
 node_modules
 .vscode
-package-lock.json
+package-lock.json
+.flatpak

README.md

@@ -2,14 +2,17 @@
 
 ![CI](https://github.com/bilelmoussaoui/flatpak-github-actions/workflows/CI/badge.svg)
 
-Build your flatpak application using Github Actions
+Build and deploy your Flatpak application using Github Actions
 
 <p align="center">
   <img src="https://user-images.githubusercontent.com/15098724/55282117-f8253380-52fa-11e9-95a3-ccae83b23034.png" alt="Flatpak logo" />
 </p>
 
 ## How to use  
 
+### Building stage
+
+
 Add a new workflow by creating a `.yml` file under `.github/workflows` with this content
 
 ```yaml
@@ -27,13 +30,13 @@ jobs:
       options: --privileged
     steps:
     - uses: actions/checkout@v2
-    - uses: bilelmoussaoui/flatpak-github-actions@v2
+    - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@master
       with:
         bundle: "palette.flatpak"
         manifest-path: "org.gnome.zbrown.Palette.yml"
 ```
 
-## Inputs
+#### Inputs
 
 | Name | Description | Required | Default |
 | ---     | ----------- | ----------- |----|
@@ -46,7 +49,7 @@ jobs:
 | `cache` | Enable/Disable caching `.flatpak-builder` directory | Optional | `true` |
 | `cache-key` | Specifies the cache key | Optional | `flatpak-builder-${sha256(manifestPath)}` |
 
-## Docker Image
+#### Docker Image
 
 The Docker image used for the action consists of 2 parts: The base image, based on Fedora and which can be found
 [here](docker/Dockerfile), and the specific image of the runtime you choose, which is generated through
@@ -62,3 +65,27 @@ You can specify the specific runtime you need to use through the image tags:
 | KDE             | 5.15    | `kde-5.15`          | `image: bilelmoussaoui/flatpak-github-actions:kde-5.15`          |
 | elementary BaseApp             | juno    | `juno`          | `image: bilelmoussaoui/flatpak-github-actions:elementary-juno`          |
 
+### Deployment stage
+
+If you want to deploy the successfully built Flatpak application to a remote repository
+
+```yaml
+on:
+  push:
+    branches: [main]
+name: Deploy
+jobs:
+  flat-manager:
+    name: "Flat Manager"
+    runs-on: ubuntu-latest
+    container:
+      image: bilelmoussaoui/flatpak-github-actions:gnome-40
+      options: --privileged
+    steps:
+    - uses: actions/checkout@v2
+    - uses: bilelmoussaoui/flatpak-github-actions/flat-manager@master
+      with:
+        bundle: "palette.flatpak"
+        remote-url: "org.gnome.zbrown.Palette.yml"
+        token: ${{ secrets.FLAT_MANAGER }}
+```

flat-manager/Dockerfile

@@ -0,0 +1,26 @@
+name: "flat-manager"
+description: "Deploy your Flatpak application to a repository"
+author: "Bilal Elmoussaoui"
+branding:
+  icon: "package"
+  color: "blue"
+inputs:
+  bundle:
+    description: "The bundle name, by default it's app.flatpak"
+    required: false
+    default: "app.flatpak"
+  repository-url:
+    description: >
+      The repository used to fetch the runtime when the user downloads the
+      Flatpak bundle.
+    required: false
+    default: "https://flathub.org/repo/flathub.flatpakrepo"
+  repository-name:
+    description: >
+      The repository name to install the runtime from at build/install time.
+      Note that the repository name corresponds to the `repository-url` mentioned above.
+    required: false
+    default: "flathub"
+runs:
+  using: "node12"
+  main: "dist/index.js"