Fix sddm

Athena-OS · Sep 28, 2024 · c98a089 · c98a089
1 parent 7b2d937
commit c98a089
Showing 1 changed file with 8 additions and 21 deletions.
diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml
@@ -14,6 +14,7 @@ jobs:
       options: --privileged  # Needed for hwclock
 
     strategy:
+      fail-fast: false  # Ensure all matrix jobs continue even if one fails
       matrix:
         config_installer:
           - { desktop: "gnome", displaymanager: "gdm", theme: "temple", terminal: "gnome terminal", shell: "fish", browser: "firefox", job_name: "Arch-based Install Test (GNOME)", config_file: "arch.json", installer: "aegis-arch" }
@@ -29,25 +30,6 @@ jobs:
     name: ${{ matrix.config_installer.job_name }}  # Dynamically assign the job name based on the matrix
 
     steps:
-      - name: Send a request to webhook
-        run: |
-          curl -H "Content-Type: application/json" -d '{
-            "embeds": [{
-              "type": "rich",
-              "title": "Workflow Actions",
-              "thumbnail": {
-                "url": "https://athenaos.org/_astro/athena-chibi.C4AxdAFD_Z1ifHWb.webp"
-              },
-              "author": {
-                "name": "${{ github.actor }}",
-                "url": "https://github.com/${{ github.actor }}",
-                "icon_url": "https://avatars.githubusercontent.com/u/${{ github.actor_id }}?v=4"
-              }
-            }],
-            "username": "Athena Git Ninja",
-            "content": "Athena Arch installation testing workflow started.\nBranch: ${{ github.ref }} \nCommit Hash: ${{ github.sha }}"
-          }' ${{ secrets.WEBHOOK_URL }}
-
       - name: Install dependencies
         run: pacman -Syyu --noconfirm aegis grub mkinitcpio jq
 
@@ -84,7 +66,12 @@ jobs:
       - name: Run the installer
         run: ${{ matrix.config_installer.installer }} config ${{ matrix.config_installer.config_file }}
 
-      - name: Workflow Test Result
+  # Final job to send summary to webhook
+  notify-result:
+    runs-on: ubuntu-latest
+    needs: athena-installation  # Wait until all matrix jobs complete
+    steps:
+      - name: Send a request to webhook
         run: |
           curl -H "Content-Type: application/json" -d '{
             "embeds": [{
@@ -100,5 +87,5 @@ jobs:
               }
             }],
             "username": "Athena Git Ninja",
-            "content": "Athena Arch installation testing workflow finished with status: ${{ job.status }}. \nBranch: ${{ github.ref }} \nCommit Hash: ${{ github.sha }}"
+            "content": "Athena Arch installation testing workflow finished. \nBranch: ${{ github.ref }} \nCommit Hash: ${{ github.sha }} \n\nJob Results:\n\n${{ needs.athena-installation.outputs.job-summary }}"
           }' ${{ secrets.WEBHOOK_URL }}