chore(merging): 'ci-refactor-build-flow' into 'main'

ci(gitlab-ci): 修复CI脚本复用问题

See merge request sysu-gitlab/thesis-template/better-thesis!8

Author: huangjj27

.gitlab/ci.yml

@@ -1,31 +1,37 @@
-image: rust
-variables:
-  CARGO_HOME: $CI_PROJECT_DIR/cargo
-
-cache:
-  paths:
-    - $CARGO_HOME
-
 stages:
     - check
     - release
 
-before_script:
-  - export PATH="$PATH:$CARGO_HOME/bin"
-  - cargo install typst-cli git-cliff sd
-
 # each merge request are required to ensure compiling the `.typ`s file successfully.
 check-merge-request:
   stage: check
+  image: rust
+  variables:
+    CARGO_HOME: $CI_PROJECT_DIR/cargo
+  cache:
+    paths:
+      - $CARGO_HOME
   rules:
     - if: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH
+  before_script:
+    - export PATH="$PATH:$CARGO_HOME/bin"
+    - cargo install typst-cli git-cliff sd
   script:
     - typst compile --root=$CI_PROJECT_DIR --font-path=$CI_PROJECT_DIR/fonts $CI_PROJECT_DIR/template/thesis.typ
 
 check-default-branch:
   stage: check
+  image: rust
+  variables:
+    CARGO_HOME: $CI_PROJECT_DIR/cargo
+  cache:
+    paths:
+      - $CARGO_HOME
   rules:
     - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
+  before_script:
+    - export PATH="$PATH:$CARGO_HOME/bin"
+    - cargo install typst-cli git-cliff sd
   script:
     - typst compile --root=$CI_PROJECT_DIR --font-path=$CI_PROJECT_DIR/fonts $CI_PROJECT_DIR/template/thesis.typ $CI_PROJECT_DIR/thesis_preview.pdf
   # TODO(#1): the preview pdf should be generated by template repo

.gitlab/merge_request_templates/release.md

@@ -16,6 +16,7 @@
 - [ ] 最后一个提交已更新 `CHANGELOG.md`:
     ```sh
     git cliff --unreleased --tag $BUMPED_VERSION --prepend CHANGELOG.md -- --newest
+    git add CHANGELOG.md
     ```
 - [ ] 最后一个提交的提交信息符合 `chore(release): $BUMPED_VERSION`
     ```sh

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.1.1-alpha.3] - 2024-05-17
+
+### ⚙️ Miscellaneous Tasks
+
+- *(gitlab-ci)* 修复CI脚本复用问题
+
 ## [0.1.1-alpha.2] - 2024-05-17
 
 ### 📚 Documentation

typst.toml

@@ -1,6 +1,6 @@
 [package]
 name = "morden-sysu-thesis"
-version = "0.1.1-alpha.2"
+version = "0.1.1-alpha.3"
 entrypoint = "lib.typ"
 repository = "https://gitlab.com/sysu-gitlab/thesis-template/better-thesis"
 authors = ["howardlau1999 <@howardlau1999>", "Sunny Huang <@huangjj27>"]