Skip to content

Commit 169b107

Browse files
committed
Regenerate server cert on every startup; drop edge.xx from pre-release filenames
- generate_bundle now always regenerates the server cert while preserving the CA cert (and its private key) so the trust store stays valid - remove clear_server_certs from config migration since it's no longer needed - drop edge.${run_number} from edge pre-release artifact names (commit id already provides uniqueness)
1 parent a108d10 commit 169b107

6 files changed

Lines changed: 198 additions & 78 deletions

File tree

.github/workflows/publish-edge-pre-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
)
6969
build_serial="$(( GITHUB_RUN_NUMBER % 10000 ))"
7070
short_sha="${GITHUB_SHA::12}"
71-
edge_version="${base_version}-edge.${GITHUB_RUN_NUMBER}.${short_sha}"
71+
edge_version="${base_version}-${short_sha}"
7272
RELEASE_VERSION="${edge_version}" \
7373
ANDROID_VERSION_SERIAL="${build_serial}" \
7474
"$PYTHON_BIN" ./scripts/ci-sync-version.py
@@ -173,7 +173,7 @@ jobs:
173173
)
174174
build_serial="$(( GITHUB_RUN_NUMBER % 10000 ))"
175175
short_sha="${GITHUB_SHA::12}"
176-
edge_version="${base_version}-edge.${GITHUB_RUN_NUMBER}.${short_sha}"
176+
edge_version="${base_version}-${short_sha}"
177177
RELEASE_VERSION="${edge_version}" \
178178
ANDROID_VERSION_SERIAL="${build_serial}" \
179179
"$PYTHON_BIN" ./scripts/ci-sync-version.py

Cargo.lock

Lines changed: 138 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ http-body-util = "0.1"
5959
hyper = { version = "1", features = ["http1", "server"] }
6060
hyper-util = { version = "0.1", features = ["server", "server-auto", "http1", "http2", "tokio"] }
6161
libc = "0.2"
62-
rcgen = "0.12"
62+
rcgen = { version = "0.12", features = ["x509-parser"] }
6363
reqwest = { version = "0.12", default-features = false, features = ["http2", "rustls-tls"] }
6464
rustls = { version = "0.23", features = ["ring"] }
6565
rustls-pemfile = "2"

0 commit comments

Comments
 (0)