From aa9d13530c1e0b1c66f8be368c58528ce5021785 Mon Sep 17 00:00:00 2001 From: MHuiG <616001163@qq.com> Date: Thu, 24 Nov 2022 11:13:21 +0800 Subject: [PATCH] up --- .github/ISSUE_TEMPLATE/zh-cn-1-help.yaml | 12 +++-- .github/workflows/release-please.yml | 2 + .github/workflows/sync-coding.yml | 56 +++++++----------------- 3 files changed, 25 insertions(+), 45 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/zh-cn-1-help.yaml b/.github/ISSUE_TEMPLATE/zh-cn-1-help.yaml index 8b5b0cd5b..d4596f512 100644 --- a/.github/ISSUE_TEMPLATE/zh-cn-1-help.yaml +++ b/.github/ISSUE_TEMPLATE/zh-cn-1-help.yaml @@ -16,12 +16,16 @@ body: - label: 已经搜索过,没有发现类似 issue。 - label: 已经搜索过[主题文档](https://volantis.js.org/),没有发现相关内容。 - label: 已经尝试使用过[最新版](https://github.com/volantis-x/hexo-theme-volantis/releases),问题依旧存在。 - - type: input + - type: dropdown id: theme-version attributes: label: 主题版本 - description: 请输入主题版本号(可在主题配置文件中找到)或主题的 Commit ID(主题目录下执行 `git log -1` 查看)。 - placeholder: "如: 5.0.0-alpha.9 或 abde57b" + description: 请选择您所使用的主题版本。 + options: + - 6.x + - 5.x + - 4.x + - Other validations: required: true - type: input @@ -82,4 +86,4 @@ body: ```

- \ No newline at end of file + diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index f4113c987..8fee048ab 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -13,6 +13,8 @@ jobs: with: release-type: node package-name: hexo-theme-volantis + include-v-in-tag: false + default-branch: dev npm-publish: if: ${{ contains(github.event.head_commit.message, 'chore(dev)') && contains(github.event.head_commit.message, 'release') && github.repository == 'volantis-x/hexo-theme-volantis' }} runs-on: ubuntu-latest diff --git a/.github/workflows/sync-coding.yml b/.github/workflows/sync-coding.yml index feb4a5aa7..76990cb92 100644 --- a/.github/workflows/sync-coding.yml +++ b/.github/workflows/sync-coding.yml @@ -2,52 +2,26 @@ name: Sync Coding on: push: - branches: - - main - - dev - # pull_request: - # branches: [ main ] release: - types: [ published ] + types: [published] jobs: - main: - if: github.ref == 'refs/heads/main' + sync: runs-on: ubuntu-latest steps: - name: Run Curl run: | - curl -u ${{ secrets.CODING_TOKEN_API }} \ - -v -X POST 'https://volantis-x.coding.net/api/cci/job/387490/trigger' \ - -H 'Content-Type: application/json' \ - -d ' - { - "envs": [ - { - "name": "BRANCH", - "value": "main", - "sensitive": 0 - } - ] - }' - dev: - if: github.ref == 'refs/heads/dev' - runs-on: ubuntu-latest - - steps: - - name: Run Curl - run: | - curl -u ${{ secrets.CODING_TOKEN_API }} \ - -v -X POST 'https://volantis-x.coding.net/api/cci/job/387490/trigger' \ - -H 'Content-Type: application/json' \ - -d ' - { - "envs": [ - { - "name": "BRANCH", - "value": "dev", - "sensitive": 0 - } - ] - }' + curl -u ${{ secrets.CODING_TOKEN_API }} \ + -v -X POST 'https://volantis-x.coding.net/api/cci/job/387490/trigger' \ + -H 'Content-Type: application/json' \ + -d ' + { + "envs": [ + { + "name": "BRANCH", + "value": "${{ github.ref_name }}", + "sensitive": 0 + } + ] + }'