From 189b441042f7a79ddcda2906aa7635633e1b6b10 Mon Sep 17 00:00:00 2001
From: Nik Clayton <nik@ngo.org.uk>
Date: Mon, 15 Apr 2024 16:02:01 +0200
Subject: [PATCH] ci: Run normal CI workflow on pushes to main (#618)

This should ensure that everything that is built as part of regular CI
can be saved to the build cache after the PR is merged.
---
 .github/workflows/ci.yml                      |  2 ++
 .../workflows/populate-gradle-build-cache.yml | 28 -------------------
 2 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 .github/workflows/populate-gradle-build-cache.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9cf06efc4..3c9b09e1e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,6 +4,8 @@ on:
   push:
     tags:
       - '*'
+    branches:
+      - main
   pull_request:
   workflow_dispatch:
 
diff --git a/.github/workflows/populate-gradle-build-cache.yml b/.github/workflows/populate-gradle-build-cache.yml
deleted file mode 100644
index eeeb131ab..000000000
--- a/.github/workflows/populate-gradle-build-cache.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-# Build the app on each push to `main`, populating the build cache to speed
-# up CI on PRs.
-
-name: Populate build cache
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  build:
-    strategy:
-      matrix:
-        color: ["orange"]
-        store: ["fdroid", "github", "google"]
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
-
-      - uses: ./.github/actions/setup-build-env
-        with:
-          gradle-cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
-
-      - name: Build ${{ matrix.color }}${{ matrix.store }}Debug
-        run: ./gradlew build${{ matrix.color }}${{ matrix.store }}Debug