From 729f0038423e8835cfeef550beb9fc641a5ed282 Mon Sep 17 00:00:00 2001 From: Sunny Date: Wed, 5 Mar 2025 12:29:18 +0800 Subject: [PATCH 1/6] =?UTF-8?q?ci(github):=20=E9=80=9A=E8=BF=87=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E6=9D=A1=E4=BB=B6=E5=B0=9D=E8=AF=95=E5=9C=A8PR?= =?UTF-8?q?=E4=B8=AD=E5=88=86=E6=9E=90=E6=B5=81=E6=B0=B4=E7=BA=BF=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E5=8E=9F=E5=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9eafa07..46b92ff 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,7 +2,7 @@ on: workflow_dispatch jobs: restore-tools: - if: github.ref_name == github.event.repository.default_branch + # if: github.ref_name == github.event.repository.default_branch runs-on: ubuntu-latest steps: - id: toolchain @@ -37,7 +37,7 @@ jobs: ~/.cargo/git/db/ bump-version: - if: github.ref_name == github.event.repository.default_branch + # if: github.ref_name == github.event.repository.default_branch runs-on: ubuntu-latest needs: - restore-tools @@ -106,7 +106,7 @@ jobs: run: git push origin publish2universe: - if: github.ref_name == github.event.repository.default_branch + # if: github.ref_name == github.event.repository.default_branch runs-on: ubuntu-latest needs: - bump-version @@ -148,6 +148,8 @@ jobs: persist-credentials: true path: sysu-packages + - run: ls + - name: switch new branch for Packages run: | cd ./sysu-packages/preview/modern-sysu-thesis From ca8d254f5cbc965146a47f3111ed62b9c83557d0 Mon Sep 17 00:00:00 2001 From: Sunny Date: Wed, 5 Mar 2025 12:53:55 +0800 Subject: [PATCH 2/6] ci(github): fix packages path --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 46b92ff..ca28bff 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -146,13 +146,13 @@ jobs: fetch-tags: true token: ${{ secrets.TYPST_PACKAGES_FORK_TOKEN }} persist-credentials: true - path: sysu-packages + path: sysu-fork - run: ls - name: switch new branch for Packages run: | - cd ./sysu-packages/preview/modern-sysu-thesis + cd ./sysu-fork/packages/preview/modern-sysu-thesis git switch main git switch -c $SEMVER From 0ef79d88e2e1037263cb233530900ec0d1daf80b Mon Sep 17 00:00:00 2001 From: Sunny Date: Wed, 5 Mar 2025 13:02:41 +0800 Subject: [PATCH 3/6] =?UTF-8?q?ci(github):=20=E8=BE=93=E5=87=BA=E5=90=84?= =?UTF-8?q?=E4=B8=AA=E6=AD=A5=E9=AA=A4=E4=B9=8B=E5=90=8E=E6=89=80=E5=9C=A8?= =?UTF-8?q?=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ca28bff..c29596e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -156,11 +156,15 @@ jobs: git switch main git switch -c $SEMVER + - run: ls + - name: create new version directory run: | mkdir $SEMVER cd $SEMVER + - run: ls + - name: Copy project files run: | cp $CI_PROJECT_DIR/LICENSE . @@ -175,6 +179,8 @@ jobs: cp -r $CI_PROJECT_DIR/specifications . cp -r $CI_PROJECT_DIR/template . + - run: ls + - name: Switch to preview import run: | sd '// #import "@preview/modern-sysu-thesis:' '#import "@preview/modern-sysu-thesis:' ./template/thesis.typ From 55485f6f005c25f7774d9d3b5fcc7ae660a44e40 Mon Sep 17 00:00:00 2001 From: Sunny Date: Thu, 6 Mar 2025 10:03:11 +0800 Subject: [PATCH 4/6] =?UTF-8?q?ci(github):=20=E9=85=8D=E7=BD=AE=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E7=9B=AE=E5=BD=95=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=91=BD?= =?UTF-8?q?=E4=BB=A4=E6=89=A7=E8=A1=8C=E5=B7=A5=E4=BD=9C=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c29596e..fcc1fa0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -148,24 +148,23 @@ jobs: persist-credentials: true path: sysu-fork - - run: ls + - name: Store MODERN_SYSU_THESIS + run: | + MODERN_SYSU_THESIS=./sysu-fork/packages/preview/modern-sysu-thesis + echo "MODERN_SYSU_THESIS=$MODERN_SYSU_THESIS" >> $GITHUB_ENV - name: switch new branch for Packages + working-directory: $MODERN_SYSU_THESIS run: | - cd ./sysu-fork/packages/preview/modern-sysu-thesis git switch main git switch -c $SEMVER - - run: ls - - name: create new version directory run: | mkdir $SEMVER - cd $SEMVER - - - run: ls - name: Copy project files + working-directory: $MODERN_SYSU_THESIS/$SEMVER run: | cp $CI_PROJECT_DIR/LICENSE . cp $CI_PROJECT_DIR/README.md . @@ -179,19 +178,20 @@ jobs: cp -r $CI_PROJECT_DIR/specifications . cp -r $CI_PROJECT_DIR/template . - - run: ls - - name: Switch to preview import + working-directory: $MODERN_SYSU_THESIS/$SEMVER run: | sd '// #import "@preview/modern-sysu-thesis:' '#import "@preview/modern-sysu-thesis:' ./template/thesis.typ sd '#import "/lib.typ":' '// #import "lib.typ":' ./template/thesis.typ - name: Configure triger user for git + working-directory: $MODERN_SYSU_THESIS/$SEMVER run: | git config user.name "${{ github.actor }}" git config user.email "${{ github.actor }}@users.noreply.github.com" - name: Commit to Packages + working-directory: $MODERN_SYSU_THESIS/$SEMVER run: | git status git add . From d1a605e4b7c636a917527e2911c69b22c94fed85 Mon Sep 17 00:00:00 2001 From: Sunny Date: Fri, 7 Mar 2025 18:44:56 +0800 Subject: [PATCH 5/6] =?UTF-8?q?ci(github):=20=E6=A3=80=E6=9F=A5=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E7=9B=AE=E5=BD=95=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 106 ++++++++++++++++++---------------- 1 file changed, 55 insertions(+), 51 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fcc1fa0..b7d7449 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -131,11 +131,10 @@ jobs: with: fetch-depth: 0 fetch-tags: true - path: better-thesis - name: Store CI_PROJECT_DIR run: | - CI_PROJECT_DIR="./better-thesis" + CI_PROJECT_DIR="${pwd}" echo "CI_PROJECT_DIR=$CI_PROJECT_DIR" >> $GITHUB_ENV - name: Checkout Packages fork @@ -148,52 +147,57 @@ jobs: persist-credentials: true path: sysu-fork - - name: Store MODERN_SYSU_THESIS - run: | - MODERN_SYSU_THESIS=./sysu-fork/packages/preview/modern-sysu-thesis - echo "MODERN_SYSU_THESIS=$MODERN_SYSU_THESIS" >> $GITHUB_ENV - - - name: switch new branch for Packages - working-directory: $MODERN_SYSU_THESIS - run: | - git switch main - git switch -c $SEMVER - - - name: create new version directory - run: | - mkdir $SEMVER - - - name: Copy project files - working-directory: $MODERN_SYSU_THESIS/$SEMVER - run: | - cp $CI_PROJECT_DIR/LICENSE . - cp $CI_PROJECT_DIR/README.md . - cp $CI_PROJECT_DIR/typst.toml . - cp $CI_PROJECT_DIR/thumbnail.png . - cp $CI_PROJECT_DIR/lib.typ . - cp -r $CI_PROJECT_DIR/assets . - cp -r $CI_PROJECT_DIR/layouts . - cp -r $CI_PROJECT_DIR/utils . - cp -r $CI_PROJECT_DIR/pages . - cp -r $CI_PROJECT_DIR/specifications . - cp -r $CI_PROJECT_DIR/template . - - - name: Switch to preview import - working-directory: $MODERN_SYSU_THESIS/$SEMVER - run: | - sd '// #import "@preview/modern-sysu-thesis:' '#import "@preview/modern-sysu-thesis:' ./template/thesis.typ - sd '#import "/lib.typ":' '// #import "lib.typ":' ./template/thesis.typ - - - name: Configure triger user for git - working-directory: $MODERN_SYSU_THESIS/$SEMVER - run: | - git config user.name "${{ github.actor }}" - git config user.email "${{ github.actor }}@users.noreply.github.com" - - - name: Commit to Packages - working-directory: $MODERN_SYSU_THESIS/$SEMVER - run: | - git status - git add . - git commit -m "chore(release):prepare for modern-sysu-thesis:$SEMVER" - git push --set-upstream origin $SEMVER + - name: Check current directory + run: | + pwd + ls + # - name: Store MODERN_SYSU_THESIS + # run: | + # MODERN_SYSU_THESIS="${pwd}/sysu-fork/packages/preview/modern-sysu-thesis" + # echo "MODERN_SYSU_THESIS=$MODERN_SYSU_THESIS" >> $GITHUB_ENV + + # - name: switch new branch for Packages + # working-directory: ${{ env.MODERN_SYSU_THESIS }} + # run: | + # git switch main + # git switch -c $SEMVER + + # - name: create new version directory + # working-directory: ${{ env.MODERN_SYSU_THESIS }} + # run: | + # mkdir $SEMVER + + # - name: Copy project files + # working-directory: ${{ env.MODERN_SYSU_THESIS }}/${{ env.SEMVER }} + # run: | + # cp $CI_PROJECT_DIR/LICENSE . + # cp $CI_PROJECT_DIR/README.md . + # cp $CI_PROJECT_DIR/typst.toml . + # cp $CI_PROJECT_DIR/thumbnail.png . + # cp $CI_PROJECT_DIR/lib.typ . + # cp -r $CI_PROJECT_DIR/assets . + # cp -r $CI_PROJECT_DIR/layouts . + # cp -r $CI_PROJECT_DIR/utils . + # cp -r $CI_PROJECT_DIR/pages . + # cp -r $CI_PROJECT_DIR/specifications . + # cp -r $CI_PROJECT_DIR/template . + + # - name: Switch to preview import + # working-directory: ${{ env.MODERN_SYSU_THESIS }}/${{ env.SEMVER }} + # run: | + # sd '// #import "@preview/modern-sysu-thesis:' '#import "@preview/modern-sysu-thesis:' ./template/thesis.typ + # sd '#import "/lib.typ":' '// #import "lib.typ":' ./template/thesis.typ + + # - name: Configure triger user for git + # working-directory: ${{ env.MODERN_SYSU_THESIS }} + # run: | + # git config user.name "${{ github.actor }}" + # git config user.email "${{ github.actor }}@users.noreply.github.com" + + # - name: Commit to Packages + # working-directory: ${{ env.MODERN_SYSU_THESIS }} + # run: | + # git status + # git add . + # git commit -m "chore(release):prepare for modern-sysu-thesis:$SEMVER" + # git push --set-upstream origin $SEMVER From a10ee04f7d8faa8fbfb5aed1e5f25840a59b90ab Mon Sep 17 00:00:00 2001 From: huangjj27 Date: Fri, 7 Mar 2025 10:51:05 +0000 Subject: [PATCH 6/6] chore(release):prepare for v0.4.1 --- CHANGELOG.md | 36 ++++++++++++++++++++++++++++++++++++ template/thesis.typ | 2 +- typst.toml | 2 +- 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e3f50e..92ac757 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,42 @@ All notable changes to this project will be documented in this file. +## [0.4.1] - 2025-03-07 + +### 📚 Documentation + +- *(README)* 更新链接指向 GitHub + +### ⚙️ Miscellaneous Tasks + +- *(github)* 检查当前目录情况 +- *(github)* 配置工作目录，修复命令执行工作目录错误问题 +- *(github)* 输出各个步骤之后所在目录 +- *(github)* Fix packages path +- *(github)* 通过更改条件尝试在PR中分析流水线失败原因 +- *(github)* 修复代码仓库检出错误 +- *(github)* 修复 release 分支设置 git 用户问题 +- *(github)* 仅在 default_branch 上运行 +- *(github)* 删去验证语义化标签，直接推送发布到 packages +- *(github)* 补充验证语义化版本标签流程 +- *(github)* 修复 CI TOKEN 权限，以便后续流程可以自动触发 +- *(github)* Configure git user for bump commit +- *(GitHub)* 删去 lfs 需求 +- *(github)* 尝试使用默认 token 来排除 token 问题 +- *(github)* 修复误传 GitLab CI 参数问题 +- *(github)* Fix jobs' needs +- *(github)* Fix tag fetching +- *(github)* 迁移 GitLab 发版前 bump 版本流程 +- *(github)* 流程文件重命名与文档优化 +- *(github)* 每次执行刷新缓存 +- *(github)* 修复多行命令问题 +- *(github)* 修复未检出代码导致流水线失败 +- *(github)* 修复缓存问题 +- *(github)* 删去不需要的矩阵代码 +- *(github)* 修复缓存 key 获取不正确问题 +- *(github)* 替换 toolchain 与缓存流程指令 +- *(github)* Add ci for pull requests to main branch + ## [0.4.0] - 2025-02-22 ### 🐛 Bug Fixes diff --git a/template/thesis.typ b/template/thesis.typ index ca77f86..7cb0f05 100644 --- a/template/thesis.typ +++ b/template/thesis.typ @@ -1,5 +1,5 @@ // 建议在正式编辑论文时，采用 typst.app 中的已发布版本模板 -// #import "@preview/modern-sysu-thesis:0.4.0": bachelor as thesis +// #import "@preview/modern-sysu-thesis:0.4.1": bachelor as thesis // 仅供开发调试使用 #import "/lib.typ": bachelor as thesis diff --git a/typst.toml b/typst.toml index 8d55beb..7950ce7 100644 --- a/typst.toml +++ b/typst.toml @@ -1,6 +1,6 @@ [package] name = "modern-sysu-thesis" -version = "0.4.0" +version = "0.4.1" entrypoint = "lib.typ" repository = "https://gitlab.com/sysu-gitlab/thesis-template/better-thesis" authors = ["howardlau1999 <@howardlau1999>", "Sunny Huang <@huangjj27>"]