From 32f21aa89fe1af0e5ee1762fd93715d4c7acf19d Mon Sep 17 00:00:00 2001 From: dongdigua Date: Sun, 4 Dec 2022 13:32:08 +0800 Subject: [PATCH] edit: new_blog_arch, ready for CI Makefile ignore rm org cache collection gmi add kisslinux --- gmi/gopher_collections.gmi | 1 + org/Makefile | 2 +- org/internet_collections.org | 2 +- org/new_blog_arch.org | 37 +++++++++++++++++++++++------------- posts.md | 4 ++-- 5 files changed, 29 insertions(+), 17 deletions(-) diff --git a/gmi/gopher_collections.gmi b/gmi/gopher_collections.gmi index 8741bae..30224b3 100644 --- a/gmi/gopher_collections.gmi +++ b/gmi/gopher_collections.gmi @@ -42,3 +42,4 @@ Gemcast, Esperanto => gemini://gemini.cyberbot.space/ + cyberbot undergoes frequent maintenance => gemini://gemini.cyberbot.space/smolzine/ ++ smolzine +=> gemini://tilde.team/~kiedtl/k1ss/ + Kiss Linux mirror diff --git a/org/Makefile b/org/Makefile index 49b3163..375189a 100644 --- a/org/Makefile +++ b/org/Makefile @@ -11,6 +11,6 @@ html: @echo "DONE" clean: - rm ~/.org-timestamps/org-pages.cache + - rm ~/.org-timestamps/org-pages.cache $(TARGET) | xargs -I {} rm {} rm ../feed.xml* diff --git a/org/internet_collections.org b/org/internet_collections.org index 1968381..c3be5ad 100644 --- a/org/internet_collections.org +++ b/org/internet_collections.org @@ -77,7 +77,7 @@ CPU, IC, ARM 出国 *** [[http://jujuba.me/posts/program-analysis-via-llvm-pass.html][LLVM Pass来实现简化版taint analysis]] *** [[http://jujuba.me/posts/taste-of-code.html][代码的taste]] -#+ATTR_HTML: :width 256px +#+ATTR_HTML: :width 400px [[http://jujuba.me/imgs/linus-on-TED.png]] ** [[https://cireu.github.io/2019/09/17/lisp-setf/][NIL: setf 中「f」的本意]] ** [[https://www.cnblogs.com/zjjws/p/13346020.html][第 N 个质数]] :c:algorithm: diff --git a/org/new_blog_arch.org b/org/new_blog_arch.org index 59b11a1..95c54d5 100644 --- a/org/new_blog_arch.org +++ b/org/new_blog_arch.org @@ -1,26 +1,37 @@ -#+TITLE: New Blog Architecture +#+TITLE: New(and Newer) Blog Architecture #+DESCRIPTION: It's time #+DATE: <2022-11-20 Sun> +* Branch I've never fully learnt git before(only search for garbage when meeted with problem), so I recently read [[https://git-scm.com/book][ProGit]]. And I have some good ideas on my repo architecture: I should make use of branch, obviously. -* Idea is: +** Idea is: seperate the source file(org) and the generated files(html, feed.xml) so I can -** clearly look at the diff -** delete the generated files if I want +*** clearly look at the diff +*** delete the generated files if I want because those static files are really unecessary and takes much space -* So what -** use =filter-branch= to remove the huge =feed.xml= in the full history -** ignore the generated files in the source repo -** merge the source repo into site repo when I think it's ok +** So what +*** use =filter-branch= to remove the huge =feed.xml= in the full history +*** ignore the generated files in the source repo +*** merge the source repo into site repo when I think it's ok don't remove the source(org) in the site repo, if build in main and checkout to site, those html will be overwritten -** and I will use the same stratagy on my YW sub-website if there's no problem +*** +and I will use the same stratagy on my YW sub-website if there's no problem+ +I'm testing using CI on YW sub-site before deploying on this precious repo -* Need Advice -I'm really new to do this. -If you have a better idea, or this is somehow useful to you, -*contact me, please!* +** Need Advice ++I'm really new to do this. If you have a better idea, or this is somehow useful to you,+ ++*contact me, please!*+ + +* CI +I previously thought of using CI to deploy blog, but I /thought/ it too difficult, so just keep status quo. +But for many times I want to build a [[https://github.com/dongdigua/configs/blob/main/configuration.nix][NixOS]] with [[https://donngdigua.github.io/wayland][wayland]] and lots of other big util(such as clang and metasploit), +if I build it on my machine, it will take up too many spaces and make no use except for building iso. +So it urged me to use a CI, after some [[https://t.bilibili.com/735422465675624481][trying]], I found it not difficult and in fact, very useful! + +I can have my huge feed.xml(which contains each of my post) dynamically generated by CI, it will save lots of spaces! +I will [[https://git-scm.com/book/en/v2/Git-Tools-Bundling][bundle]] my entire history mess and put it on release, like previous big change, +then use the Nuclear Option =filter-branch= to delete those generated big files. diff --git a/posts.md b/posts.md index 535d3d1..b83991f 100644 --- a/posts.md +++ b/posts.md @@ -2,8 +2,8 @@ ### Posts (sorted by time) - [狗日的腾讯会议](damn_tencent_meeting)
上网课有感而发 -- [New Blog Repo Architecture](new_blog_arch)
-please contct me if you have a better idea +- [New Blog Architecture](new_blog_arch)
+mess -> branch -> CI - [记一次帮老师修U盘](recover_udisk)
- [Clear Kernel Compile Error? Fix It](clear_kernel_compile_fix)
- [Gentoo LLVM\_TARGETS not Working?](gentoo_llvm_targets)