CI: Make Flatpak build part of regular CI builds

This means the Flatpak build will now execute as part of PRs and pushes
to our `master` branch.

.github/workflows/ci-flatpak.yml

@@ -1,40 +0,0 @@
-name: CI (Flatpak)
-
-on:
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - labeled
-      - unlabeled
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  # Do not cancel in-progress runs if a labeling action took place (other than 'flatpak'). Otherwise, adding irrelevant
-  # labels causes existing runs to be canceled and a new (identical) run to be started.
-  cancel-in-progress: ${{ (github.event.action != 'labeled' && github.event.action != 'unlabeled') || github.event.label.name == 'flatpak' }}
-
-jobs:
-  CI-Flatpak:
-    # Only run this job if the PR has the 'flatpak' label.
-    if: |
-      github.repository == 'LadybirdBrowser/ladybird'
-      && contains(github.event.pull_request.labels.*.name, 'flatpak')
-    name: Flatpak ${{ matrix.arch }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        arch: ['x86_64']
-        runner_labels: ['["blacksmith-16vcpu-ubuntu-2404"]']
-
-        include:
-          - arch: 'aarch64'
-            runner_labels: '["blacksmith-16vcpu-ubuntu-2404-arm"]'
-
-    secrets: inherit
-    uses: ./.github/workflows/flatpak-template.yml
-    with:
-      arch: ${{ matrix.arch }}
-      runner_labels: ${{ matrix.runner_labels }}

.github/workflows/ci.yml

@@ -74,3 +74,23 @@ jobs:
       arch: ${{ matrix.arch }}
       build_preset: ${{ matrix.build_preset }}
       clang_plugins: ${{ matrix.clang_plugins }}
+
+  Flatpak:
+    if: github.repository == 'LadybirdBrowser/ladybird'
+    name: Flatpak ${{ matrix.arch }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        arch: ['x86_64']
+        runner_labels: ['["blacksmith-16vcpu-ubuntu-2404"]']
+
+        include:
+          - arch: 'aarch64'
+            runner_labels: '["blacksmith-16vcpu-ubuntu-2404-arm"]'
+
+    secrets: inherit
+    uses: ./.github/workflows/flatpak-template.yml
+    with:
+      arch: ${{ matrix.arch }}
+      runner_labels: ${{ matrix.runner_labels }}

.github/workflows/nightly-lagom.yml

@@ -85,8 +85,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        arch: [ 'x86_64' ]
-        runner_labels: [ '["blacksmith-8vcpu-ubuntu-2404"]' ]
+        arch: ['x86_64']
+        runner_labels: ['["blacksmith-8vcpu-ubuntu-2404"]']
 
         include:
           - arch: 'aarch64'