Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2024 Birthday Update #160

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

2024 Birthday Update #160

wants to merge 7 commits into from

Conversation

ampurr
Copy link
Contributor

@ampurr ampurr commented Oct 27, 2024

Website has been updated. It's one-year-old now!

@tdhock
Copy link
Collaborator

tdhock commented Oct 28, 2024

thanks for the update.
Is it normal that there are so many files changed?
I see a lot of image files updated, but the images do not look any different to me. For example https://github.com/animint/animint2/pull/160/files#diff-f67f7a58c5d8f6f7f75e2926827c917fc7502b1e0b2359576cf41db538a5e36f

Do you know how much more disk space this PR would require in the git repo?

Also I believe the gh-pages branch would need to be the target of the PR in order to update the web site, but the target of this PR is master.

@ampurr
Copy link
Contributor Author

ampurr commented Oct 28, 2024

I think we merged into master last time we did this, but I'll double-check when I can get to a computer.

You're right—the images are in fact the same. If I recall correctly, it's artifact of how pkgdown works. My guess: The R code run for the example code in each function is the same, but the resulting images' metadata are slightly different. So git discards old images for the new, even though they look the same.

I'd be surprised if there's a significant total file size difference, but I'll take a look and report back.

@tdhock
Copy link
Collaborator

tdhock commented Oct 28, 2024

even if the total file size is the same before and after the PR, the total git repo size doubles ...

@ampurr
Copy link
Contributor Author

ampurr commented Oct 29, 2024

Confirming that the files for the website are in fact merged into 'master'.

Sorry, I'm not sure what you mean when you refer to the git repo size if you don't mean the file size. 😅

Given your concerns, let's hold off on this till someone (probably me 😛) strips the website from the main branch and sets up the GitHub actions to render the website. That way the website can be totally separate from master. It might be a hot minute.

@ampurr
Copy link
Contributor Author

ampurr commented Oct 29, 2024

Sorry, I should've asked if the suggested course of action is acceptable to you. You're the boss. My bad.

Do you wanna keep the website updated (in a different branch) with GitHub actions instead of the manual process we current have?

@ampurr
Copy link
Contributor Author

ampurr commented Oct 29, 2024

Given the new pull request, we can probably close this one?

@tdhock
Copy link
Collaborator

tdhock commented Oct 29, 2024

actually if the master branch is being used for deployment, this PR would be ok.
but https://github.com/animint/animint2/settings/pages says that gh-pages branch is being used.

Sorry, I'm not sure what you mean when you refer to the git repo size if you don't mean the file size

I do mean file size but of .git directory in addition to regular non-hidden files.

hoct2726@DINF-THOCK-01A MINGW64 ~/R
$ du -ms animint2
193     animint2

hoct2726@DINF-THOCK-01A MINGW64 ~/R
$ du -ms animint2/.git
125     animint2/.git

hoct2726@DINF-THOCK-01A MINGW64 ~/R
$ cd animint2

hoct2726@DINF-THOCK-01A MINGW64 ~/R/animint2 (master)
$ git pull
remote: Enumerating objects: 2134, done.
remote: Counting objects: 100% (2134/2134), done.
remote: Compressing objects: 100% (1338/1338), done.
remote: Total 2134 (delta 789), reused 2131 (delta 789), pack-reused 0 (from 0)
Receiving objects: 100% (2134/2134), 64.31 MiB | 4.26 MiB/s, done.
Resolving deltas: 100% (789/789), completed with 19 local objects.
From https://github.com/animint/animint2
   5842300..9428d11  master           -> origin/master
 * [new branch]      ampurr-patch-1   -> origin/ampurr-patch-1
 * [new branch]      automatic-birthday-machine -> origin/automatic-birthday-machine
 * [new branch]      birthday-cleanup -> origin/birthday-cleanup
   ba0423e..444a905  bugfix/issue-123 -> origin/bugfix/issue-123
   aa6795f..b3fc8ee  gh-pages         -> origin/gh-pages
   700f1d9..4580713  html-plot        -> origin/html-plot
   7f54fc3..898755d  rowspan-colspan  -> origin/rowspan-colspan
Updating 5842300..9428d11
Fast-forward
 DESCRIPTION                              | 5 ++++-
 NEWS.md                                  | 4 ++++
 _pkgdown.yml                             | 3 ++-
 inst/htmljs/animint.js                   | 2 +-
 tests/testthat/test-renderer2-widerect.R | 2 +-
 5 files changed, 12 insertions(+), 4 deletions(-)

hoct2726@DINF-THOCK-01A MINGW64 ~/R/animint2 (master)
$ du -ms .
258     .

hoct2726@DINF-THOCK-01A MINGW64 ~/R/animint2 (master)
$ du -ms .git
190     .git

so pulling these new branches resulted in an increase of total size of .git dir from 125 to 190 megabytes.

@ampurr
Copy link
Contributor Author

ampurr commented Oct 30, 2024

actually if the master branch is being used for deployment, this PR would be ok.

Oh, cool. Though this PR has been superseded by the Automatic Birthday Machine. As you know, this PR and the one last year rely on committing the website to the master branch; the Automatic Birthday Machine doesn't commit /docs to the master. Much neater.

but https://github.com/animint/animint2/settings/pages says that gh-pages branch is being used.

I think the old branch relied on the master branch's /docs directory. Running the relevant pkgdown function re-rendered everything in that directory and then pushed the contents to the gh-pages.

I think. Embarrassingly, I didn't document anything related to GitHub's UI and now the Automatic Birthday Machine has overridden whatever UI settings were in place before. So what is the case now wasn't necessarily the case then.

I do mean file size but of .git directory in addition to regular non-hidden files... so pulling these new branches resulted in an increase of total size of .git dir from 125 to 190 megabytes.

Oh, I see. Neat! I learned something new and vague about how git works today. 😄

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants