ByoungSooPark/modeling-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up Nightly release version & notes (#6877)

Browse Source 
* pierremtb/adhoc/clean-up-nightly-on-merge

* To revert: test to upload builds at test/nightly

* Remove + suffix trim that's not needed anymore

* Revert "To revert: test to upload builds at test/nightly"

This reverts commit b0549d426f.
This commit is contained in:
Pierre Jacquier
2025-05-12 11:21:09 -07:00
committed by GitHub
parent 0479edd36a
commit e6485c2da1
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/build-apps.yml vendored
View File

@ -96,8 +96,7 @@ jobs:
run: | run: |
COMMIT=$(git rev-parse --short HEAD) COMMIT=$(git rev-parse --short HEAD)
DATE=$(date +'%-y.%-m.%-d') DATE=$(date +'%-y.%-m.%-d')
OFFSET=$(date +'%H%M') export VERSION=$DATE-main.$COMMIT
export VERSION=$DATE-staging.$OFFSET+$COMMIT
npm run files:set-version npm run files:set-version
npm run files:flip-to-nightly npm run files:flip-to-nightly
@ -119,7 +118,7 @@ jobs:
assets/icon.png assets/icon.png
- id: export_version - id: export_version
run: echo "version=`cat package.json | jq -r '.version' | cut -f1 -d"+"`" >> "$GITHUB_OUTPUT" run: echo "version=`cat package.json | jq -r '.version'`" >> "$GITHUB_OUTPUT"
- id: export_notes - id: export_notes
run: echo "notes=`cat release-notes.md`" >> "$GITHUB_OUTPUT" run: echo "notes=`cat release-notes.md`" >> "$GITHUB_OUTPUT"

5
scripts/flip-files-to-nightly.sh
View File

@ -1,6 +1,7 @@
#!/bin/bash #!/bin/bash
export COMMIT=$(git rev-parse --short HEAD) COMMIT=$(git rev-parse --short HEAD)
TITLE=$(git show -s --format=%s $COMMIT)
# package.json # package.json
PACKAGE=$(jq '.productName="Zoo Design Studio (Nightly)" | .name="zoo-modeling-app-nightly"' package.json --indent 2) PACKAGE=$(jq '.productName="Zoo Design Studio (Nightly)" | .name="zoo-modeling-app-nightly"' package.json --indent 2)
@ -12,7 +13,7 @@ yq -i '.appId = "dev.zoo.modeling-app-nightly"' electron-builder.yml
yq -i '.nsis.include = "./scripts/installer-nightly.nsh"' electron-builder.yml yq -i '.nsis.include = "./scripts/installer-nightly.nsh"' electron-builder.yml
# Release notes # Release notes
echo "Nightly build (commit $COMMIT)" > release-notes.md echo "[$TITLE](https://github.com/KittyCAD/modeling-app/commit/$COMMIT)" > release-notes.md
# icons # icons
cp assets/icon-nightly.png assets/icon.png cp assets/icon-nightly.png assets/icon.png

3
src/main.ts
View File

@ -446,6 +446,9 @@ export function getAutoUpdater(): AppUpdater {
// Using destructuring to access autoUpdater due to the CommonJS module of 'electron-updater'. // Using destructuring to access autoUpdater due to the CommonJS module of 'electron-updater'.
// It is a workaround for ESM compatibility issues, see https://github.com/electron-userland/electron-builder/issues/7976. // It is a workaround for ESM compatibility issues, see https://github.com/electron-userland/electron-builder/issues/7976.
const { autoUpdater } = electronUpdater const { autoUpdater } = electronUpdater
// Allows us to rollback to a previous version if needed.
// See https://github.com/electron-userland/electron-builder/blob/7dbc6c77c340c869d1e7effa22135fc740003a0f/packages/electron-updater/src/AppUpdater.ts#L450-L451
autoUpdater.allowDowngrade = true
return autoUpdater return autoUpdater
} }