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

Revert "Build website with nix" #901

Merged
merged 1 commit into from
Jun 3, 2024
Merged

Revert "Build website with nix" #901

merged 1 commit into from
Jun 3, 2024

Conversation

missytake
Copy link
Contributor

Let's see if this fixes #898.

Copy link

github-actions bot commented Jun 3, 2024

Check out the page preview at https://staging.delta.chat/901/en/

@missytake missytake requested review from link2xt and hagenest June 3, 2024 06:43
Copy link
Contributor

@hpk42 hpk42 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works although the securejoin did not work and the echo bot sent back an undecrsptable message but afterwards it worked.

@link2xt
Copy link
Contributor

link2xt commented Jun 3, 2024

Works although the securejoin did not work and the echo bot sent back an undecrsptable message but afterwards it worked.

How echobot is related to deltachat-pages?

@link2xt
Copy link
Contributor

link2xt commented Jun 3, 2024

If 0 unix timestamp is a problem, better use -I (--ignore-times) flag on rsync, no need to revert the whole PR.

@missytake
Copy link
Contributor Author

missytake commented Jun 3, 2024

If 0 unix timestamp is a problem, better use -I (--ignore-times) flag on rsync, no need to revert the whole PR.

Doesn't help, and leaving out -t doesn't help either. The timestamp is still set to 1970-01-01.

In general I think using nix for this is not a good idea, as only half of the responsible people can debug nix builds locally. Or why did we introduce it? It worked before, no? #819 doesn't point to a bug which was fixed by it, it only mentions that it makes sure that developers use the same jekyll version as the CI, but as some of us still don't use nix this doesn't really hold.

@missytake
Copy link
Contributor Author

I'll merge this for now as it fixes the issue, we can later revert it and fix it differently if we want to keep using nix.

@missytake missytake merged commit 0066df8 into master Jun 3, 2024
4 checks passed
@missytake missytake deleted the staging-ci branch June 3, 2024 08:16
@link2xt
Copy link
Contributor

link2xt commented Jun 3, 2024

The timestamp is still set to 1970-01-01.

Is this timestamp needed for anything?

@hagenest
Copy link
Contributor

hagenest commented Jun 3, 2024

The timestamp is still set to 1970-01-01.

Is this timestamp needed for anything?

currently we use it for deleting old builds on staging, see https://github.com/deltachat/sysadmin/issues/167.

@link2xt
Copy link
Contributor

link2xt commented Jun 3, 2024

Doesn't help, and leaving out -t doesn't help either. The timestamp is still set to 1970-01-01.

I just tested with #903, here is the result:

$ ls -lah /var/www/html/staging/903/
total 260K
dr-xr-xr-x 23 jekyll jekyll 4.0K Jun  3 10:28 .
drwxr-xr-x 21 jekyll jekyll  215 Jun  3 10:28 ..
dr-xr-xr-x  2 jekyll jekyll   62 Jun  3 10:28 .well-known
-r--r--r--  1 jekyll jekyll 1.4K Jun  3 10:28 35c3.html
-r--r--r--  1 jekyll jekyll 1.6K Jun  3 10:28 36c3.html
-r--r--r--  1 jekyll jekyll 6.7K Jun  3 10:28 37c3.html
-r--r--r--  1 jekyll jekyll  727 Jun  3 10:28 404.html
-r--r--r--  1 jekyll jekyll  35K Jun  3 10:28 LICENSE
-r--r--r--  1 jekyll jekyll 7.2K Jun  3 10:28 README.md
dr-xr-xr-x 11 jekyll jekyll  170 Jun  3 10:28 assets
dr-xr-xr-x  2 jekyll jekyll  336 Jun  3 10:28 ca
dr-xr-xr-x  2 jekyll jekyll  336 Jun  3 10:28 cs
dr-xr-xr-x  2 jekyll jekyll  336 Jun  3 10:28 de
dr-xr-xr-x  2 jekyll jekyll 8.0K Jun  3 10:28 en
dr-xr-xr-x  2 jekyll jekyll  336 Jun  3 10:28 es
-r--r--r--  1 jekyll jekyll  15K Jun  3 10:28 favicon.ico
-r--r--r--  1 jekyll jekyll 120K Jun  3 10:28 feed.xml
-r--r--r--  1 jekyll jekyll 1.5K Jun  3 10:28 flake.lock
-r--r--r--  1 jekyll jekyll  947 Jun  3 10:28 flake.nix
dr-xr-xr-x  2 jekyll jekyll  336 Jun  3 10:28 fr
dr-xr-xr-x  2 jekyll jekyll  336 Jun  3 10:28 gl
-r--r--r--  1 jekyll jekyll   53 Jun  3 10:28 google1730128c2b186138.html
-r--r--r--  1 jekyll jekyll   53 Jun  3 10:28 google2faa16b6e4ce3d8b.html
dr-xr-xr-x  2 jekyll jekyll  336 Jun  3 10:28 id
dr-xr-xr-x  2 jekyll jekyll  336 Jun  3 10:28 it
dr-xr-xr-x  2 jekyll jekyll  336 Jun  3 10:28 nl
dr-xr-xr-x  2 jekyll jekyll  336 Jun  3 10:28 pl
dr-xr-xr-x  2 jekyll jekyll  336 Jun  3 10:28 pt
dr-xr-xr-x  2 jekyll jekyll  336 Jun  3 10:28 pt_BR
-r--r--r--  1 jekyll jekyll   26 Jun  3 10:28 robots.txt
dr-xr-xr-x  2 jekyll jekyll  336 Jun  3 10:28 ru
-r--r--r--  1 jekyll jekyll  23K Jun  3 10:28 sitemap.xml
dr-xr-xr-x  2 jekyll jekyll  336 Jun  3 10:28 sk
dr-xr-xr-x  2 jekyll jekyll  336 Jun  3 10:28 sq
dr-xr-xr-x  2 jekyll jekyll  336 Jun  3 10:28 tr
dr-xr-xr-x  2 jekyll jekyll  336 Jun  3 10:28 uk
dr-xr-xr-x  2 jekyll jekyll  336 Jun  3 10:28 zh_CN

Leaving out -t results in applying new timestamp to copied files and -I should work to overwrite files regardless of timestamp for non-preview.

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.

Built pages for staging.delta.chat have an incorrect modification date
4 participants