Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Thomas Güttler
|
517f7a6aa8 | ||
|
|
1e5093b631 | ||
|
Thomas SharedInbox
|
c1ee8ec1f4 | ||
|
Thomas SharedInbox
|
7ce9eddabf | ||
|
Bot of Thomas Güttlerandguettli
|
8592bba9e3 |
@@ -123,3 +123,4 @@ dagger-certs
|
||||
/go
|
||||
.last_deployed_sha
|
||||
.fail_count
|
||||
/*.kubeconfig
|
||||
|
||||
@@ -26,13 +26,13 @@ repos:
|
||||
- id: forbidden-files-hook
|
||||
name: check for forbidden home-directory files
|
||||
language: system
|
||||
entry: bash -c 'cd "$(git rev-parse --show-toplevel)" && nix develop --command task check-hygiene'
|
||||
entry: bash -c 'cd "$(git rev-parse --show-toplevel)" && task check-hygiene'
|
||||
pass_filenames: false
|
||||
always_run: true
|
||||
- id: dart-check
|
||||
name: dart format (autofix) + check-fast (parallel)
|
||||
language: system
|
||||
entry: bash -c 'cd "$(git rev-parse --show-toplevel)" && nix develop --command dagger call --progress=plain -q -m ci --source=. check-fast'
|
||||
entry: bash -c 'cd "$(git rev-parse --show-toplevel)" && dagger call --progress=plain -q -m ci --source=. check-fast'
|
||||
pass_filenames: false
|
||||
always_run: true
|
||||
- id: ci-no-direct-dagger
|
||||
@@ -50,6 +50,12 @@ repos:
|
||||
- id: ci-image-exists
|
||||
name: verify container images in ci/main.go are reachable
|
||||
language: system
|
||||
entry: bash -c 'cd "$(git rev-parse --show-toplevel)" && nix develop --command task check-ci-images'
|
||||
entry: bash -c 'cd "$(git rev-parse --show-toplevel)" && task check-ci-images'
|
||||
pass_filenames: false
|
||||
files: ^(ci/main\.go|\.fvmrc)$
|
||||
- id: dagger-versions-aligned
|
||||
name: verify Dagger version is consistent across dagger.json, Dockerfile and DAGGER.md
|
||||
language: system
|
||||
entry: bash -c 'cd "$(git rev-parse --show-toplevel)" && scripts/check_dagger_versions.sh'
|
||||
pass_filenames: false
|
||||
files: ^(ci/dagger\.json|\.forgejo/Dockerfile|DAGGER\.md)$
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
# Development and Testing Container for SharedInbox
|
||||
# Replaces the Nix shell environment.
|
||||
FROM ghcr.io/cirruslabs/flutter:3.44.0
|
||||
|
||||
# Install Linux desktop build and test dependencies, Go, NodeJS, python3, and utilities
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
clang \
|
||||
cmake \
|
||||
ninja-build \
|
||||
pkg-config \
|
||||
libgtk-3-dev \
|
||||
liblzma-dev \
|
||||
libsecret-1-dev \
|
||||
libgcrypt20-dev \
|
||||
libjsoncpp-dev \
|
||||
sqlite3 \
|
||||
iproute2 \
|
||||
netcat-openbsd \
|
||||
xvfb \
|
||||
libosmesa6 \
|
||||
libegl1 \
|
||||
lld \
|
||||
git \
|
||||
curl \
|
||||
jq \
|
||||
python3-pip \
|
||||
nodejs \
|
||||
npm \
|
||||
hugo \
|
||||
lcov \
|
||||
rsync \
|
||||
openssh-client \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install Task runner
|
||||
RUN curl -fsSL https://taskfile.dev/install.sh \
|
||||
| sh -s -- -b /usr/local/bin v3.48.0
|
||||
|
||||
# Install Dagger CLI
|
||||
RUN curl -fsSL https://dl.dagger.io/dagger/install.sh \
|
||||
| DAGGER_VERSION=0.20.8 BIN_DIR=/usr/local/bin sh
|
||||
|
||||
# Install python packages (Play Store API clients + pre-commit)
|
||||
RUN pip install --break-system-packages --no-cache-dir \
|
||||
google-api-python-client \
|
||||
google-auth-httplib2 \
|
||||
httplib2 \
|
||||
pre-commit==4.5.1
|
||||
|
||||
# Install acpx CLI globally
|
||||
RUN npm install -g acpx@0.10.0
|
||||
|
||||
# Setup user "ci"
|
||||
RUN useradd -m -s /bin/bash ci
|
||||
USER ci
|
||||
ENV HOME=/home/ci
|
||||
ENV PATH=/home/ci/.pub-cache/bin:$PATH
|
||||
|
||||
WORKDIR /src
|
||||
-101
@@ -1,101 +0,0 @@
|
||||
# Plan: Consolidate Email-List UI
|
||||
|
||||
## Goal
|
||||
|
||||
Three list surfaces — folder view (`EmailListScreen`), combined inbox (`CombinedInboxScreen`), and search results (in `SearchScreen` plus the in-screen search in `EmailListScreen`, plus `AddressEmailsScreen`) — currently duplicate selection state, swipe-dismiss handling, batch actions (archive/delete/spam/move/snooze), and tile rendering. Unify into one widget so behaviour and UI are identical everywhere. Thread detail view is intentionally out of scope.
|
||||
|
||||
## Current duplication
|
||||
|
||||
| Concern | `EmailListScreen` | `CombinedInboxScreen` | `SearchScreen` / `AddressEmailsScreen` |
|
||||
| --- | --- | --- | --- |
|
||||
| Tile widget | `EmailThreadTile` + `ThreadTile` (search) | `EmailThreadTile` | `ThreadTile` / inline `ListTile` |
|
||||
| Selection set | thread + per-email | thread only | none |
|
||||
| Selection AppBar/BottomBar | full set of 5 actions | archive + delete only | n/a |
|
||||
| Swipe dismiss | archive/delete + undo | archive/delete + undo (copy) | none |
|
||||
| Batch actions | archive, delete, spam, move, snooze | archive, delete (re-implemented) | none |
|
||||
|
||||
Tile widgets `lib/ui/widgets/email_thread_tile.dart` and `lib/ui/widgets/thread_tile.dart` render the same fields in slightly different layouts.
|
||||
|
||||
## Target architecture
|
||||
|
||||
### 1. New widget `lib/ui/widgets/email_thread_list.dart`
|
||||
|
||||
A self-contained `ConsumerStatefulWidget` that owns selection state and renders the list. API:
|
||||
|
||||
```dart
|
||||
EmailThreadList({
|
||||
required Stream<List<EmailThread>> threads, // folder + combined inbox
|
||||
// or:
|
||||
required List<EmailThread> staticThreads, // search / address results
|
||||
required EmailListContext listContext, // see below
|
||||
bool showAccountLabel = false, // combined inbox
|
||||
bool showLocationLabel = false, // search / cross-mailbox
|
||||
bool enableSwipe = true,
|
||||
bool enablePagination = true,
|
||||
List<EmailBatchAction> actions = EmailBatchAction.standard,
|
||||
ValueChanged<EmailThread>? onTap, // null → default navigation
|
||||
})
|
||||
```
|
||||
|
||||
`EmailListContext` carries `accountId?` (nullable for combined/global views) and `mailboxPath?` (nullable for combined/global views). Batch actions read these to scope role lookups and undo-action source paths; when null they fall back to per-thread `t.accountId` / `t.mailboxPath` (this is how `CombinedInboxScreen._batchArchive` already groups by account).
|
||||
|
||||
Encapsulated:
|
||||
- `_selectedThreadIds` plus toggle/clear/select-all helpers.
|
||||
- `_currentThreads` (last stream emission).
|
||||
- `_limit` pagination with `Load more`.
|
||||
- Selection-mode `AppBar` and `BottomAppBar` rendering — driven by the host scaffold via two builders the widget exposes (`buildSelectionAppBar`, `buildSelectionBottomBar`) so the host keeps Scaffold ownership but doesn't reimplement them.
|
||||
- Swipe-to-archive / swipe-to-delete + undo push.
|
||||
|
||||
### 2. Shared action layer `lib/ui/screens/email_action_helpers.dart`
|
||||
|
||||
Extend the existing file with the batch ops currently duplicated:
|
||||
|
||||
```dart
|
||||
enum EmailBatchAction { archive, delete, markSpam, move, snooze }
|
||||
|
||||
Future<void> batchMoveToRole(WidgetRef ref, BuildContext ctx, {
|
||||
required List<EmailThread> threads,
|
||||
required String role,
|
||||
required String dialogTitle,
|
||||
required String createFolderName,
|
||||
});
|
||||
|
||||
Future<void> batchDelete(WidgetRef ref, {required List<EmailThread> threads});
|
||||
Future<void> batchMove(WidgetRef ref, BuildContext ctx, {required List<EmailThread> threads});
|
||||
Future<void> batchSnooze(WidgetRef ref, BuildContext ctx, {required List<EmailThread> threads});
|
||||
Future<void> swipeDismiss(WidgetRef ref, EmailThread thread, DismissDirection dir);
|
||||
```
|
||||
|
||||
Each function fetches `originalEmails`, runs the repo calls, and pushes a single `UndoAction`. Grouping by `accountId` lives here so combined-inbox-style multi-account selections work for every action (not only archive/delete). `_batchMoveToRole` from `EmailListScreen` and `_batchArchive` from `CombinedInboxScreen` collapse into one function.
|
||||
|
||||
### 3. Unify the tile widgets
|
||||
|
||||
Keep `ThreadTile` (`lib/ui/widgets/thread_tile.dart`) as the single tile. Move the `Dismissible` wrapper out — `EmailThreadList` owns swipe — and add the optional `showAccount` subtitle currently in `EmailThreadTile`. Delete `lib/ui/widgets/email_thread_tile.dart`.
|
||||
|
||||
## Screen refactors
|
||||
|
||||
- `combined_inbox_screen.dart` — drop selection state, swipe handler, batch methods, `_buildThreadList`, `_selectionBottomBar`. Replace body with `EmailThreadList(stream: emailRepo.observeAllInboxThreads(...), listContext: const EmailListContext.allAccounts(), showAccountLabel: true)`. AppBar/drawer/FAB stay.
|
||||
- `email_list_screen.dart` — keep search-bar, sync banner, folder drawer, `Mark all as read`. Replace `_buildStreamBody` and `_buildEmailList` with `EmailThreadList`. Drop selection state, `_toggleThreadSelection`, `_selectionBottomBar`, `_batch*` methods, `_onSwipeDismissed`. The search path inside this screen (results from `searchEmails`) becomes `EmailThreadList(staticThreads: results.map(EmailThread.fromEmail).toList(), enableSwipe: false)` — the per-email vs per-thread split goes away once everything is treated as a thread of one.
|
||||
- `search_screen.dart` — Messages section uses `EmailThreadList(staticThreads: ..., enableSwipe: false, showLocationLabel: true, actions: EmailBatchAction.standard)`, so global search results now support the same selection + batch actions. Folders and Addresses sections unchanged.
|
||||
- `address_emails_screen.dart` — replace inline `ListView.builder` with `EmailThreadList`, gaining selection/swipe/batch parity.
|
||||
|
||||
## Migration steps
|
||||
|
||||
1. Add `EmailThreadList` widget with selection, swipe, pagination, and AppBar/BottomBar builders. Lift the existing logic verbatim from `EmailListScreen` so behaviour is unchanged.
|
||||
2. Promote the five batch ops + swipe handler into `email_action_helpers.dart`; switch `EmailListScreen` to call them. Keep tile tests passing.
|
||||
3. Fold `showAccount` and `Dismissible`-out into `ThreadTile`; delete `EmailThreadTile`; update imports.
|
||||
4. Migrate `CombinedInboxScreen` to `EmailThreadList`. Combined inbox now supports spam/move/snooze (was missing). Verify multi-account batches still group correctly.
|
||||
5. Migrate the search-result branch inside `EmailListScreen`, then the Messages section of `SearchScreen`, then `AddressEmailsScreen`.
|
||||
6. Run `flutter analyze` and the integration tests under `integration_test/` (folder, combined inbox, and search exercise the same code path now, so a single regression test set covers all surfaces).
|
||||
|
||||
## Out of scope
|
||||
|
||||
- `ThreadDetailScreen` — single-thread message list, intentionally different.
|
||||
- Repository / DB code in `lib/core/repositories/` — no changes; the unification is purely on the UI layer.
|
||||
- Folder drawer, sync banner, search bar — remain owned by their hosting screens.
|
||||
|
||||
## Risks / open questions
|
||||
|
||||
- Combined inbox currently has no `mailboxPath` per selection — confirmed handled by grouping selected threads by `accountId` then looking up archive/junk/etc. per group. The same grouping must work for the move/snooze sheet (the destination picker needs an account; when multiple accounts are selected, prompt per-account or block — recommend block with a SnackBar to mirror existing per-folder constraints; flag for user feedback).
|
||||
- Snooze for cross-account selection: same constraint as above — implementation should iterate accounts.
|
||||
- Swipe-dismiss in search results: currently disabled in `SearchScreen` and `AddressEmailsScreen`. Plan keeps `enableSwipe: false` for those to avoid disorienting users when a swiped item disappears from a filtered list; revisit if user wants parity.
|
||||
+6
-1
@@ -544,7 +544,7 @@ tasks:
|
||||
- sops exec-env secrets.enc.yaml 'bash scripts/build_android_bundle_local.sh'
|
||||
|
||||
deploy-android-bundle:
|
||||
desc: Build release AAB and upload to Play Store internal track (local/fvm)
|
||||
desc: Build release AAB and upload to Play Store internal + closed-testing tracks (local/fvm)
|
||||
deps: [build-android-bundle-local]
|
||||
dotenv: [".env"]
|
||||
cmds:
|
||||
@@ -712,6 +712,11 @@ tasks:
|
||||
cmds:
|
||||
- scripts/check_ci_images.sh
|
||||
|
||||
check-dagger-versions:
|
||||
desc: Verify ci/dagger.json, flake.nix, .forgejo/Dockerfile and DAGGER.md pin the same Dagger version
|
||||
cmds:
|
||||
- scripts/check_dagger_versions.sh
|
||||
|
||||
_integrations:
|
||||
internal: true
|
||||
run: once
|
||||
|
||||
+1
-1
@@ -896,7 +896,7 @@ func withGoCache(c *dagger.Container) *dagger.Container {
|
||||
WithEnvVariable("GOMODCACHE", "/home/ci/go/pkg/mod")
|
||||
}
|
||||
|
||||
// UploadToPlayStore uploads a pre-built AAB to the Play Store internal track.
|
||||
// UploadToPlayStore uploads a pre-built AAB to the Play Store internal and closed-testing (alpha) tracks.
|
||||
func (m *Ci) UploadToPlayStore(
|
||||
ctx context.Context,
|
||||
aab *dagger.File,
|
||||
|
||||
Generated
-82
@@ -1,82 +0,0 @@
|
||||
{
|
||||
"nodes": {
|
||||
"dagger": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1778107833,
|
||||
"narHash": "sha256-q5XQep2mpgTPiWwuYB1+L2dsFeACT6sHx8J939iM+HE=",
|
||||
"owner": "dagger",
|
||||
"repo": "nix",
|
||||
"rev": "873cc22ba46b73d4a6c1aa6c102ef3aabc736496",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "dagger",
|
||||
"repo": "nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"inputs": {
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1778737229,
|
||||
"narHash": "sha256-6xWoytx8jFW4PF1GjRm/i/53trbpKGfz6zjzQGBr4cI=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d7a713c0b7e47c908258e71cba7a2d77cc8d71d5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-25.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"dagger": "dagger",
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": "nixpkgs"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
"version": 7
|
||||
}
|
||||
@@ -1,164 +0,0 @@
|
||||
{
|
||||
description = "SharedInbox — IMAP/SMTP Flutter client";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
|
||||
flake-utils.url = "github:numtide/flake-utils";
|
||||
dagger.url = "github:dagger/nix";
|
||||
dagger.inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, flake-utils, dagger }:
|
||||
flake-utils.lib.eachDefaultSystem (system:
|
||||
let
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
|
||||
# All Linux desktop runtime libraries needed by flutter build linux and
|
||||
# the UI integration tests (xvfb-run). Kept as a list so we can reuse
|
||||
# it for both buildInputs and LD_LIBRARY_PATH / PKG_CONFIG_PATH.
|
||||
linuxDesktopLibs = with pkgs; [
|
||||
gtk3
|
||||
libsecret
|
||||
fontconfig
|
||||
libepoxy
|
||||
mesa
|
||||
libGL # libglvnd — vendor-neutral GL/EGL/GLX dispatch layer
|
||||
at-spi2-core
|
||||
glib
|
||||
pango
|
||||
cairo
|
||||
gdk-pixbuf
|
||||
harfbuzz
|
||||
# Dagger remote setup dependencies
|
||||
stunnel
|
||||
netcat
|
||||
];
|
||||
|
||||
fgj = pkgs.stdenv.mkDerivation {
|
||||
pname = "fgj";
|
||||
version = "0.4.0";
|
||||
src = pkgs.fetchurl {
|
||||
url = "https://codeberg.org/romaintb/fgj/releases/download/v0.4.0/fgj_linux_amd64";
|
||||
sha256 = "07pia03facvvxq9i1dgl7p47ccv1iqj4drpkp45gvw26d4afkbj7";
|
||||
};
|
||||
dontUnpack = true;
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp $src $out/bin/fgj
|
||||
chmod +x $out/bin/fgj
|
||||
'';
|
||||
};
|
||||
|
||||
# The dagger/nix flake pins 0.20.8, whose Nix wrapper is a broken self-exec
|
||||
# loop. Fetch 0.21.4 directly so the pre-commit dart-check hook can run.
|
||||
dagger021 = pkgs.stdenv.mkDerivation {
|
||||
pname = "dagger";
|
||||
version = "0.21.4";
|
||||
src = pkgs.fetchurl {
|
||||
url = "https://dl.dagger.io/dagger/releases/0.21.4/dagger_v0.21.4_linux_amd64.tar.gz";
|
||||
sha256 = "0wlnbr4g5069755131yjp2a6alacn64f1c8b27xn0cbynq3zicjd";
|
||||
};
|
||||
sourceRoot = ".";
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp dagger $out/bin/dagger
|
||||
chmod +x $out/bin/dagger
|
||||
'';
|
||||
};
|
||||
in {
|
||||
devShells.default = pkgs.mkShell {
|
||||
buildInputs = with pkgs; [
|
||||
# Dagger CLI
|
||||
dagger021
|
||||
|
||||
# Go compiler — for Dagger development
|
||||
go
|
||||
|
||||
# Java JDK — required by Gradle for Android builds
|
||||
|
||||
# Task runner
|
||||
go-task
|
||||
|
||||
# Flutter version manager — needed for host builds (task build-linux, task run)
|
||||
fvm
|
||||
|
||||
# Git hooks
|
||||
pre-commit
|
||||
|
||||
# Linux desktop build + runtime dependencies (flutter build linux / task run)
|
||||
] ++ linuxDesktopLibs ++ (with pkgs; [
|
||||
pkg-config
|
||||
clang
|
||||
cmake
|
||||
ninja
|
||||
|
||||
# Local IMAP/SMTP dev server for integration tests
|
||||
stalwart-mail
|
||||
|
||||
# Headless display for UI integration tests
|
||||
xvfb-run # wraps Xvfb; xvfb-run --auto-servernum ...
|
||||
|
||||
# Coverage merging (flutter test --merge-coverage requires lcov)
|
||||
lcov
|
||||
|
||||
# Website
|
||||
hugo
|
||||
|
||||
# Utilities
|
||||
git
|
||||
curl
|
||||
jq
|
||||
sqlite
|
||||
# python3 base + Google Play API client (for scripts/deploy_playstore.py)
|
||||
(python3.withPackages (ps: with ps; [
|
||||
google-api-python-client
|
||||
google-auth-httplib2
|
||||
httplib2
|
||||
])) # used by stalwart-dev/start and deploy_playstore.py
|
||||
fgj # Codeberg/Forgejo CLI (like gh for GitHub)
|
||||
skopeo # inspect OCI image manifests without pulling layers (used by check-ci-images)
|
||||
librsvg # rsvg-convert — SVG→PNG for generate-icons task
|
||||
]);
|
||||
|
||||
shellHook = ''
|
||||
# nix develop --command does not set IN_NIX_SHELL; set it so _preflight passes in CI
|
||||
export IN_NIX_SHELL=1
|
||||
|
||||
# Point Dagger client at the running engine socket
|
||||
export DAGGER_HOST=unix:///run/dagger/engine.sock
|
||||
|
||||
# Disable Flutter telemetry inside dev shell
|
||||
export FLUTTER_SUPPRESS_ANALYTICS=true
|
||||
|
||||
# Expose dev headers to cmake's FindPkgConfig.
|
||||
# The nix pkg-config wrapper works in bash but cmake invokes pkg-config
|
||||
# as a subprocess and needs PKG_CONFIG_PATH set explicitly.
|
||||
export PKG_CONFIG_PATH="${pkgs.gtk3.dev}/lib/pkgconfig:${pkgs.glib.dev}/lib/pkgconfig:${pkgs.pango.dev}/lib/pkgconfig:${pkgs.cairo.dev}/lib/pkgconfig:${pkgs.gdk-pixbuf.dev}/lib/pkgconfig:${pkgs.at-spi2-core.dev}/lib/pkgconfig:${pkgs.harfbuzz.dev}/lib/pkgconfig:${pkgs.libsecret}/lib/pkgconfig:${pkgs.fontconfig.dev}/lib/pkgconfig:${pkgs.libepoxy}/lib/pkgconfig:$PKG_CONFIG_PATH"
|
||||
|
||||
# Nix ld uses --no-copy-dt-needed-entries (strict mode): transitive shared-lib
|
||||
# deps are not followed automatically, so link them explicitly.
|
||||
export LDFLAGS="-L${pkgs.fontconfig.lib}/lib -lfontconfig $LDFLAGS"
|
||||
|
||||
# Make nix-built runtime libs visible to the dynamic linker so the
|
||||
# Flutter Linux bundle and integration-ui tests can run.
|
||||
export LD_LIBRARY_PATH="${pkgs.lib.makeLibraryPath linuxDesktopLibs}:$LD_LIBRARY_PATH"
|
||||
|
||||
# Wire the libglvnd dispatch to the nix mesa vendor ICDs so GTK/Flutter
|
||||
# can create an OpenGL (EGL + GLX) context under Xvfb without a real GPU.
|
||||
export __EGL_VENDOR_LIBRARY_DIRS="${pkgs.mesa}/share/glvnd/egl_vendor.d"
|
||||
export __GLX_VENDOR_LIBRARY_DIRS="${pkgs.mesa}/lib"
|
||||
export LIBGL_ALWAYS_SOFTWARE=1
|
||||
export MESA_LOADER_DRIVER_OVERRIDE=softpipe
|
||||
|
||||
echo "SharedInbox Flutter dev environment ready."
|
||||
echo " Analyze : task analyze"
|
||||
echo " Unit tests : task test"
|
||||
echo " Integration : task integration"
|
||||
echo " All checks : task check"
|
||||
echo " Run (Linux) : task run"
|
||||
echo " Start Stalwart : stalwart-dev/start"
|
||||
'';
|
||||
};
|
||||
}
|
||||
);
|
||||
}
|
||||
Executable
+43
@@ -0,0 +1,43 @@
|
||||
#!/usr/bin/env bash
|
||||
# Verify that the Dagger version is consistent across the project.
|
||||
#
|
||||
# The Dagger CLI must speak the same protocol as the engine it talks to. We
|
||||
# pin the version in four places (engine image in DAGGER.md, the CLI in
|
||||
# flake.nix, the CLI in the Forgejo runner Dockerfile, and the module
|
||||
# engineVersion in ci/dagger.json). This script fails if any of them drift.
|
||||
set -euo pipefail
|
||||
|
||||
ROOT=$(git rev-parse --show-toplevel)
|
||||
|
||||
# ci/dagger.json — strip leading "v" for comparison.
|
||||
dagger_json=$(grep -oE '"engineVersion"[[:space:]]*:[[:space:]]*"[^"]+"' "$ROOT/ci/dagger.json" \
|
||||
| sed -E 's/.*"v?([^"]+)"$/\1/')
|
||||
|
||||
# .forgejo/Dockerfile — DAGGER_VERSION env on the install line.
|
||||
dockerfile=$(grep -oE 'DAGGER_VERSION=[0-9]+\.[0-9]+\.[0-9]+' "$ROOT/.forgejo/Dockerfile" \
|
||||
| head -n1 \
|
||||
| cut -d= -f2)
|
||||
|
||||
# DAGGER.md — engine image tag in the example systemd unit.
|
||||
dagger_md=$(grep -oE 'dagger/nix/v[0-9]+\.[0-9]+\.[0-9]+' "$ROOT/DAGGER.md" \
|
||||
| head -n1 \
|
||||
| sed -E 's@.*/v@@')
|
||||
|
||||
printf 'ci/dagger.json engineVersion = v%s\n' "$dagger_json"
|
||||
printf '.forgejo/Dockerf. DAGGER_VERSION= %s\n' "$dockerfile"
|
||||
printf 'DAGGER.md engine tag = v%s\n' "$dagger_md"
|
||||
|
||||
for v in "$dockerfile" "$dagger_md"; do
|
||||
if [ -z "$v" ]; then
|
||||
echo "ERROR: failed to parse a Dagger version reference." >&2
|
||||
exit 1
|
||||
fi
|
||||
if [ "$v" != "$dagger_json" ]; then
|
||||
echo "" >&2
|
||||
echo "ERROR: Dagger versions are out of sync." >&2
|
||||
echo " Align ci/dagger.json, .forgejo/Dockerfile and DAGGER.md to the same version." >&2
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
|
||||
echo "Dagger versions aligned (v$dagger_json)."
|
||||
@@ -1,5 +1,11 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Upload an Android App Bundle to the Google Play Store internal track."""
|
||||
"""Upload an Android App Bundle to the Google Play Store.
|
||||
|
||||
The bundle is published to every track in ``TRACKS`` within a single Play edit,
|
||||
so internal testing and closed testing share the same version code. ``alpha``
|
||||
is what the Play Console labels "Closed testing"; publishing there removes the
|
||||
need to manually drag-and-drop the AAB into the closed-testing release form.
|
||||
"""
|
||||
|
||||
import json
|
||||
import os
|
||||
@@ -11,7 +17,7 @@ from google.oauth2 import service_account
|
||||
|
||||
PACKAGE_NAME = "de.sharedinbox.mua"
|
||||
AAB_PATH = "build/app/outputs/bundle/release/app-release.aab"
|
||||
TRACK = "internal"
|
||||
TRACKS = ("internal", "alpha")
|
||||
_BASE = "https://androidpublisher.googleapis.com/androidpublisher/v3/applications"
|
||||
_UPLOAD_BASE = "https://androidpublisher.googleapis.com/upload/androidpublisher/v3/applications"
|
||||
_MAX_UPLOAD_ATTEMPTS = 3
|
||||
@@ -94,19 +100,20 @@ def main():
|
||||
version_code = bundle["versionCode"]
|
||||
print(f"Uploaded AAB, version code: {version_code}")
|
||||
|
||||
track_resp = session.put(
|
||||
f"{_BASE}/{PACKAGE_NAME}/edits/{edit_id}/tracks/{TRACK}",
|
||||
json={"releases": [{"versionCodes": [version_code], "status": "completed"}]},
|
||||
timeout=30,
|
||||
)
|
||||
track_resp.raise_for_status()
|
||||
for track in TRACKS:
|
||||
track_resp = session.put(
|
||||
f"{_BASE}/{PACKAGE_NAME}/edits/{edit_id}/tracks/{track}",
|
||||
json={"releases": [{"versionCodes": [version_code], "status": "completed"}]},
|
||||
timeout=30,
|
||||
)
|
||||
track_resp.raise_for_status()
|
||||
|
||||
commit_resp = session.post(
|
||||
f"{_BASE}/{PACKAGE_NAME}/edits/{edit_id}:commit",
|
||||
timeout=30,
|
||||
)
|
||||
commit_resp.raise_for_status()
|
||||
print(f"Deployed version {version_code} to {TRACK} track")
|
||||
print(f"Deployed version {version_code} to tracks: {', '.join(TRACKS)}")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
@@ -95,6 +95,30 @@ class TestMainHappyPath(unittest.TestCase):
|
||||
track_call = session.put.call_args_list[0]
|
||||
self.assertIn("/tracks/", track_call[0][0])
|
||||
|
||||
def test_updates_all_configured_tracks(self):
|
||||
session = self._run_main()
|
||||
track_urls = [c[0][0] for c in session.put.call_args_list]
|
||||
self.assertEqual(len(track_urls), len(deploy_playstore.TRACKS))
|
||||
for track in deploy_playstore.TRACKS:
|
||||
self.assertTrue(
|
||||
any(url.endswith(f"/tracks/{track}") for url in track_urls),
|
||||
f"no PUT to /tracks/{track} (saw {track_urls})",
|
||||
)
|
||||
|
||||
def test_commits_after_all_track_updates(self):
|
||||
session = self._run_main()
|
||||
# All PUTs are track updates; commit is the second POST after the
|
||||
# initial edit-create. Verify PUTs precede the commit by checking
|
||||
# mock_calls order across both methods.
|
||||
method_order = [c[0] for c in session.method_calls]
|
||||
commit_idx = next(
|
||||
i for i, m in enumerate(method_order)
|
||||
if m == "post" and ":commit" in session.method_calls[i][1][0]
|
||||
)
|
||||
put_indices = [i for i, m in enumerate(method_order) if m == "put"]
|
||||
self.assertEqual(len(put_indices), len(deploy_playstore.TRACKS))
|
||||
self.assertTrue(all(i < commit_idx for i in put_indices))
|
||||
|
||||
|
||||
class TestUploadRetry(unittest.TestCase):
|
||||
def _run_main(self, upload_side_effects, sleep_mock=None):
|
||||
|
||||
Reference in New Issue
Block a user