Skip to content

Commit 9421592

Browse files
committed
[build] Fix portable suffixes
1 parent 550a5ad commit 9421592

4 files changed

Lines changed: 15 additions & 15 deletions

File tree

RELEASE-PLAN.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ Optional: version referenced below as `X.Y[.Z]` - replace with the real version
4545
- [ ] Tag `vX.Y[.Z]-release` on that commit and push. Wait for all tests/builds to pass.
4646
- [ ] Approve code signing request on SignPath, download `scenedetect-signed.zip`
4747
- [ ] Finalize Windows artifacts locally (CI can't do this - signing happens after the AppVeyor build, so the signed-exe swap and hashing must run locally):
48-
- Create `dist/signed/` and copy in both `scenedetect-signed.zip` (from SignPath) and `PySceneDetect-X.Y.Z.zip` (from the AppVeyor `PySceneDetect-win64` artifact).
49-
- Run `python scripts/finalize_windows_dist.py`. This swaps the signed `scenedetect.exe` into the portable `.zip`, repacks it with 7-Zip, copies out the signed `.msi`, and writes `PySceneDetect-X.Y.Z.manifest.json` + `SHA256SUMS`.
48+
- Create `dist/signed/` and copy in both `scenedetect-signed.zip` (from SignPath) and `PySceneDetect-X.Y.Z-win64.zip` (from the AppVeyor `PySceneDetect-win64` artifact).
49+
- Run `python scripts/finalize_windows_dist.py`. This swaps the signed `scenedetect.exe` into the portable `.zip`, repacks it with 7-Zip, copies out the signed `.msi`, and writes `PySceneDetect-X.Y.Z-win64.manifest.json` + `SHA256SUMS`.
5050
- [ ] Draft release on Github using the tagged commit: include full changelog & release notes, signed portable .ZIP, signed .MSI installer, Python .whl/.tar.gz packages, and checksum manifests (`PySceneDetect-X.Y.Z.manifest.json` + `SHA256SUMS`)
5151
- [ ] Verify all artifacts uploaded to Github release are valid and named correctly
5252
- [ ] Smoke-test all release artifacts

appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ test_script:
133133
- scenedetect.exe -i ../../tests/resources/testvideo.mp4 -b pyav detect-content time -e 2s
134134

135135
artifacts:
136-
# Portable ZIP (named PySceneDetect-X.Y.Z.zip by stage_windows_dist.py)
137-
- path: dist/PySceneDetect-*.zip
136+
# Portable ZIP (named PySceneDetect-X.Y.Z-win64.zip by stage_windows_dist.py)
137+
- path: dist/PySceneDetect-*-win64.zip
138138
name: PySceneDetect-win64
139139
# MSI Installer + .EXE Bundle for Signing
140140
- path: dist/scenedetect-signed.zip

scripts/finalize_windows_dist.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
has been downloaded.
2121
2222
Expected inputs (in --staging-dir, default `dist/signed/`):
23-
scenedetect-signed.zip - SignPath bundle (signed .exe + .msi)
24-
PySceneDetect-X.Y.Z.zip - portable .zip from AppVeyor
23+
scenedetect-signed.zip - SignPath bundle (signed .exe + .msi)
24+
PySceneDetect-X.Y.Z-win64.zip - portable .zip from AppVeyor
2525
2626
Outputs (written to the same directory):
27-
PySceneDetect-X.Y.Z.zip - repacked with the signed .exe
28-
PySceneDetect-X.Y.Z-win64.msi - signed MSI extracted from the bundle
29-
PySceneDetect-X.Y.Z.manifest.json - structured per-file SHA256 manifest
30-
SHA256SUMS - flat sha256sum -c compatible output
27+
PySceneDetect-X.Y.Z-win64.zip - repacked with the signed .exe
28+
PySceneDetect-X.Y.Z-win64.msi - signed MSI extracted from the bundle
29+
PySceneDetect-X.Y.Z-win64.manifest.json - structured per-file SHA256 manifest
30+
SHA256SUMS - flat sha256sum -c compatible output
3131
"""
3232

3333
import argparse
@@ -229,7 +229,7 @@ def write_manifests(staging: Path, portable_zip: Path, msi: Path) -> None:
229229
},
230230
}
231231

232-
manifest_path = staging / f"PySceneDetect-{VERSION}.manifest.json"
232+
manifest_path = staging / f"PySceneDetect-{VERSION}-win64.manifest.json"
233233
sums_path = staging / "SHA256SUMS"
234234
manifest_path.write_text(json.dumps(manifest, indent=2) + "\n", encoding="utf-8")
235235
sums_path.write_text(
@@ -246,7 +246,7 @@ def main() -> None:
246246
"--staging-dir",
247247
type=Path,
248248
default=REPO_DIR / "dist" / "signed",
249-
help="Directory holding scenedetect-signed.zip and PySceneDetect-*.zip.",
249+
help="Directory holding scenedetect-signed.zip and PySceneDetect-*-win64.zip.",
250250
)
251251
args = parser.parse_args()
252252

@@ -255,7 +255,7 @@ def main() -> None:
255255
sys.exit(f"{staging} not found")
256256

257257
signed_bundle = staging / "scenedetect-signed.zip"
258-
portable_zip = staging / f"PySceneDetect-{VERSION}.zip"
258+
portable_zip = staging / f"PySceneDetect-{VERSION}-win64.zip"
259259
if not signed_bundle.is_file():
260260
sys.exit(f"{signed_bundle} not found")
261261
if not portable_zip.is_file():

scripts/stage_windows_dist.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,8 @@ def stage_thirdparty_licenses() -> None:
153153

154154

155155
def make_portable_zip(version: str) -> None:
156-
zip_path = DIST_DIR / f"PySceneDetect-{version}.zip"
157-
manifest_path = DIST_DIR / f"PySceneDetect-{version}.manifest.txt"
156+
zip_path = DIST_DIR / f"PySceneDetect-{version}-win64.zip"
157+
manifest_path = DIST_DIR / f"PySceneDetect-{version}-win64.manifest.txt"
158158
if zip_path.exists():
159159
zip_path.unlink()
160160
print(f"Creating {zip_path.relative_to(REPO_DIR)}...")

0 commit comments

Comments
 (0)