Skip to content

Free, open-source 3D sculpting for Linux, macOS and Windows: dense meshes, remeshing, painting, built-in AI (image/text to 3D), Send to Unreal, game-ready LODs, Gaussian splats and OpenUSD.

Merge feat/one-click-update 1771a204 (member sign-in, reused by the membership card)

islandmeddd59b25981ed
diff --cc .github/workflows/release.yml
index acf54601,445d3d78..1026255e
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@@ -273,9 -271,18 +273,13 @@@ jobs
run: python3 -m zipfile -c dist/sculptforge_maya.zip integrations/maya/sculptforge_maya.py integrations/maya/README.md
- name: Checksums
run: cd dist && sha256sum * > SHA256SUMS.txt && cat SHA256SUMS.txt
+ - name: Sign the checksums (one-click update checks SHA256SUMS.txt.sig, src/core/SelfUpdate.h)
+ env:
+ UPDATE_SIGNING_KEY: ${{ secrets.UPDATE_SIGNING_KEY }}
+ run: tools/release/sign_sums.sh dist
- name: Release notes from CHANGELOG
run: |
- section=${TAG#v}
- if [[ "$TAG" == *-* ]]; then # a beta: what has changed since the stable release
- section=Unreleased
- printf '%s\n\n' "**Beta for testers.** Please report problems in the Discord's #bug-reports (or a GitHub issue) with your OS, this version (Help > About) and your graphics card. Preferences > Updates > Update channel: Preview offers the next betas." > notes.md
- fi
- awk -v h="## [$section]" 'index($0, h) == 1 {flag=1;next} /^## \[/{flag=0} flag' CHANGELOG.md >> notes.md
+ awk -v h="## [${TAG#v}]" 'index($0, h) == 1 {flag=1;next} /^## \[/{flag=0} flag' CHANGELOG.md > notes.md
cat packaging/release-notes-footer.md >> notes.md
- name: Create or update the release
env:
diff --cc scripts/release.sh
index a64e013c,575d9b51..2c2b3370
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@@ -100,9 -96,13 +100,13 @@@ push_main()
gitp push -q origin HEAD:main || die "push to main refused" "git pull --rebase origin main, check the result, run again"
}
release_ready() {
- gh release view "$T" -R "$REPO" --json assets -q '.assets[].name' > "$work/assets" 2>/dev/null ||
+ gh release view "$T" -R "$RELEASE_REPO" --json assets -q '.assets[].name' > "$work/assets" 2>/dev/null ||
die "no GitHub release $T yet" "run the earlier steps: scripts/release.sh $V --from tag"
grep -qx SHA256SUMS.txt "$work/assets" || die "release $T has no SHA256SUMS.txt (unfinished)" "re-run the Release workflow: gh workflow run release.yml -R $REPO -f tag=$T"
+ # One-click update (src/core/SelfUpdate.h): once the app has a key, every release must carry the signature.
+ if grep -q 'kUpdatePublicKeyHex = "[0-9a-f]\{64\}"' src/core/SelfUpdate.h 2>/dev/null; then
+ grep -qx SHA256SUMS.txt.sig "$work/assets" || die "release $T has no SHA256SUMS.txt.sig: apps can't update to it in one click" "check the UPDATE_SIGNING_KEY secret, then re-run the Release workflow: gh workflow run release.yml -R $REPO -f tag=$T"
+ fi
}
# Downloads one release asset and checks it against SHA256SUMS.txt with a checksum computed here. Prints the sum.
asset_sha() {
diff --cc src/app/PanelProject.cpp
index 54543028,ac2d8098..62a55c33
--- a/src/app/PanelProject.cpp
+++ b/src/app/PanelProject.cpp
@@@ -786,21 -803,23 +803,23 @@@ void App::drawUpdateBanner()
if (guide_.bodyFont()) ImGui::PopFont();
ImGui::Spacing();
bool close = false;
- if (ImGui::Button(tr("What's new"))) SDL_OpenURL(u.notesUrl.c_str());
- ImGui::SameLine();
- if (ImGui::Button(tr("Download"))) {
- SDL_OpenURL(u.downloadUrl.c_str());
- close = true;
- }
- ImGui::SameLine();
- if (ImGui::Button(tr("Become a member"))) openSupportPage();
- ImGui::SameLine();
- if (ImGui::Button(tr("Later"))) close = true;
- ImGui::SameLine();
- if (ImGui::Button(tr("Skip this version"))) {
- updateSkipped_ = u.version;
- saveProjectPrefs();
- close = true;
+ if (!drawSelfUpdate(u, close)) { // (PanelUpdate.cpp: Update, or the package manager's command)
+ if (ImGui::Button(tr("What's new"))) SDL_OpenURL(u.notesUrl.c_str());
+ ImGui::SameLine();
+ if (ImGui::Button(tr("Download"))) {
+ SDL_OpenURL(u.downloadUrl.c_str());
+ close = true;
+ }
+ ImGui::SameLine();
- if (ImGui::Button(tr("Become an Insider"))) openSupportPage();
++ if (ImGui::Button(tr("Become a member"))) openSupportPage();
+ ImGui::SameLine();
+ if (ImGui::Button(tr("Later"))) close = true;
+ ImGui::SameLine();
+ if (ImGui::Button(tr("Skip this version"))) {
+ updateSkipped_ = u.version;
+ saveProjectPrefs();
+ close = true;
+ }
}
if (close) updateAvailable_.reset();
}