ci: correct apk location

.gitea/workflows/deploy-latest-docker.yml

@@ -0,0 +1,21 @@
+name: Build and deploy the latest docker container
+on: 
+  push:
+    branches:
+      - master
+
+jobs:
+  deploy:
+    runs-on: nixos
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Build docker
+        run: devenv shell build-docker
+        
+      - name: Deploy docker
+        env:
+          REGISTRY_USERNAME: ${{ secrets.CONTAINER_REGISTRY_GITEA_USERNAME }}
+          REGISTRY_PASSWORD: ${{ secrets.CONTAINER_REGISTRY_GITEA_PASSWORD }}
+        run: devenv shell deploy-docker

.gitea/workflows/release-latest-android.yml

@@ -0,0 +1,37 @@
+name: Build and release the latest android apk
+on: 
+  push:
+    branches:
+      - master
+
+jobs:
+  rolling-release-apk:
+    runs-on: nixos
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+
+      - name: Build apk
+        run: devenv shell build-android
+
+      - name: Move latest Tag
+        run: |
+          git config user.name "gitea-actions"
+          git config user.email "gitea-actions@localhost"
+          
+          # Forcefully creates/moves the 'latest' tag to the current commit
+          git tag -f latest
+          
+          # Force-pushes the updated tag back to your Gitea repository
+          git push origin -f latest
+
+      - name: Update Gitea Release & Swap APK
+        uses: akkuman/gitea-release-action@v1
+        env:
+          NODE_OPTIONS: '--experimental-fetch'
+        with:
+          tag_name: latest # Explicitly target the tag we just moved
+          name: 'Latest Development Build'
+          body: 'This rolling release is automatically generated and always contains the newest code from the main branch.'
+          files: build/app/outputs/flutter-apk/*.apk 
+          token: ${{ secrets.GITHUB_TOKEN }}

.gitea/workflows/release-versioned-android.yml

@@ -0,0 +1,23 @@
+name: Build and release a versioned android apk
+on:
+  push:
+    tags:
+      - 'v*' 
+
+jobs:
+  release-apk:
+    runs-on: nixos
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+
+      - name: Build apk
+        run: devenv shell build-android
+        
+      - name: Create Gitea Release & Upload APK
+        uses: akkuman/gitea-release-action@v1
+        env:
+          NODE_OPTIONS: '--experimental-fetch' # if nodejs < 18
+        with:
+          files: build/app/outputs/flutter-apk/*.apk
+          token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -56,3 +56,4 @@ devenv.local.nix
 .android
 android/app/.cxx/
 /.gradle/
+/.gitea/workflows/.gradle/

Jenkinsfile

@@ -1,93 +0,0 @@
-pipeline {
-    agent {
-        node {
-            label 'devenv'
-        }
-    }
-    triggers {
-        pollSCM('H/10 * * * *')
-    }
-    stages {
-        stage('Test devenv') {
-            steps {
-                sh 'devenv test'
-            }
-        }
-        stage('Flutter builds') {
-            steps {
-                sh 'devenv shell dart run pdfrx:remove_wasm_modules --revert' // Make sure WASM is put in output
-                sh 'devenv shell flutter build web --release'
-
-                sh 'devenv shell dart run pdfrx:remove_wasm_modules' // NOT idempotent!
-                sh 'devenv shell flutter build apk --release'
-
-                sh 'devenv shell dart run pdfrx:remove_wasm_modules --revert' // Reset again, just to be sure
-            }
-        }
-        stage('Parallel Deploy') {
-            parallel {
-                stage('Web') {
-                    steps {
-                        sh 'docker build -t harbor.julian-mutter.de/sheetless/sheetless-frontend .'
-                        withDockerRegistry([credentialsId: 'harbor', url: 'https://harbor.julian-mutter.de']) {
-                            sh 'docker push harbor.julian-mutter.de/sheetless/sheetless-frontend'
-                        }
-                    }
-                }
-                stage('Android') {
-                    stages {
-                        stage('Checkout F-Droid Repo') {
-                            steps {
-                                dir("fdroid-repo") {
-                                    git branch: 'master', url: "https://gitlab.julian-mutter.de/julian/fdroid-frajul.git", credentialsId: "gitea", poll: "false"
-                                }
-                            }
-                        }
-
-                        stage('Decrypt keys') {
-                            steps {
-                                dir("fdroid-repo") {
-                                    sh 'devenv shell ./decrypt.sh'
-                                }
-                            }
-                        }
-
-                        stage('Copy APK') {
-                            steps {
-                                sh "cp build/app/outputs/apk/release/app-release.apk fdroid-repo/fdroid/repo/sheetless.apk"
-                            }
-                        }
-
-                        stage('Update Metadata') {
-                            steps {
-                                dir("fdroid-repo") {
-                                    sh 'devenv shell ./update-repo.sh'
-                                }
-                            }
-                        }
-
-                        stage('Push updates') {
-                            steps {
-                                dir("fdroid-repo") {
-                                    withCredentials([gitUsernamePassword(credentialsId: 'gitea')]) {
-                                        sh '''
-                                            git config --global user.email "jenkins@comumail.de"
-                                            git config --global user.name "Jenkins CI"
-                                            ./push-updates.sh 
-                                        '''
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-    post {
-        always {
-            step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: emailextrecipients([developers(), requestor()])])
-            cleanWs()
-        }
-    }
-}

devenv.lock

@@ -16,62 +16,6 @@
         "type": "github"
       }
     },
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1767039857,
-        "owner": "NixOS",
-        "repo": "flake-compat",
-        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "git-hooks": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "gitignore": "gitignore",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1769939035,
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "rev": "a8ca480175326551d6c4121498316261cbb5b260",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "type": "github"
-      }
-    },
-    "gitignore": {
-      "inputs": {
-        "nixpkgs": [
-          "git-hooks",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1762808025,
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "cb5e3fdca1de58ccbc3ef53de65bd372b48f567c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1770115704,
@@ -90,11 +34,7 @@
     "root": {
       "inputs": {
         "devenv": "devenv",
-        "git-hooks": "git-hooks",
-        "nixpkgs": "nixpkgs",
-        "pre-commit-hooks": [
-          "git-hooks"
-        ]
+        "nixpkgs": "nixpkgs"
       }
     }
   },

devenv.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
-{
+{pkgs, ...}: {
   android = {
     enable = true;
     emulator.enable = false;
@@ -46,10 +45,29 @@
   };
 
   scripts = {
-    deploy-docker.exec = ''
+    build-docker.exec = ''
+      dart run pdfrx:remove_wasm_modules --revert // Make sure WASM is put in output
+
       flutter build web --release
-      docker build -t harbor.julian-mutter.de/sheetless/sheetless-frontend .
-      docker push harbor.julian-mutter.de/sheetless/sheetless-frontend
+
+      docker build -t gitlab.julian-mutter.de/julian/sheetless-frontend:latest .
+    '';
+
+    deploy-docker.exec = ''
+      if [ -n "''${REGISTRY_USERNAME:-}" ] && [ -n "''${REGISTRY_PASSWORD:-}" ]; then
+          docker login gitlab.julian-mutter.de --username "$REGISTRY_USERNAME" --password "$REGISTRY_PASSWORD"
+      fi
+
+      docker push gitlab.julian-mutter.de/julian/sheetless-frontend
+    '';
+
+    build-android.exec = ''
+      export GRADLE_USER_HOME="$(pwd)/.gradle"
+
+      dart run pdfrx:remove_wasm_modules --revert // Make sure WASM is put in output
+      dart run pdfrx:remove_wasm_modules // NOT idempotent!
+
+      flutter build apk --release
     '';
   };
 }