From cc604524f1f5a249b10fb599ec7713de9cfa7d4d Mon Sep 17 00:00:00 2001
From: yhliang <429259365@qq.com>
Date: 星期三, 12 四月 2023 14:42:13 +0800
Subject: [PATCH] fix workflow
---
/dev/null | 34 ----------------------------------
.github/workflows/main.yml | 12 ++++++++++--
2 files changed, 10 insertions(+), 36 deletions(-)
diff --git a/.github/workflows/m2met2.yml b/.github/workflows/m2met2.yml
deleted file mode 100644
index 435de59..0000000
--- a/.github/workflows/m2met2.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: "M2MET2.0 Pages"
-on:
- pull_request:
- branches:
- - main
- push:
- branches:
- - dev_lyh
-
-jobs:
- docs:
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v1
- - uses: ammaraskar/sphinx-action@master
- with:
- docs-folder: "docs_m2met2/"
- pre-build-command: "pip install sphinx-markdown-tables nbsphinx jinja2 recommonmark sphinx_rtd_theme"
-
- - name: deploy copy
- if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev_lyh'
- run: |
- mkdir public
- mkdir public/m2met2
- touch public/m2met2/.nojekyll
- cp -r docs_m2met2/_build/html/* public/m2met2/
-
- - name: deploy github.io pages
- if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev_lyh'
- uses: peaceiris/actions-gh-pages@v2.3.1
- env:
- GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
- PUBLISH_BRANCH: gh-pages
- PUBLISH_DIR: public
\ No newline at end of file
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 43d1f1d..0ebb9bb 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -6,6 +6,7 @@
push:
branches:
- dev_wjm
+ - dev_lyh
jobs:
docs:
@@ -20,9 +21,13 @@
with:
docs-folder: "docs_cn/"
pre-build-command: "pip install sphinx-markdown-tables nbsphinx jinja2 recommonmark sphinx_rtd_theme"
+ - uses: ammaraskar/sphinx-action@master
+ with:
+ docs-folder: "docs_m2met2/"
+ pre-build-command: "pip install sphinx-markdown-tables nbsphinx jinja2 recommonmark sphinx_rtd_theme"
- name: deploy copy
- if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev_wjm'
+ if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev_wjm' || github.ref == 'refs/heads/dev_lyh'
run: |
mkdir public
touch public/.nojekyll
@@ -32,9 +37,12 @@
mkdir public/cn
touch public/cn/.nojekyll
cp -r docs_cn/_build/html/* public/cn/
+ mkdir public/m2met2
+ touch public/m2met2/.nojekyll
+ cp -r docs_m2met2/_build/html/* public/m2met2/
- name: deploy github.io pages
- if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev_wjm'
+ if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev_wjm' || github.ref == 'refs/heads/dev_lyh'
uses: peaceiris/actions-gh-pages@v2.3.1
env:
GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
--
Gitblit v1.9.1