From 15b8b7bd20d3bb76e933fd2426052c19a0c6ea56 Mon Sep 17 00:00:00 2001
From: yhliang <68215459+yhliang-aslp@users.noreply.github.com>
Date: 星期二, 18 四月 2023 19:19:48 +0800
Subject: [PATCH] Merge branch 'dev_lyh' into main
---
.github/workflows/main.yml | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0676775..2497ac2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -6,6 +6,7 @@
push:
branches:
- dev_wjm
+ - main
- dev_lyh
jobs:
@@ -21,14 +22,6 @@
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 jinja2 sphinx_rtd_theme myst-parser"
- - uses: ammaraskar/sphinx-action@master
- with:
- docs-folder: "docs_m2met2_cn/"
- pre-build-command: "pip install jinja2 sphinx_rtd_theme myst-parser"
- name: deploy copy
if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev_wjm' || github.ref == 'refs/heads/dev_lyh'
--
Gitblit v1.9.1