Skip to content

Commit ea96459

Browse files
committed
Partly revert "build-debug: auto approve ci, manual builds need approval to sign trusted (#29)"
This partly reverts commit ae798b1.
1 parent e3e4f21 commit ea96459

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

.github/workflows/build-app.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,9 +200,11 @@ jobs:
200200
mkdir -p "$ANDROID_USER_HOME"
201201
202202
if [ -n "${{ secrets.DEBUG_KEYSTORE_B64 }}" ]; then
203+
echo "Using TRUSTED debug.keystore for builds from branches corresponding to this repository"
203204
echo '${{ secrets.DEBUG_KEYSTORE_B64 }}' | base64 -d > "${{ runner.temp }}/.android/debug.keystore"
204205
else
205-
exit 1
206+
cp "scripts/debug/debug.keystore.pub" "${{ runner.temp }}/.android/debug.keystore"
207+
echo "Using UNTRUSTED PUBLIC debug.keystore for builds from forked repositories"
206208
fi
207209
208210
- name: Build app

scripts/debug/debug.keystore.pub

2.56 KB
Binary file not shown.

wiki/Switch-between-releases_Verify-APK-is-genuine.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Syncthing-Fork "Wrapper for Syncthing" has these release channels:
1818
* * Certificate hash: x9QGpAqFQXg1+79ADsY1k0uBrj7+W1HF+PN3BunPZrM=
1919
* * Signing Certificate SHA256 fingerprint: <details>C7:D4:06:A4:0A:85:41:78:35:FB:BF:40:0E:C6:35:93:4B:81:AE:3E:FE:5B:51:C5:F8:F3:77:06:E9:CF:66:B3</details>
2020
* UNTRUSTED builds from contributors of forks:
21-
* * Debug builds triggered from potentially untrusted sources, e.g. fork repositories use a PUBLIC signing certificate. This offers NO security at all. The content of these builds is NOT authored NOR approved by this repository. They are offered for TESTING PURPOSES only and are NOT production ready.
21+
* * Debug builds triggered from potentially untrusted sources, e.g. fork repositories use a [PUBLIC signing certificate](https://github.com/researchxxl/syncthing-android/blob/main/scripts/debug/debug.keystore.pub). This offers NO security at all. The content of these builds is NOT authored NOR approved by this repository. They are offered for TESTING PURPOSES only and are NOT production ready.
2222
* * If they would not be signed by the same PUBLIC key, contributors who forked the app and opened a PR here would not be able to try out their contributed changes on their own phone or emulator by upgrading from their previous build as the CI build process would use a different debug signing key for each superseding build.
2323
* * Public UNTRUSTED key <details>Certificate hash: 0fTGzY6Ii7fxLbtKzA5t94Zid/ECP5Gj5w/s5xRLOGM=<br>SHA256 fingerprint: D1:F4:C6:CD:8E:88:8B:B7:F1:2D:BB:4A:CC:E:6D:F7:86:62:77:F1:2:3F:91:A3:E7:F:EC:E7:14:4B:38:63</details>
2424

0 commit comments

Comments
 (0)