FSFE/fsfe-website
25
30
Fork 89
Code Issues 63 Pull Requests 9 Wiki Activity

feat: improvements to stagedir logic #4564

Open
delliott wants to merge 1 commits from delliott/fsfe-website:feat/stage-enhancements into master
pull from: delliott/fsfe-website:feat/stage-enhancements
merge into: FSFE:master
Conversation 2 Commits 1 Files Changed 3 +23 -14
delliott commented 2024-10-30 12:33:40 +00:00
Contributor
Copy Link

This change may require some discussion, as it changes some behavior.

The build process will now automatically use a stagedir if there are multiple outputs or if the target is over ssh. It would be logically cleaner to just always use a stagedir, but this would lengthen build times slightly and increase space usage, which should be avoided.

Use of a stage dir can be forced using --stage.

Arbitrary directories may no longer be used, it is now always ./output/stage.

This prevents the possibility of stagedirs ending up in odd places, and removes the need for a potentially disastrous rm -rf.

The build script will not fail if given a stagedir, but it will ignore it and use ./output/stage. This is so that this pr can be merged safely without needing a build-server redeploy.

This change may require some discussion, as it changes some behavior. The build process will now automatically use a stagedir if there are multiple outputs or if the target is over ssh. It would be logically cleaner to just always use a stagedir, but this would lengthen build times slightly and increase space usage, which should be avoided. Use of a stage dir can be forced using --stage. Arbitrary directories may no longer be used, it is now always ./output/stage. This prevents the possibility of stagedirs ending up in odd places, and removes the need for a potentially disastrous `rm -rf`. The build script will not fail if given a stagedir, but it will ignore it and use ./output/stage. This is so that this pr can be merged safely without needing a build-server redeploy.
delliott force-pushed feat/stage-enhancements from bf8f72e317 to f47a90cd93 2024-10-30 12:35:36 +00:00 Compare
delliott force-pushed feat/stage-enhancements from f47a90cd93 to 6853bf13f4 2024-10-30 12:36:05 +00:00 Compare
delliott changed title from WIP: feat: improvements to stagedir logic to feat: improvements to stagedir logic 2024-10-31 14:45:21 +00:00
delliott requested review from tobiasd 2024-10-31 14:45:29 +00:00
delliott force-pushed feat/stage-enhancements from 6853bf13f4 to 223dddf938 2024-11-05 15:02:27 +00:00 Compare
delliott force-pushed feat/stage-enhancements from 223dddf938 to 90848d6c87 2024-11-09 17:41:51 +00:00 Compare
delliott force-pushed feat/stage-enhancements from 90848d6c87 to 04627b8785 2024-11-12 16:55:12 +00:00 Compare
delliott commented 2024-11-20 11:51:18 +00:00
Author
Contributor
Copy Link

The updated build server logic can be found in here: fsfe-system-hackers/build-server#13.

But this fsfe-website pr wont break builds, so the build sever one can be merged and deployed any time after this is merged.

The updated build server logic can be found in here: https://git.fsfe.org/fsfe-system-hackers/build-server/pulls/13. But this fsfe-website pr wont break builds, so the build sever one can be merged and deployed any time after this is merged.
delliott force-pushed feat/stage-enhancements from 04627b8785 to feb05d6dea 2024-12-02 18:24:35 +00:00 Compare
delliott commented 2024-12-02 20:00:50 +00:00
Author
Contributor
Copy Link

I still believe this change makes sense, but am closing the build-server pr, as I would prefer instead to move it to using the improved python frontend to the build script I am working on in #4609

Essentially, I decided that it would result in an unnecessary build server redeploy.

I still believe this change makes sense, but am closing the build-server pr, as I would prefer instead to move it to using the improved python frontend to the build script I am working on in https://git.fsfe.org/FSFE/fsfe-website/pulls/4609 Essentially, I decided that it would result in an unnecessary build server redeploy.
delliott force-pushed feat/stage-enhancements from feb05d6dea to 50d9066574 2024-12-03 14:35:21 +00:00 Compare
delliott force-pushed feat/stage-enhancements from 50d9066574 to 2982255988 2024-12-03 14:37:51 +00:00 Compare
delliott force-pushed feat/stage-enhancements from 2982255988 to 55c3a2d035 2024-12-03 14:55:49 +00:00 Compare
delliott force-pushed feat/stage-enhancements from 55c3a2d035 to 99eea39fd0 2024-12-03 15:07:27 +00:00 Compare
delliott force-pushed feat/stage-enhancements from 99eea39fd0 to 9aa26f0761 2024-12-03 15:19:48 +00:00 Compare
All checks were successful
continuous-integration/drone/pr Build is passing
Required
Details
This pull request can be merged automatically.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
View command line instructions.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u feat/stage-enhancements:delliott-feat/stage-enhancements
git checkout delliott-feat/stage-enhancements
Sign in to join this conversation.
Reviewers
No reviewers
tobiasd
Labels
Clear labels   
bug

   
build

   
cgi Scripting

   
design

   
disruptive

Requires careful coordination and documentation changes

  
documentation

   
duplicate

   
easy

   
feature-request

   
help wanted

   
javascript

   
priority/low

   
question

   
system-hackers

   
tagging

   
text

   
translations

   
wait/bugfix

   
wait/inprogress

   
wait/misc

   
wait/proofread

   
wontfix

   
xsl
No Label
bug
build
cgi Scripting
design
disruptive
documentation
duplicate
easy
feature-request
help wanted
javascript
priority/low
question
system-hackers
tagging
text
translations
wait/bugfix
wait/inprogress
wait/misc
wait/proofread
wontfix
xsl
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
1 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: FSFE/fsfe-website#4564
No description provided.
Delete Branch "delliott/fsfe-website:feat/stage-enhancements"

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?