Skip to content

Commit 50a0806

Browse files
committed
[dist] Drop redundant portable suffix from portable dist
1 parent 5b85976 commit 50a0806

5 files changed

Lines changed: 14 additions & 15 deletions

File tree

.github/workflows/build-windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
- name: Upload Artifact
104104
uses: actions/upload-artifact@v6
105105
with:
106-
name: PySceneDetect-win64_portable
106+
name: PySceneDetect-win64
107107
path: dist/scenedetect
108108
include-hidden-files: true
109109

@@ -117,7 +117,7 @@ jobs:
117117

118118
- uses: actions/download-artifact@v7
119119
with:
120-
name: PySceneDetect-win64_portable
120+
name: PySceneDetect-win64
121121
path: build
122122

123123
- name: Test

RELEASE-PLAN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ 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-portable.zip` (from the AppVeyor `PySceneDetect-win64_portable` artifact).
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).
4949
- 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`.
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

appveyor.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,14 +133,14 @@ 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-portable.zip by stage_windows_dist.py)
137-
- path: dist/PySceneDetect-*-portable.zip
138-
name: PySceneDetect-win64_portable
136+
# Portable ZIP (named PySceneDetect-X.Y.Z.zip by stage_windows_dist.py)
137+
- path: dist/PySceneDetect-*.zip
138+
name: PySceneDetect-win64
139139
# MSI Installer + .EXE Bundle for Signing
140140
- path: dist/scenedetect-signed.zip
141141
name: PySceneDetect-win64_installer
142142
# Build provenance: post-sync .aip and the portable payload manifest.
143143
- path: dist/PySceneDetect.aip
144144
name: PySceneDetect-build-manifest-aip
145-
- path: dist/PySceneDetect-*-portable.manifest.txt
145+
- path: dist/PySceneDetect-*.manifest.txt
146146
name: PySceneDetect-build-manifest-payload

scripts/finalize_windows_dist.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
2222
Expected inputs (in --staging-dir, default `dist/signed/`):
2323
scenedetect-signed.zip - SignPath bundle (signed .exe + .msi)
24-
PySceneDetect-X.Y.Z-portable.zip - portable .zip from AppVeyor
24+
PySceneDetect-X.Y.Z.zip - portable .zip from AppVeyor
2525
2626
Outputs (written to the same directory):
27-
PySceneDetect-X.Y.Z-portable.zip - repacked with the signed .exe
27+
PySceneDetect-X.Y.Z.zip - repacked with the signed .exe
2828
PySceneDetect-X.Y.Z-win64.msi - signed MSI extracted from the bundle
2929
PySceneDetect-X.Y.Z.manifest.json - structured per-file SHA256 manifest
3030
SHA256SUMS - flat sha256sum -c compatible output
@@ -127,8 +127,7 @@ def verify_authenticode(path: Path) -> None:
127127
lines = [line.strip() for line in result.stdout.splitlines() if line.strip()]
128128
if result.returncode != 0 or not lines:
129129
sys.exit(
130-
f"Authenticode check for {path.name} failed to run.\n"
131-
f" stderr: {result.stderr.strip()}"
130+
f"Authenticode check for {path.name} failed to run.\n stderr: {result.stderr.strip()}"
132131
)
133132
status = lines[0]
134133
subject = lines[1] if len(lines) > 1 else "<no certificate>"
@@ -247,7 +246,7 @@ def main() -> None:
247246
"--staging-dir",
248247
type=Path,
249248
default=REPO_DIR / "dist" / "signed",
250-
help="Directory holding scenedetect-signed.zip and PySceneDetect-*-portable.zip.",
249+
help="Directory holding scenedetect-signed.zip and PySceneDetect-*.zip.",
251250
)
252251
args = parser.parse_args()
253252

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

258257
signed_bundle = staging / "scenedetect-signed.zip"
259-
portable_zip = staging / f"PySceneDetect-{VERSION}-portable.zip"
258+
portable_zip = staging / f"PySceneDetect-{VERSION}.zip"
260259
if not signed_bundle.is_file():
261260
sys.exit(f"{signed_bundle} not found")
262261
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}-portable.zip"
157-
manifest_path = DIST_DIR / f"PySceneDetect-{version}-portable.manifest.txt"
156+
zip_path = DIST_DIR / f"PySceneDetect-{version}.zip"
157+
manifest_path = DIST_DIR / f"PySceneDetect-{version}.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)