diff --git a/.github/workflows/deploy_doc.yml b/.github/workflows/deploy.yml similarity index 74% rename from .github/workflows/deploy_doc.yml rename to .github/workflows/deploy.yml index 52e35d2..e4f7628 100644 --- a/.github/workflows/deploy_doc.yml +++ b/.github/workflows/deploy.yml @@ -7,33 +7,36 @@ on: - main workflow_dispatch: +env: + node_version: "18" + python_version: "3.10" + deploy_script_version: "v0.0.4" + jobs: deploy: name: Deploy runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Set up Python runtime uses: actions/setup-python@v3 with: - python-version: 3.9 + python-version: "${{ env.python_version }}" - name: Install Python dependencies run: | pip install -r requirements.txt - uses: pnpm/action-setup@v2 - with: - version: latest - name: Set up Node.js - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: - node-version: 16 + node-version: "${{ env.node_version }}" cache: pnpm - name: Install Node dependencies @@ -66,6 +69,8 @@ jobs: key: ${{ secrets.SSH_PRIVATE_KEY }} port: ${{ secrets.SSH_PORT }} script: | - cd /var/docker-data/nginx/www - rm -rf wiki - git clone https://github.dup4.com/hznuoj-dev/wiki.git -b deploy-pages --depth=1 + bash <(curl -s -L https://raw-github.dup4.com/Dup4/bash-script-snippet/${{ env.deploy_script_version }}/deploy_gh_pages.sh) \ + -r hznuoj-dev/wiki \ + -d /var/docker-data/nginx/www \ + -b gh-pages \ + -p github.dup4.com diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml deleted file mode 100644 index 632598a..0000000 --- a/.github/workflows/lint.yml +++ /dev/null @@ -1,36 +0,0 @@ -# yaml-language-server: $schema=https://json-schema.org/draft-07/schema# -name: Lint - -on: - push: - branches: - - main - pull_request: - branches: - - main - -jobs: - build: - name: Lint documentation - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - - uses: pnpm/action-setup@v2 - with: - version: latest - - - name: Set up Node.js - uses: actions/setup-node@v2 - with: - node-version: 16 - cache: pnpm - - - name: Install Node dependencies - run: | - pnpm i - - - name: Lint - run: | - pnpm lint diff --git a/.github/workflows/build_doc.yml b/.github/workflows/test.yml similarity index 57% rename from .github/workflows/build_doc.yml rename to .github/workflows/test.yml index eeaaed1..702be81 100644 --- a/.github/workflows/build_doc.yml +++ b/.github/workflows/test.yml @@ -1,5 +1,5 @@ # yaml-language-server: $schema=https://json-schema.org/draft-07/schema# -name: Build Doc +name: Test on: push: @@ -10,53 +10,48 @@ on: - main workflow_dispatch: +env: + node_version: "18" + python_version: "3.10" + jobs: - build-doc: + test: name: Build documentation runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Set up Python runtime uses: actions/setup-python@v3 with: - python-version: 3.9 + python-version: "${{ env.python_version }}" - name: Install Python dependencies run: | pip install -r requirements.txt - uses: pnpm/action-setup@v2 - with: - version: latest - name: Set up Node.js - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: - node-version: 16 + node-version: "${{ env.node_version }}" cache: pnpm - name: Install Node dependencies run: | pnpm i + - name: Lint + run: | + pnpm lint + - name: Build env: GOOGLE_ANALYTICS_KEY: ${{ secrets.GOOGLE_ANALYTICS_KEY }} ENABLE_MATHJAX: false run: | pnpm build - - - name: Deploy to gh-pages - if: ${{ github.event_name != 'pull_request' }} - uses: peaceiris/actions-gh-pages@v3 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - publish_dir: site - force_orphan: true - user_name: "github-actions[bot]" - user_email: "github-actions[bot]@users.noreply.github.com" - commit_message: 🚀 Deploying to gh-pages @ ${{ env.GITHUB_SHA }} diff --git a/.vscode/settings.json b/.vscode/settings.json index 0adda76..6b4d5ff 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -12,6 +12,7 @@ "escapeall", "fontawesome", "hardbreak", + "HZNUOJ", "inlinehilite", "linenums", "magiclink", diff --git a/README.md b/README.md index b1dbe9e..9f39f04 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# HZNUOJ Develop Team Wiki +# HZNUOJ Development Team Wiki -[![Lint](https://github.com/hznuoj-dev/wiki/actions/workflows/lint.yml/badge.svg)](https://github.com/hznuoj-dev/wiki/actions/workflows/lint.yml) -[![Build Doc](https://github.com/hznuoj-dev/wiki/actions/workflows/build_doc.yml/badge.svg)](https://github.com/hznuoj-dev/wiki/actions/workflows/build_doc.yml) +[![Test](https://github.com/hznuoj-dev/wiki/actions/workflows/test.yml/badge.svg)](https://github.com/hznuoj-dev/wiki/actions/workflows/test.yml) +[![Deploy](https://github.com/hznuoj-dev/wiki/actions/workflows/deploy.yml/badge.svg)](https://github.com/hznuoj-dev/wiki/actions/workflows/deploy.yml) diff --git a/package.json b/package.json index 4817a53..57f683a 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,7 @@ { + "name": "hznuoj-wiki", "private": true, + "packageManager": "pnpm@8.15.0", "scripts": { "build": "bash build.sh", "dev": "mkdocs serve", @@ -8,6 +10,7 @@ }, "devDependencies": { "mkdocs-render-math-ssr": "^1.0.5", + "pnpm": "^8.15.0", "remark-cli": "^10.0.1", "remark-preset-lint-mkdocs-material": "^0.6.0" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c329305..fd4ff3f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8,6 +8,9 @@ devDependencies: mkdocs-render-math-ssr: specifier: ^1.0.5 version: 1.0.5 + pnpm: + specifier: ^8.15.0 + version: 8.15.0 remark-cli: specifier: ^10.0.1 version: 10.0.1 @@ -1381,6 +1384,12 @@ packages: engines: {node: '>=4'} dev: true + /pnpm@8.15.0: + resolution: {integrity: sha512-6kVRfVKF0SPqwCw3k1Bfof1tqQovxg0ejZ4MHpKSiG7Pr/UT8GK50cyAIbuGFQM7GsW+o7LuP8FlptcDS75rAw==} + engines: {node: '>=16.14'} + hasBin: true + dev: true + /prelude-ls@1.1.2: resolution: {integrity: sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=} engines: {node: '>= 0.8.0'}