|
10:50
tellable6 left,
coverable6 left,
notable6 left,
bloatable6 left,
bisectable6 left,
benchable6 left,
releasable6 left,
linkable6 left,
committable6 left,
unicodable6 left,
nativecallable6 left,
evalable6 left,
shareable6 left,
quotable6 left,
greppable6 left,
sourceable6 left
10:54
bloatable6 joined,
releasable6 joined,
committable6 joined
10:55
bisectable6 joined,
quotable6 joined,
unicodable6 joined,
linkable6 joined,
notable6 joined
10:56
coverable6 joined,
benchable6 joined,
sourceable6 joined,
greppable6 joined
10:57
evalable6 joined,
shareable6 joined,
nativecallable6 joined,
tellable6 joined
12:30
librasteve_ left
14:23
librasteve_ joined
|
|||
| Geth | MoarVM/main: f6bb14e45b | (Will Coleda)++ | CREDITS standardize name |
15:50 | |
| MoarVM/main: 1078270645 | (Will Coleda)++ | docs/release_guide.md minor update on scheduling. |
16:13 | ||
| MoarVM/2025.10: f56e50a742 | (Will Coleda)++ | 2 files Update changelog and version |
16:33 | ||
| MoarVM: coke++ created pull request #1963: Update changelog and version |
16:44 | ||
| MoarVM/main: 53336b7f1c | (Will Coleda)++ (committed using GitHub Web editor) | 2 files Update changelog and version (#1963) |
17:19 | ||
| MoarVM/main: caa62f6ce6 | (Will Coleda)++ | 2 files Make sure there's a Makefile |
17:21 | ||
|
17:23
librasteve_ left
19:22
MasterDuke joined
|
|||
| MasterDuke | [Coke]: i think moarvm didn't get tagged | 19:22 | |
| or the tag didn't get merged to main? | 19:23 | ||
|
19:24
librasteve_ joined
|
|||
| [Coke] | MasterDuke: there's a tag and release both called 2025.10 that I can see on the front page. | 19:27 | |
| github.com/MoarVM/MoarVM/tree/2025.10 | |||
| github.com/MoarVM/MoarVM/releases/tag/2025.10 | |||
| ?? | |||
| MasterDuke | if i look at a `git log`, i see `commit b4a45b00efdba3a630667a28f79a0069da1f49f8 (tag: list, tag: 2025.08, upstream/2025.080)`, but no commit with `tag: 2025:10` | 19:28 | |
| linkable6 | (2025-08-28) github.com/MoarVM/MoarVM/commit/b4a45b00ef Update changelog and version | ||
| [Coke] | Did you pull/fetch, etc? | 19:29 | |
| MasterDuke | yep | ||
| [Coke] | we don't tag main, we tag the release branch | 19:30 | |
| then we merge it back to main | |||
| try "git log 2025.10" | |||
| though I do see jdv's tag on main. | 19:31 | ||
| MasterDuke | yeah commit f56e50a7429e4857c2523e4e3b9b851d83befb4d is not in a `git log main` | ||
| [Coke] | confusingly, 53336b7f1 is | 19:32 | |
| linkable6 | (2025-10-18) github.com/MoarVM/MoarVM/commit/53336b7f1c Update changelog and version (#1963) | ||
| MasterDuke | what was your git merge command? | ||
| [Coke] | "make a PR and use the UI" | 19:33 | |
| github.com/MoarVM/MoarVM/tree/2025.10 | 19:34 | ||
| is there any tooling that's going to break because of this? | 19:35 | ||
| MasterDuke | maybe it defaulted to a fast-forward? a random look through `git help merge` looks like `git merge --ff-only` might not bring the tag? | ||
| [Coke] | the tag is right, the release is ok.. | ||
| again, I didn't use a command line | |||
| We could try to overwrite it by deleting the last two commits and manually merging that branch, and force pushing back. | 19:37 | ||
| MasterDuke | well, i just cloned moarvm and build it, and the version it reports is `This is MoarVM version 2025.08-8-gcaa62f6ce` | 19:39 | |
| [Coke] | and your VERSION has 2025.10 in it? | ||
| MasterDuke | yep | ||
| so trying to build nqp with this moarvm would fail. i'm sure it would work if i checked out the 2025.10 tag, but main should work also | 19:40 | ||
| timo2 | i just fetched moar and got * [new branch] 2025.10 -> origin/2025.10 | ||
| [Coke] | ok. I can try the force push. | ||
| timo2 | * [new tag] 2025.10 -> 2025.10 | ||
| | * f56e50a74 - (tag: 2025.10, origin/2025.10) Update changelog and version (3 hours ago) <Will Coleda> | |||
| the "update changelog and version (#1963)" commit that's on main isn't the identical one on the 2025.10 branch | 19:41 | ||
| [Coke] | timo2: yup. looks like somehow that commit ended up on main in a weird state with a different commit ID | ||
| timo2 | the pull request may have been set to "squash" | ||
| [Coke] | it's the same diff, but not the same commit, right. | ||
| timo2 | we can merge the 2025.10 branch into main now and everything should be fine | ||
| [Coke] | Yup, I could have done a squash, that's feasible. | ||
| timo2 | no need to force push, we can avoid that | ||
| MasterDuke | github might have changed the default UI behavior, wouldn't surprise me | 19:42 | |
| [Coke] | ok, checking... | ||
| timo2 | aye | ||
| should we add a step to double-check that to the release docs? | |||
| [Coke] | Can't hurt. I only press that button once every few months! | 19:43 | |
| Geth | MoarVM/main: f56e50a742 | (Will Coleda)++ | 2 files Update changelog and version |
19:44 | |
| MoarVM/main: 338cff842d | (Will Coleda)++ | 0 files Merge remote-tracking branch 'origin/2025.10' |
|||
| [Coke] | Try that? | ||
| timo2 | from just a git log it looks good | 19:45 | |
| [Coke] | (the release was done from the same point as the tag, so none of that has to change) | ||
| \o/ | |||
| MasterDuke | nqp is now building | ||
| timo2 | i have a git alias "lg" that does 'log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %Cblue<%an>%Creset' --abbrev-commit --date=relative' | ||
| MasterDuke | [Coke]++ | ||
| timo2 | i can recommend this, it's very nice | ||
| i often do `git lg --all` | |||
| maybe i'll make an alias `git lga` to do `git lg --all` too | |||
| Geth | MoarVM/main: f432c6da83 | (Will Coleda)++ | docs/release_guide.md Add a warning so I don't do that again A squash means the tag doesn't show up properly in the main commit history, so git-describe still goes off the previous release. Thanks to the #moarvm team for noticing this immediately |
19:46 | |
| [Coke] | I have a 'llog' alias that does nice formatting. | 19:47 | |
| llog = log --date=local --name-status --decorate=short --abbrev-commit --color | |||
| MasterDuke | timo2: my `glp` bash alias is the 99% the same as yours | ||
| though 95% of the time i also add `-p` | 19:48 | ||
| timo2 | the most important bit really is -g | 19:49 | |
| sorry, not -g it's --graph | 19:50 | ||
| if you've never seen --graph, please give it a look | 19:52 | ||
| MasterDuke | yep, it's in my alias | 19:53 | |
| Geth | MoarVM: Prince213++ created pull request #1964: Fix format specifiers |
20:36 | |
| MoarVM/main: b937272f92 | (Sizhe Zhao)++ | src/profiler/heapsnapshot.c Fix format specifiers |
21:03 | ||
| MoarVM/main: a5b7888173 | MasterDuke17++ (committed using GitHub Web editor) | src/profiler/heapsnapshot.c Merge pull request #1964 from Prince213/push-xukkpzmwxlkw Fix format specifiers |
|||
|
21:24
MasterDuke left
|
|||