Skip to content

The truly free, open-source, local-first, cross-platform CapCut replacement. Scriptable through a JSON-RPC API & MCP.

ci: no nightly, and installers and binaries only, never an archive

Jareerd4fc29a3a3c3
diff --git a/.github/release-notes.sh b/.github/release-notes.sh
index 1abfc42f..6d453f7f 100755
--- a/.github/release-notes.sh
+++ b/.github/release-notes.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
-# The notes for a release or a nightly, from the commits it is made of.
+# The notes for a release, from the commits it is made of.
#
-# Usage: release-notes.sh <since-ref> <until-ref> <title> [nightly]
+# Usage: release-notes.sh <since-ref> <until-ref> <title>
#
# Writes markdown to stdout: what changed, as the subjects of the commits
# between the two refs; how to install each bundle; the checksum file; the
@@ -27,7 +27,6 @@ set -euo pipefail
since="$1"
until="$2"
title="$3"
-kind="${4:-release}"
# A conventional-commit type, with its optional (scope) and breaking `!`.
type='^[a-z]+(\([^)]*\))?!?: '
@@ -45,11 +44,7 @@ changes=$(git log "$since..$until" --no-merges --format='%s' 2>/dev/null \
echo "## $title"
echo
-if [ "$kind" = "nightly" ]; then
- echo "The newest main, rebuilt on every push. For a release, see the tagged ones."
-else
- echo "A self-contained build for every platform Concat ships on."
-fi
+echo "A self-contained build for every platform Concat ships on."
echo
if [ -n "$changes" ]; then
echo "### What changed"
@@ -63,8 +58,8 @@ cat <<'EOF'
| | Apple silicon | Intel / x86_64 | arm64 |
|---|---|---|---|
| macOS | `macos-arm64.dmg` | `macos-x86_64.dmg` | |
-| Windows | | `windows-x86_64.zip` | `windows-aarch64.zip` |
-| Linux | | `linux-x86_64.tar.gz` | `linux-aarch64.tar.gz` |
+| Windows | | `windows-x86_64-setup.exe`, `.msi` | `windows-aarch64-setup.exe`, `.msi` |
+| Linux | | `linux-x86_64.deb`, `.rpm`, `.AppImage` | `linux-aarch64.deb`, `.rpm`, `.AppImage` |
| Android | | | `android-arm64.apk` |
| iOS / iPadOS | | | `ios-arm64.ipa` |
@@ -72,10 +67,11 @@ Every bundle runs with nothing else installed.
- **macOS**: open the `.dmg` and drag Concat to Applications. If macOS says
the app cannot be checked, right-click it and choose Open once.
-- **Windows**: unzip and run `concat.exe`. The FFmpeg libraries beside it
- stay beside it.
-- **Linux**: `tar xzf` the archive and run `./concat` from the folder;
- `concat.desktop` is there for a launcher.
+- **Windows**: run the `-setup.exe`; it puts Concat in the Start menu and
+ can take it out again. The `.msi` is the same program for an
+ administrator to deploy, machine-wide.
+- **Linux**: install the `.deb` or the `.rpm` with your package manager,
+ or `chmod +x` the `.AppImage` and run it; no install needed.
- **Android**: open the `.apk` on the phone and allow the install from
this source; Android 8.0 or newer, 64-bit.
- **iOS / iPadOS**: sideload the `.ipa` with AltStore, Sideloadly or
diff --git a/.github/workflows/build-app.yml b/.github/workflows/build-app.yml
index a4114b45..55c1596e 100644
--- a/.github/workflows/build-app.yml
+++ b/.github/workflows/build-app.yml
@@ -5,12 +5,15 @@ name: Build app
# architecture so nothing is cross-compiled, and uploads one artifact per
# target:
#
-# macOS arm64 (Apple silicon) x86_64 (Intel) -> Concat.dmg
-# Linux x86_64 aarch64 -> Concat-*.tar.gz
-# Windows x86_64 aarch64 -> Concat-*.zip
+# macOS arm64 (Apple silicon) x86_64 (Intel) -> Concat-*.dmg
+# Linux x86_64 aarch64 -> Concat-*.deb, .rpm, .AppImage
+# Windows x86_64 aarch64 -> Concat-*-setup.exe, .msi
#
-# Reusable: nightly.yml calls it on every push to main, release.yml on every
-# tag. It is the one place the build environment is described:
+# Installers and binaries only: the program is not shipped as an archive
+# of a folder to unpack, so what a person downloads is what they run.
+#
+# Reusable: release.yml calls it on every tag. It is the one place the
+# build environment is described:
#
# - The engine links FFmpeg and compiles whisper.cpp in, so a build needs the
# FFmpeg 7+ development libraries (headers and import libraries), cmake, a
@@ -546,14 +549,13 @@ jobs:
echo "the binary does not resolve every library from its own folder" >&2
exit 1
fi
- (cd stage && tar -czf "$name.tar.gz" "$name")
- # The same folder three more ways. A .deb and an .rpm, from one
- # description in assets/linux/nfpm.yaml: the program whole under
- # /opt/concat, a launcher on the path, a desktop entry and an icon.
- # And an AppImage: the folder as an AppDir, one file that runs on
- # any distribution with the toolkit installed, which every desktop
- # has. Both from the folder the tarball was made of - see issue #83.
+ # The folder three ways. A .deb and an .rpm, from one description in
+ # assets/linux/nfpm.yaml: the program whole under /opt/concat, a
+ # launcher on the path, a desktop entry and an icon. And an AppImage:
+ # the folder as an AppDir, one file that runs on any distribution
+ # with the toolkit installed, which every desktop has. All three from
+ # the one staged folder, so they ship the same files - see issue #83.
- name: Package (Linux)
if: matrix.platform == 'linux'
env:
@@ -621,9 +623,9 @@ jobs:
# The sherpa-onnx runtime, set aside by the download step above.
Copy-Item "$env:SHERPA_DLL_DIR\*.dll" "stage\$name\"
Copy-Item LICENSE, THIRD_PARTY_NOTICES.md "stage\$name\"
- # The installer, from the same folder, before it is zipped away:
- # Inno Setup, which the x64 image carries and the ARM image is
- # given. See assets/windows/concat.iss.
+ # The installer, from that folder: Inno Setup, which the x64
+ # image carries and the ARM image is given. See
+ # assets/windows/concat.iss.
$iscc = "${env:ProgramFiles(x86)}\Inno Setup 6\ISCC.exe"
if (-not (Test-Path $iscc)) {
Write-Host "Installing Inno Setup"
@@ -643,7 +645,7 @@ jobs:
-o "stage\$name.msi" assets\windows\concat.wxs
if ($LASTEXITCODE -ne 0) { throw "WiX failed with $LASTEXITCODE" }
if (-not (Test-Path "stage\$name.msi")) { throw "stage\$name.msi is not there" }
- Compress-Archive -Path "stage\$name" -DestinationPath "stage\$name.zip"
+ # The folder itself is not published: the two installers are.
Remove-Item -Recurse -Force "stage\$name"
- uses: actions/upload-artifact@v7
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0ecacecf..6ef33b3c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,8 +1,7 @@
name: CI
-# The engine's tests and lints on every push and pull request. A green run
-# on main is what nightly.yml waits for before it builds the app for every
-# platform; see that file and release.yml for the bundles.
+# The engine's tests and lints on every push and pull request. The bundles
+# are built by release.yml, on a tag; see that file.
on:
push:
branches: [main]
diff --git a/.github/workflows/mobile.yml b/.github/workflows/mobile.yml
index 41ea64a2..ab1bec21 100644
--- a/.github/workflows/mobile.yml
+++ b/.github/workflows/mobile.yml
@@ -6,9 +6,9 @@ name: Build for phones
# Android arm64 -> Concat-<version>-android-arm64.apk
# iOS arm64 -> Concat-<version>-ios-arm64.ipa
#
-# Reusable, the way build-app.yml is: nightly.yml calls it on every push
-# to main and release.yml on every tag, so the nightly and the releases
-# carry the phones beside the desktops. Pull requests build here directly.
+# Reusable, the way build-app.yml is: release.yml calls it on every tag,
+# so a release carries the phones beside the desktops. Pull requests build
+# here directly.
#
# Phones are cross-compiled - the Android job runs on Linux with the NDK,
# the iOS job on macOS with Xcode - and the two native libraries that
@@ -36,9 +36,9 @@ on:
pull_request:
workflow_dispatch:
-# Keyed by the calling workflow too, so a call from the nightly or a
-# release never shares a group with a pull request's run. A tag's release
-# is never cancelled; everything else is superseded by the next push.
+# Keyed by the calling workflow too, so a call from a release never shares
+# a group with a pull request's run. A tag's release is never cancelled;
+# everything else is superseded by the next push.
concurrency:
group: mobile-${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ !startsWith(github.ref, 'refs/tags/') }}
@@ -149,8 +149,7 @@ jobs:
} >> "$GITHUB_STEP_SUMMARY"
fi
- # Named by version and target, as the desktop bundles are; the
- # nightly stamps its commit into the same name.
+ # Named by version and target, as the desktop bundles are.
- name: Stage
env:
VERSION: ${{ steps.version.outputs.version }}
diff --git a/assets/linux/nfpm.yaml b/assets/linux/nfpm.yaml
index a117ddd0..3888dd26 100644
--- a/assets/linux/nfpm.yaml
+++ b/assets/linux/nfpm.yaml
@@ -1,7 +1,7 @@
# Concat's Linux packages: one description for the .deb and the .rpm.
#
-# Built by build-app.yml with nfpm from the very folder the tarball is
-# made of, so every Linux bundle ships the same files. The program lives
+# Built by build-app.yml with nfpm from the staged folder the AppImage is
+# also made of, so every Linux bundle ships the same files. The program lives
# whole under /opt/concat - the binary finds its libraries in lib/ beside
# itself, by rpath, and nothing else on the system has to line up - with
# a launcher on the path, a desktop entry and an icon where the desktop
@@ -9,8 +9,8 @@
# environment; the files are named relative to the staged folder, which
# is where nfpm is run from:
#
-# cd stage/Concat-0.2.2-linux-x86_64
-# VERSION=0.2.2 NFPM_ARCH=amd64 nfpm package -f ../../assets/linux/nfpm.yaml -p deb -t ..
+# cd stage/Concat-0.2.3-linux-x86_64
+# VERSION=0.2.3 NFPM_ARCH=amd64 nfpm package -f ../../assets/linux/nfpm.yaml -p deb -t ..
name: concat
arch: ${NFPM_ARCH}
platform: linux
diff --git a/assets/windows/concat.iss b/assets/windows/concat.iss
index 6ce47c5b..9d82138f 100644
--- a/assets/windows/concat.iss
+++ b/assets/windows/concat.iss
@@ -1,12 +1,12 @@
; Concat's Windows installer.
;
-; Built by build-app.yml with Inno Setup from the very folder the zip is
-; made of, so the two ship the same files; the zip is the portable copy,
-; this is the one that puts Concat in the Start menu and can take it out
-; again. Everything it needs is handed in on the command line:
+; Built by build-app.yml with Inno Setup from the staged folder the .msi
+; is also made of, so the two ship the same files; this is the one a
+; person double-clicks, and it puts Concat in the Start menu and can take
+; it out again. Everything it needs is handed in on the command line:
;
-; iscc /DVersion=0.2.2 /DArch=x64compatible /DSuffix=x86_64 ^
-; /DStage=C:\...\stage\Concat-0.2.2-windows-x86_64 /DOut=C:\...\stage ^
+; iscc /DVersion=0.2.3 /DArch=x64compatible /DSuffix=x86_64 ^
+; /DStage=C:\...\stage\Concat-0.2.3-windows-x86_64 /DOut=C:\...\stage ^
; assets\windows\concat.iss
;
; Arch is Inno's own word for the machine: x64compatible for the x86_64
diff --git a/assets/windows/concat.wxs b/assets/windows/concat.wxs
index f7e104aa..6d7058aa 100644
--- a/assets/windows/concat.wxs
+++ b/assets/windows/concat.wxs
@@ -2,15 +2,15 @@
<!--
Concat's Windows Installer package, the .msi beside the Inno Setup .exe.
- Built by build-app.yml with WiX from the very folder the zip is made of,
- so the two installers and the zip ship the same files. The .exe is the
+ Built by build-app.yml with WiX from the staged folder the .exe is made
+ of, so the two installers ship the same files. The .exe is the
one a person double-clicks; this is the one an administrator deploys -
Group Policy, Intune, winget - and it installs for the machine, into
Program Files, with a Start menu entry and a clean uninstall. Handed in:
- wix build -arch x64 -d Version=0.2.2 -d Root=C:\...\Concat
- -d Stage=C:\...\stage\Concat-0.2.2-windows-x86_64
- -o stage\Concat-0.2.2-windows-x86_64.msi assets\windows\concat.wxs
+ wix build -arch x64 -d Version=0.2.3 -d Root=C:\...\Concat
+ -d Stage=C:\...\stage\Concat-0.2.3-windows-x86_64
+ -o stage\Concat-0.2.3-windows-x86_64.msi assets\windows\concat.wxs
Root is the repository: WiX resolves a source path against where it is
run from, not against this file.
diff --git a/scripts/models.py b/scripts/models.py
index c5e86e7c..c7155af6 100755
--- a/scripts/models.py
+++ b/scripts/models.py
@@ -38,17 +38,25 @@ TABLES = {
"whisper": CRATES / "concat-speech" / "src" / "transcribe.rs",
}
-# The eight bundles a release publishes, as build-app.yml and mobile.yml
-# name them. Stem is formatted with the version.
+# The bundles a release publishes, as build-app.yml and mobile.yml name
+# them: platform, architecture, the kind of file, and its name with the
+# version to fill in. Installers and binaries, never an archive of a
+# folder - a person downloads the thing they run.
BUNDLES = [
- ("macos", "arm64", "Concat-{v}-macos-arm64.dmg"),
- ("macos", "x86_64", "Concat-{v}-macos-x86_64.dmg"),
- ("linux", "x86_64", "Concat-{v}-linux-x86_64.tar.gz"),
- ("linux", "aarch64", "Concat-{v}-linux-aarch64.tar.gz"),
- ("windows", "x86_64", "Concat-{v}-windows-x86_64.zip"),
- ("windows", "aarch64", "Concat-{v}-windows-aarch64.zip"),
- ("android", "arm64", "Concat-{v}-android-arm64.apk"),
- ("ios", "arm64", "Concat-{v}-ios-arm64.ipa"),
+ ("macos", "arm64", "dmg", "Concat-{v}-macos-arm64.dmg"),
+ ("macos", "x86_64", "dmg", "Concat-{v}-macos-x86_64.dmg"),
+ ("linux", "x86_64", "deb", "Concat-{v}-linux-x86_64.deb"),
+ ("linux", "x86_64", "rpm", "Concat-{v}-linux-x86_64.rpm"),
+ ("linux", "x86_64", "appimage", "Concat-{v}-linux-x86_64.AppImage"),
+ ("linux", "aarch64", "deb", "Concat-{v}-linux-aarch64.deb"),
+ ("linux", "aarch64", "rpm", "Concat-{v}-linux-aarch64.rpm"),
+ ("linux", "aarch64", "appimage", "Concat-{v}-linux-aarch64.AppImage"),
+ ("windows", "x86_64", "setup", "Concat-{v}-windows-x86_64-setup.exe"),
+ ("windows", "x86_64", "msi", "Concat-{v}-windows-x86_64.msi"),
+ ("windows", "aarch64", "setup", "Concat-{v}-windows-aarch64-setup.exe"),
+ ("windows", "aarch64", "msi", "Concat-{v}-windows-aarch64.msi"),
+ ("android", "arm64", "apk", "Concat-{v}-android-arm64.apk"),
+ ("ios", "arm64", "ipa", "Concat-{v}-ios-arm64.ipa"),
]
@@ -277,8 +285,10 @@ def release_manifest(version: str, tag: str, bundles: pathlib.Path | None) -> di
data = table()
release = data["release"]
+ # platform -> architecture -> kind -> the file, so a reader asks for
+ # the one it installs with: binaries.linux.x86_64.deb.
binaries: dict[str, dict] = {}
- for platform, arch, stem in BUNDLES:
+ for platform, arch, kind, stem in BUNDLES:
file = stem.format(v=version)
entry = {
"file": file,
@@ -293,7 +303,7 @@ def release_manifest(version: str, tag: str, bundles: pathlib.Path | None) -> di
# A target that did not build is absent rather than a row
# promising a file that is not there.
continue
- binaries.setdefault(platform, {})[arch] = entry
+ binaries.setdefault(platform, {}).setdefault(arch, {})[kind] = entry
models = {}
for model in data["model"]:
@@ -320,7 +330,8 @@ def release_manifest(version: str, tag: str, bundles: pathlib.Path | None) -> di
}
return {
- "schema": 1,
+ # 2: a target holds one row per kind of file, not one file.
+ "schema": 2,
"product": "Concat",
"version": version,
"tag": tag,