feat(release): name a nightly by its commit count on main and its commit #2733
Open
github-sync
wants to merge 1 commit from
github/pr/2733 into main
pull from: github/pr/2733
merge into: MagicBeanDev:main
MagicBeanDev:main
MagicBeanDev:github/pr/2893
MagicBeanDev:github/pr/2890
MagicBeanDev:github/pr/2887
MagicBeanDev:github/pr/2878
MagicBeanDev:github/pr/2875
MagicBeanDev:github/pr/2874
MagicBeanDev:github/pr/2873
MagicBeanDev:github/pr/2871
MagicBeanDev:github/pr/2756
MagicBeanDev:github/pr/2897
MagicBeanDev:github/pr/2896
MagicBeanDev:github/pr/2718
MagicBeanDev:github/pr/2842
MagicBeanDev:github/pr/2691
MagicBeanDev:github/pr/2895
MagicBeanDev:github/pr/2743
MagicBeanDev:github/pr/2765
MagicBeanDev:github/pr/2708
MagicBeanDev:github/pr/2732
MagicBeanDev:github/pr/2755
MagicBeanDev:github/pr/2817
MagicBeanDev:github/pr/2876
MagicBeanDev:release-please--branches--main
MagicBeanDev:release-please--branches--main--release-notes
MagicBeanDev:github/pr/2778
MagicBeanDev:github/pr/2888
MagicBeanDev:github/pr/2866
MagicBeanDev:github/pr/2877
MagicBeanDev:github/pr/2800
MagicBeanDev:github/pr/2829
MagicBeanDev:github/pr/2850
MagicBeanDev:github/pr/2889
MagicBeanDev:github/pr/2882
MagicBeanDev:github/pr/2860
MagicBeanDev:github/pr/2849
MagicBeanDev:github/pr/2886
MagicBeanDev:github/pr/2794
MagicBeanDev:github/pr/2840
MagicBeanDev:github/pr/2830
MagicBeanDev:github/pr/2834
MagicBeanDev:github/pr/2719
MagicBeanDev:github/pr/2742
MagicBeanDev:github/pr/2741
MagicBeanDev:github/pr/2820
MagicBeanDev:github/pr/2771
MagicBeanDev:github/pr/2859
MagicBeanDev:github/pr/2858
MagicBeanDev:github/pr/2823
MagicBeanDev:github/pr/2757
MagicBeanDev:github/pr/2769
MagicBeanDev:github/pr/2844
MagicBeanDev:github/pr/2843
MagicBeanDev:github/pr/2673
MagicBeanDev:github/pr/2855
MagicBeanDev:github/pr/2739
MagicBeanDev:github/pr/2807
MagicBeanDev:github/pr/2851
MagicBeanDev:github/pr/2789
MagicBeanDev:github/pr/2814
MagicBeanDev:github/pr/2818
MagicBeanDev:github/pr/2774
MagicBeanDev:github/pr/2772
MagicBeanDev:github/pr/2750
MagicBeanDev:github/pr/2786
MagicBeanDev:github/pr/2785
MagicBeanDev:github/pr/2782
MagicBeanDev:github/pr/2779
MagicBeanDev:github/pr/2775
MagicBeanDev:github/pr/2706
MagicBeanDev:github/pr/2766
MagicBeanDev:github/pr/2747
MagicBeanDev:github/pr/2759
MagicBeanDev:github/pr/2745
MagicBeanDev:github/pr/2740
MagicBeanDev:github/pr/2725
MagicBeanDev:github/pr/2727
MagicBeanDev:github/pr/2728
MagicBeanDev:github/pr/2729
MagicBeanDev:github/pr/2721
MagicBeanDev:github/pr/2722
MagicBeanDev:github/pr/2715
MagicBeanDev:github/pr/2714
MagicBeanDev:github/pr/2707
MagicBeanDev:github/pr/2703
MagicBeanDev:github/pr/2705
MagicBeanDev:github/pr/2697
MagicBeanDev:github/pr/2679
MagicBeanDev:github/pr/2676
MagicBeanDev:github/pr/2669
MagicBeanDev:docs/what-hookshot-connects-to
MagicBeanDev:fix/hdr-encode-test
MagicBeanDev:fix/main-tests
MagicBeanDev:fix/play-cache-files
MagicBeanDev:perf/game-barrier-order
MagicBeanDev:feat/heap-lazy
MagicBeanDev:feat/texture-detail
MagicBeanDev:perf/astc-opaque-bc1
MagicBeanDev:fix/fs-dir-lock
MagicBeanDev:fix/framegen-native-kept
MagicBeanDev:fix/update-no-downgrade
MagicBeanDev:port/k10-gcn-f16-mirrors
MagicBeanDev:fix/framegen-mult-cap
MagicBeanDev:chore/release-as-2.1.1
MagicBeanDev:perf/pcache-load-switch
MagicBeanDev:fix/prepare-progress-log
MagicBeanDev:fix/update-closes-stale-game
MagicBeanDev:fix/hdr-scaled-sampled
MagicBeanDev:perf/first-start-preset
MagicBeanDev:perf/zero-upload
MagicBeanDev:fix/vcore-escape-2s
MagicBeanDev:test/fake-gh-atomic
MagicBeanDev:perf/batch-idle-flush
MagicBeanDev:test/finish-stub-a
MagicBeanDev:chore/record-2.1.0
MagicBeanDev:fix/main-red-tests
MagicBeanDev:fix/test-display-startup-driver-cache
MagicBeanDev:feat/mesh-shader-mode
MagicBeanDev:fix/menu-probes-at-startup
MagicBeanDev:fix/fps-counter-classic
MagicBeanDev:fix/test-log-batch-flake
MagicBeanDev:fix/narrow-screen-hud
MagicBeanDev:ci/prereleases
MagicBeanDev:release/v2.0.15
MagicBeanDev:hotfix/v2.0.15
MagicBeanDev:fix/present-ahead-replay
MagicBeanDev:release/v2.0.13
MagicBeanDev:fix/bracket-paths-2013
MagicBeanDev:fix/hdr-overlays-2013
MagicBeanDev:fix/fps-counter-scale-2013
MagicBeanDev:fix/stick-seen-at-rest
MagicBeanDev:hotfix/menu-fits-screen
MagicBeanDev:fix/f1-always-opens-menu
MagicBeanDev:fix/ini-keep-lines
MagicBeanDev:claude/cranky-pike-7cf247
MagicBeanDev:perf/texture-answer-flat
MagicBeanDev:fix/stamp-test-modules
MagicBeanDev:fix/appimage-fonts
MagicBeanDev:fix/display-awake
MagicBeanDev:release/v2.0.12
MagicBeanDev:fix/discord-windows
MagicBeanDev:rc/v2.0.12-tests
MagicBeanDev:fix/dlss-keep-feature
MagicBeanDev:rc/v2.0.12
MagicBeanDev:button-icons
No reviewers
Labels
Clear labels
accessibility
Barrier affecting people with disabilities
autorelease: pending
autorelease: tagged
bug
Something isn't working
dependencies
Pull requests that update a dependency file
documentation
Improvements or additions to documentation
duplicate
This issue or pull request already exists
enhancement
New feature or request
github_actions
Pull requests that update GitHub Actions code
good first issue
Good for newcomers
help wanted
Extra attention is needed
invalid
This doesn't seem right
question
Further information is requested
testing wanted
wontfix
This will not be worked on
No labels
accessibility
autorelease: pending
autorelease: tagged
bug
dependencies
documentation
duplicate
enhancement
github_actions
good first issue
help wanted
invalid
question
testing wanted
wontfix
Milestone
Clear milestone
No items
No milestone
Assignees
Clear assignees
No assignees
1 participant
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".
No due date set.
Dependencies
No dependencies set
Reference
MagicBeanDev/Hookshot!2733
Loading…
Reference in a new issue
No description provided.
Delete branch "github/pr/2733"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
Right now a nightly calls itself
v2.1.0-rc.3-251-gee29dd55, which looks like a release candidate and can't be compared with another nightly at a glance. After this PR it shows as Nightly 2029 ·ee29dd55, and a later nightly always has a higher number.This is the first of three PRs. The second is #2722, where the 2.x Builder hands over to the launcher. The third is the launcher itself, #2739.
What changed
The name. CI now names every build that isn't for a release tag
nightly-<count>-<commit>. That covers the nightly, pull requests and the Actions tab. The count isgit rev-list --count HEADand the commit is 8 hex digits. The name comes from the newscripts/nightly_name.sh, which both build workflows andscripts/linux/appimage.shuse. A build on a tagged commit gets this name too, so it is still known to be the nightly. A local checkout gets the same name fromnx2/version.py, plus-dirtywhen it has changes. A checkout exactly on a release tag keeps the tag. Releases and release candidates are named as before.Where it shows. Players see "Nightly 2029 ·
ee29dd55" in:File names, logs and the update lists keep the plain name. For example, the AppImage is
Hookshot-nightly-2029-ee29dd55-x86_64.AppImage, which the existing zsync globHookshot-*-x86_64.AppImage.zsyncstill matches.The order. Nightlies are ordered by their count, so a nightly is offered only a newer nightly, never an older one. Every new-style nightly is newer than every old
git describeone, so current nightly installs move on to the first new nightly.Nightlies and releases are separate tracks. A nightly name has no version number in it, so it is never compared with a release or a release candidate. In practice:
Windows builder version. MSBuild's
Versionmust be a NuGet version, so the Windows builder's assembly gets0.0.0-nightly.<count>on a nightly. Nothing reads the assembly version: the builder reads its version fromtools/version.txt.Docs. The rules are in
docs/versioning.md, which now also covers:maincounts higher thanmain's nightly, and so isn't offered it;mainwere ever rewritten to fewer commits, the following nightlies would count lower than the installed one.How it was tested
python -I -B tests/run_all.pyon Linux: 424 passed, 67 skipped. The only failures aretest_bake_portability(nozstandardhere) andtest_builder_log_read_only(no Tk here), which also fail onmainon this PC.The shared vectors in
tests/test_update_tracks.pyare now checked against all four implementations: the game's update check (host/hos_update.c), the setup (builder/setup/setup.c), the Linux updater, and the Windows builder'sUpdater.cs. The vectors cover:Updater.cswasn't checked against them before. The newtests/test_update_tracks_cs.pycuts its track rules out of the source and builds them with the .NET SDK.New Linux builder handler tests (
tests/test_linux_downgrade.py):nx2/test_version.pybuilds a throwaway git repo and checks the names: on a tag, after it, dirty, and with a tag that isn't a version.The C parsing (
nightly_rank,shown_version,nightly_tag) was run on edge inputs under ASan and UBSan: empty strings, no hash, short or long hashes, 9 and 10 digit counts,-dirty. The Discord name check was tested the same way.hos_update.canddiscord_rpc.ccompile without warnings with gcc and with llvm-mingw.The Windows builder builds with
-p:Version=0.0.0-nightly.2029. Its informational version reads0.0.0-nightly.2029+<sha>.Only checked in CI
fetch-depth: 0on both checkouts that name a version, and the names of the uploaded nightly files.tests/test_update_tracks_cs.pybuilt for net8.0. This PC has only the .NET 10 SDK, so it ran for net10.0 here.Not tested
Screenshots
None. The version shows in the menu banner and on the start-up screen, but both need the game running. This PC has no Tk for the Linux builder, and the Windows builder needs Windows.
tests/test_startup_progress.pychecks the start-up screen's text, "Nightly 2029 ·c544828f".