From 883ffb3ba3e161a07be05499f693e51cfd9dfa7a Mon Sep 17 00:00:00 2001
From: linonetwo <linonetwo012@gmail.com>
Date: Fri, 9 Feb 2024 02:31:46 +0800
Subject: [PATCH] chore: use github actions to build by default

---
 .github/workflows/build-f-droid-apk.yml | 6 ++++--
 .github/workflows/eas-build.yml         | 1 -
 scripts/fit-f-droid.mjs                 | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-f-droid-apk.yml b/.github/workflows/build-f-droid-apk.yml
index 2816fed..22d938f 100644
--- a/.github/workflows/build-f-droid-apk.yml
+++ b/.github/workflows/build-f-droid-apk.yml
@@ -5,6 +5,7 @@ on:
   push:
     tags:
       - 'fdroid-v*.*.*'
+      - 'v*.*.*'
     paths-ignore:
       - 'README.md'
       - 'wiki/**'
@@ -83,8 +84,9 @@ jobs:
       - name: Build by eject eas
         run: npx expo prebuild -p android --clean
 
-      - name: Remove prorietary bits (for fix f-droid)
-        run: npx zx scripts/fit-f-droid.mjs
+      # TODO: https://github.com/tiddly-gittly/TidGi-Mobile/issues/6
+      # - name: Remove prorietary bits (for fix f-droid)
+      #   run: npx zx scripts/fit-f-droid.mjs
 
       - name: Build apk
         run: |
diff --git a/.github/workflows/eas-build.yml b/.github/workflows/eas-build.yml
index 07bd8d1..e890530 100644
--- a/.github/workflows/eas-build.yml
+++ b/.github/workflows/eas-build.yml
@@ -5,7 +5,6 @@ on:
   push:
     tags:
       - 'eas-v*.*.*'
-      - 'v*.*.*'
     paths-ignore:
       - 'README.md'
       - 'wiki/**'
diff --git a/scripts/fit-f-droid.mjs b/scripts/fit-f-droid.mjs
index 6a649f9..796992c 100644
--- a/scripts/fit-f-droid.mjs
+++ b/scripts/fit-f-droid.mjs
@@ -6,5 +6,5 @@ const projectRoot = path.join(__dirname, '..');
 const expoLocationPath = path.join(projectRoot, 'node_modules', 'expo-location');
 const expoApplicationPath = path.join(projectRoot, 'node_modules', 'expo-application');
 
-await Promise.all([/* fs.remove(expoLocationPath),  */fs.remove(expoApplicationPath)]);
-await Promise.all([/* fs.copy(path.join(projectRoot, 'libs', 'expo-location'), expoLocationPath),  */fs.copy(path.join(projectRoot, 'libs', 'expo-application'), expoApplicationPath)]);
+await Promise.all([fs.remove(expoLocationPath), fs.remove(expoApplicationPath)]);
+await Promise.all([fs.copy(path.join(projectRoot, 'libs', 'expo-location'), expoLocationPath), fs.copy(path.join(projectRoot, 'libs', 'expo-application'), expoApplicationPath)]);