From 7223856d1e0cdcef6029a46723d7183733d1dafa Mon Sep 17 00:00:00 2001
From: Remy Moll <me@moll.re>
Date: Sat, 4 May 2024 17:35:37 +0200
Subject: [PATCH 1/3] is the android sdk even needed?

---
 .gitea/workflows/build-android.yaml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/.gitea/workflows/build-android.yaml b/.gitea/workflows/build-android.yaml
index 76305b1..c11c5b8 100644
--- a/.gitea/workflows/build-android.yaml
+++ b/.gitea/workflows/build-android.yaml
@@ -1,5 +1,5 @@
 on: push
-name: Test, Build and Release apk
+name: Build and release APK
 jobs:
   build:
     name: Build APK
@@ -9,7 +9,8 @@ jobs:
     - name: Install prerequisites
       run: |
         sudo apt-get update
-        sudo apt-get install -y xz-utils unzip
+      # sudo apt-get install -y xz-utils unzip
+
     - uses: https://gitea.com/actions/checkout@v4
 
     - uses: https://github.com/actions/setup-java@v4
@@ -22,19 +23,22 @@ jobs:
         channel: stable
         flutter-version: 3.19.6
         cache: true
-    - name: Setup Android SDK
-      uses: https://github.com/android-actions/setup-android@v3
+
+    # - name: Setup Android SDK
+    #   uses: https://github.com/android-actions/setup-android@v3
 
     - run: flutter pub get
-    # - run: flutter test
+
     - run: flutter build apk --debug --split-per-abi
-    
+
     - name: Release APK
       uses: https://gitea.com/akkuman/gitea-release-action@v1
       with:
         files: build/app/outputs/flutter-apk/*.apk
+        name: Testing release
+        release_name: testing
         tag: testing
-        release_name: Testing release
+        tag_name: testing
         release_body: "This is a testing release."
         prerelease: true
         token: ${{ secrets.GITEA_TOKEN }}
-- 
2.47.2


From 822bfab0a3e7be534538122f77d9fe0c9505e220 Mon Sep 17 00:00:00 2001
From: Remy Moll <me@moll.re>
Date: Sat, 4 May 2024 17:40:31 +0200
Subject: [PATCH 2/3] better pipeline

---
 .gitea/workflows/build-android.yaml | 13 ++++++++----
 .gitea/workflows/build-web.yaml     | 17 ++++++++++++----
 .gitea/workflows/test.yaml          | 31 +++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 8 deletions(-)
 create mode 100644 .gitea/workflows/test.yaml

diff --git a/.gitea/workflows/build-android.yaml b/.gitea/workflows/build-android.yaml
index c11c5b8..b714b6c 100644
--- a/.gitea/workflows/build-android.yaml
+++ b/.gitea/workflows/build-android.yaml
@@ -1,5 +1,10 @@
-on: push
+on:
+  pull_request:
+    branches:
+      - main
+
 name: Build and release APK
+
 jobs:
   build:
     name: Build APK
@@ -9,7 +14,7 @@ jobs:
     - name: Install prerequisites
       run: |
         sudo apt-get update
-      # sudo apt-get install -y xz-utils unzip
+        sudo apt-get install -y xz-utils unzip
 
     - uses: https://gitea.com/actions/checkout@v4
 
@@ -24,8 +29,8 @@ jobs:
         flutter-version: 3.19.6
         cache: true
 
-    # - name: Setup Android SDK
-    #   uses: https://github.com/android-actions/setup-android@v3
+    - name: Setup Android SDK
+      uses: https://github.com/android-actions/setup-android@v3
 
     - run: flutter pub get
 
diff --git a/.gitea/workflows/build-web.yaml b/.gitea/workflows/build-web.yaml
index cc08a5e..cdb817c 100644
--- a/.gitea/workflows/build-web.yaml
+++ b/.gitea/workflows/build-web.yaml
@@ -1,21 +1,30 @@
-on: push
-name: Test, Build and Release web
+on:
+  pull_request:
+    branches:
+      - main
+
+name: Build web
+
 jobs:
   build:
     name: Build Web
     runs-on: k8s
     steps:
+
     - name: Install prerequisites
       run: |
         sudo apt-get update
         sudo apt-get install -y xz-utils
 
     - uses: actions/checkout@v4
+
     - uses: https://github.com/subosito/flutter-action@v2
       with:
         channel: stable
         flutter-version: 3.19.6
         cache: true
-    - run: flutter pub get
-    # - run: flutter test
+
+    - run: flutter pub get
+
+    - run: flutter build web
 
diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml
new file mode 100644
index 0000000..7f22525
--- /dev/null
+++ b/.gitea/workflows/test.yaml
@@ -0,0 +1,31 @@
+on:
+  push:
+  pull_request:
+    branches:
+      - main
+
+
+name: Test code
+
+jobs:
+  test:
+    name: Test code
+    runs-on: k8s
+    steps:
+
+    - name: Install prerequisites
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y xz-utils
+
+    - uses: actions/checkout@v4
+
+    - uses: https://github.com/subosito/flutter-action@v2
+      with:
+        channel: stable
+        flutter-version: 3.19.6
+        cache: true
+
+    - run: flutter pub get
+
+    - run: flutter test
-- 
2.47.2


From d9c34b1ade4994e628646427c83a6f26b6d8adfc Mon Sep 17 00:00:00 2001
From: Remy Moll <me@moll.re>
Date: Sat, 4 May 2024 17:50:17 +0200
Subject: [PATCH 3/3] remove drone

---
 .drone.yml | 25 -------------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 .drone.yml

diff --git a/.drone.yml b/.drone.yml
deleted file mode 100644
index 1ea50ce..0000000
--- a/.drone.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-kind: pipeline
-type: kubernetes
-name: build-apk
-
-clone:
-  depth: 1
-
-steps:
-  - name: build
-    image: cirrusci/flutter:stable
-    pull: true
-    commands:
-      - flutter packages get
-      - flutter build apk --release --split-per-abi
-      - mkdir apks
-      - mv build/app/outputs/apk/*/*/*.apk apks
-
-  - name: Publish APK
-    image: plugins/gitea-release
-    settings:
-      api_key:
-        from_secret: GITEA_TOKEN
-trigger:
-  event:
-    - push
\ No newline at end of file
-- 
2.47.2