robur/builder-web
4
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Make json structure uniform #6

Merged
reynir merged 3 commits from pixiedust-patch-1 into main 2025-01-06 15:01:10 +00:00
Conversation 5 Commits 3 Files changed 2 +6 -7
PixieDust commented 2024-12-29 07:39:07 +00:00
Owner
Copy link

In opamndiff we have a similar structure but simply version_left and version_right.
https://git.robur.coop/robur/builder-web/src/branch/main/opamdiff/opamdiff.ml#L284-L286

In `opamndiff` we have a similar structure but simply `version_left` and `version_right`. https://git.robur.coop/robur/builder-web/src/branch/main/opamdiff/opamdiff.ml#L284-L286
PixieDust added 1 commit 2024-12-29 07:39:08 +00:00 
In `opamndiff` we have a similar structure but simply `version_left` and `version_right`.
https://git.robur.coop/robur/builder-web/src/branch/main/opamdiff/opamdiff.ml#L284-L286
PixieDust requested review from reynir 2024-12-29 07:39:18 +00:00
PixieDust added 1 commit 2024-12-30 14:05:27 +00:00 
Make json fileds uniform
reynir requested changes 2025-01-06 14:40:46 +00:00
reynir left a comment
Owner
Copy link

I think this looks good. There's still an occurence of "job_name". Otherwise good to merge IMO.

I think this looks good. There's still an occurence of `"job_name"`. Otherwise good to merge IMO.
lib/builder_web.ml
@ -621,7 +621,7 @@ let routes ~datadir ~cachedir ~configdir ~expired_jobs =
let json_response =
`Assoc [
"left", `Assoc [
"job_name", `String job_left;
reynir commented 2025-01-06 14:39:45 +00:00
Owner
Copy link

Can we apply the same change in job_build?

Can we apply the same change in `job_build`?
👍 1
PixieDust marked this conversation as resolved
PixieDust added 1 commit 2025-01-06 14:57:01 +00:00
reynir added 1 commit 2025-01-06 14:59:44 +00:00
PixieDust force-pushed pixiedust-patch-1 from 51d8135ed6 to 0261f89022 2025-01-06 15:00:11 +00:00 Compare
reynir merged commit f97ff8440d into main 2025-01-06 15:01:10 +00:00
reynir deleted branch pixiedust-patch-1 2025-01-06 15:01:12 +00:00
reynir commented 2025-01-06 15:01:19 +00:00
Owner
Copy link

Thanks!

Thanks!
👍 1
PixieDust commented 2025-01-06 15:01:59 +00:00
Author
Owner
Copy link

I think I forced pushed after your commit.

I think I forced pushed after your commit.
reynir commented 2025-01-06 15:02:43 +00:00
Owner
Copy link

Yea! It was confusing. But you force pushed the same change so that's fine 🥳

Yea! It was confusing. But you force pushed the same change so that's fine 🥳
hannes commented 2025-01-06 17:09:00 +00:00
Owner
Copy link

I scheduled a build (ssh builder@shell.robur.coop -> ssh poudriere -> builder-client execute builder-web), and deployed it (ssh builder_web -> pkg update && pkg upgrade -> service builder_web restart (well, manually kill due to service script issues as usual)).

So the builds.robur.coop should now provide the nice updated json data.

I scheduled a build (ssh builder@shell.robur.coop -> ssh poudriere -> builder-client execute builder-web), and deployed it (ssh builder_web -> pkg update && pkg upgrade -> service builder_web restart (well, manually kill due to service script issues as usual)). So the builds.robur.coop should now provide the nice updated json data.
👍 1
PixieDust commented 2025-01-06 17:27:50 +00:00
Author
Owner
Copy link

Thank you :)

Thank you :)
Sign in to join this conversation.
Reviewers
No reviewers
reynir
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
3 participants
Notifications
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: robur/builder-web#6
No description provided.
Delete branch "pixiedust-patch-1"

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?