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

TeX CI #263

Merged
merged 30 commits into from
Feb 5, 2024
Merged

TeX CI #263

merged 30 commits into from
Feb 5, 2024

Conversation

rsp4jack
Copy link
Collaborator

No description provided.

@rsp4jack rsp4jack linked an issue Jan 31, 2024 that may be closed by this pull request
@rsp4jack rsp4jack force-pushed the tex-works branch 2 times, most recently from 5e95c61 to eda4f51 Compare January 31, 2024 14:46
@rsp4jack rsp4jack marked this pull request as draft January 31, 2024 14:51
@rsp4jack rsp4jack marked this pull request as ready for review February 1, 2024 04:17
@rsp4jack rsp4jack requested review from Mq-b and geihob February 1, 2024 04:25
@rsp4jack
Copy link
Collaborator Author

rsp4jack commented Feb 1, 2024

目前会把生成的 PDF 文件上传到 Actions 的 artifacts。

另外,目前还缺少 CI Release。

@rsp4jack
Copy link
Collaborator Author

rsp4jack commented Feb 1, 2024

btw,目前只有卢瑟作业的 TeX 版本会被编译。

编译这些 TeX 文档的最好方式是用 CMake 编译,这一点也许需要在文档中说明。

@rsp4jack
Copy link
Collaborator Author

rsp4jack commented Feb 1, 2024

Upd:由于 GitHub 的 LFS 服务太贵,不使用 LFS。

src/PDF版题目与答案/CMakeLists.txt Outdated Show resolved Hide resolved
@rsp4jack
Copy link
Collaborator Author

rsp4jack commented Feb 3, 2024

waiting: 缺少文档。

@rsp4jack rsp4jack force-pushed the tex-works branch 2 times, most recently from e0f8f32 to 5c64519 Compare February 4, 2024 13:39
@rsp4jack
Copy link
Collaborator Author

rsp4jack commented Feb 5, 2024

更新了 build 策略:outdir 为 build 目录,auxdir 为源文件所在目录。另外添加了现代 C++ 题目带答案版本的编译。

@rsp4jack
Copy link
Collaborator Author

rsp4jack commented Feb 5, 2024

这个 check in clang 是谁 cancel 的啊...

@rsp4jack
Copy link
Collaborator Author

rsp4jack commented Feb 5, 2024

Ready to merge! 🎉 🚀

@rsp4jack
Copy link
Collaborator Author

rsp4jack commented Feb 5, 2024

@Z1Turn0 修改一下 check-loser-homework.yml 的 rename cjk path 部分,以适应这个 PR 的更改。

@rsp4jack
Copy link
Collaborator Author

rsp4jack commented Feb 5, 2024

这个 check in clang 是谁 cancel 的啊...

看起来像是被卡 1min 时限了。

@rsp4jack
Copy link
Collaborator Author

rsp4jack commented Feb 5, 2024

@Z1Turn0 所以你对 refs 做了什么?我怎么没看懂(

@geihob
Copy link
Collaborator

geihob commented Feb 5, 2024

@Z1Turn0 所以你对 refs 做了什么?我怎么没看懂(

main分支改错了,又push force两下(

@rsp4jack
Copy link
Collaborator Author

rsp4jack commented Feb 5, 2024

我感觉也是,你 push 了一条你自己提交的 tex-works 分支 5dbee2f

@rsp4jack
Copy link
Collaborator Author

rsp4jack commented Feb 5, 2024

感觉像是 rebase 的时候整错 base 了。

@rsp4jack
Copy link
Collaborator Author

rsp4jack commented Feb 5, 2024

@Z1Turn0 你不要随便 rebase 别人的 commits,你这样让我好难受 X﹏X

image

@geihob
Copy link
Collaborator

geihob commented Feb 5, 2024

@Z1Turn0 你不要随便 rebase 别人的 commits,你这样让我好难受 X﹏X

image

本地看git log好像没什么问题,不知道为什么推送上来就这样了😂,会区分提交的人

@rsp4jack
Copy link
Collaborator Author

rsp4jack commented Feb 5, 2024

是这样的,rebase 会编辑所有被 rebase 的提交,因为 base 变了,提交 SHA 都会变。

@rsp4jack
Copy link
Collaborator Author

rsp4jack commented Feb 5, 2024

@Z1Turn0 在仓库上执行:

git switch tex-works
git rev-parse tex-works
git reset --hard b81198d
git push --force-with-lease

以撤销你刚才的 force-push。

@rsp4jack
Copy link
Collaborator Author

rsp4jack commented Feb 5, 2024

分析了一下:

  1. 我提交 aa67b8e 更改了 rename 操作的 job 名称,随后 tex-works 被我 rebase 到 aa67b8e【表现为 bc29c9a(删除了原有的 PDF)的 parent 变为 aa67b8e
  2. 我提交 b835f47 strip 不需要的生成文件,随后我 push 了 ref/tex-works。在这之后我 amend commit ffc3f53,ref/tex-works 从 b835f47 被 force-pushed 到 ffc3f53
  3. @Z1Turn0 提交 316596a 以适配我的更改,随后 @Z1Turn0 push 了 ref/main。在这之后 @Z1Turn0 amend commit 21b2fc4,ref/main 从 316596a 被 force-pushed 到 21b2fc4
  4. 此时 ref/main 指向 21b2fc4,ref/tex-works 指向 ffc3f53
  5. @Z1Turn0 将 ref/tex-works(ffc3f53)rebase 到 ref/main(21b2fc4)上,从 bc29c9affc3f53 的这些提交被 rebase 命令修改,变成 37ff3235dbee2f
  6. @Z1Turn0 或许意识到了 rebase 别人的更改是不好的,于是回退操作,ref/tex-works 重新变回 ffc3f53。@Z1Turn0 尝试把他本地的 ref/main316596a)合并进 ref/tex-works(ffc3f53),得到合并提交 e6f1857!!! 这个 316596a 可不是真正的 main,见列表第 3 项。此时 tex-works 变成 e6f1857
  7. @Z1Turn0 把 origin/tex-works(!!!5dbee2f,见列表项 5)合并进了 tex-works(e6f1857),得到 548b4cf。然后 push,ref/tex-works 变成 548b4cf
  8. 随后 @Z1Turn0 意识到不对,撤销了列表项 5、6、7 的操作,把 21b2fc4(main) 合并进 ffc3f53(tex-works),得 b81198d。这一步完全正确,抵消了上面的错误操作。

@Z1Turn0 然后你干了什么???我不想再分析了。

@rsp4jack
Copy link
Collaborator Author

rsp4jack commented Feb 5, 2024

我刚才看了一下,你应该是对 merge 不满意,想 rebase。然后就这样了。

@rsp4jack rsp4jack added category: ci issues about CI treasure best luse labels Feb 5, 2024
@geihob
Copy link
Collaborator

geihob commented Feb 5, 2024

我刚才看了一下,你应该是对 merge 不满意,想 rebase。然后就这样了。

确实,后面再一次rebase只是想重现一下——

@rsp4jack
Copy link
Collaborator Author

rsp4jack commented Feb 5, 2024

Merge! 🎉 🚀

@rsp4jack rsp4jack merged commit 34d774d into main Feb 5, 2024
16 checks passed
@rsp4jack rsp4jack deleted the tex-works branch February 6, 2024 08:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category: ci issues about CI treasure best luse
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

自动生成和发布 PDF (from LaTeX)
3 participants