Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/doocs/md
Browse files Browse the repository at this point in the history
  • Loading branch information
wll8 committed Nov 25, 2021
2 parents 69175a7 + c29c095 commit e4557ce
Show file tree
Hide file tree
Showing 8 changed files with 165 additions and 36 deletions.
12 changes: 1 addition & 11 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2.3.1
uses: actions/checkout@v2.4.0
with:
persist-credentials: false

Expand All @@ -20,17 +20,7 @@ jobs:
node-version: "12"
check-latest: true

- name: Cache node modules
uses: actions/cache@v2
id: cache
with:
path: node_modules
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-
- name: Install dependencies
if: steps.cache.outputs.cache-hit != 'true'
run: npm install

- name: Build
Expand Down
37 changes: 37 additions & 0 deletions .github/workflows/preview-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Preview Build

on:
pull_request:
types: [opened, synchronize, reopened]

jobs:
build-preview:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
with:
ref: ${{ github.event.pull_request.head.sha }}

- name: build
run: |
npm install
npm run build:h5-netlify
- name: upload dist artifact
uses: actions/upload-artifact@v2
with:
name: dist
path: dist
retention-days: 5

- name: save PR number
if: ${{ always() }}
run: echo ${{ github.event.number }} > ./pr-id.txt

- name: upload PR number
if: ${{ always() }}
uses: actions/upload-artifact@v2
with:
name: pr
path: ./pr-id.txt
89 changes: 89 additions & 0 deletions .github/workflows/preview-deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
name: Preview Deploy

on:
workflow_run:
workflows: ["Preview Build"]
types:
- completed

jobs:
success:
runs-on: ubuntu-latest
if: github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success'
steps:
- name: download PR artifact
uses: dawidd6/action-download-artifact@v2
with:
workflow: ${{ github.event.workflow_run.workflow_id }}
name: pr

- name: save PR id
id: pr
run: echo "::set-output name=id::$(<pr-id.txt)"

- name: download dist artifact
uses: dawidd6/action-download-artifact@v2
with:
workflow: ${{ github.event.workflow_run.workflow_id }}
workflow_conclusion: success
name: dist

- name: upload surge service
id: deploy
run: |
export DEPLOY_DOMAIN=https://doocs-md-preview-pr-${{ steps.pr.outputs.id }}.surge.sh
npx surge --project ./ --domain $DEPLOY_DOMAIN --token ${{ secrets.SURGE_TOKEN }}
- name: update status comment
uses: actions-cool/maintain-one-comment@v2
with:
token: ${{ secrets.GITHUB_TOKEN }}
body: |
🎊 PR Preview has been successfully built and deployed to https://doocs-md-preview-pr-${{ steps.pr.outputs.id }}.surge.sh
<img width="300" src="https://user-images.githubusercontent.com/507615/90250366-88233900-de6e-11ea-95a5-84f0762ffd39.png">
<!-- Sticky Pull Request Comment -->
body-include: '<!-- Sticky Pull Request Comment -->'
number: ${{ steps.pr.outputs.id }}

- name: The job failed
if: ${{ failure() }}
uses: actions-cool/maintain-one-comment@v2
with:
token: ${{ secrets.GITHUB_TOKEN }}
body: |
😭 Deploy PR Preview failed.
<img width="300" src="https://user-images.githubusercontent.com/507615/90250824-4e066700-de6f-11ea-8230-600ecc3d6a6b.png">
<!-- Sticky Pull Request Comment -->
body-include: '<!-- Sticky Pull Request Comment -->'
number: ${{ steps.pr.outputs.id }}

failed:
runs-on: ubuntu-latest
if: github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'failure'
steps:
- name: download PR artifact
uses: dawidd6/action-download-artifact@v2
with:
workflow: ${{ github.event.workflow_run.workflow_id }}
name: pr

- name: save PR id
id: pr
run: echo "::set-output name=id::$(<pr-id.txt)"

- name: The job failed
uses: actions-cool/maintain-one-comment@v2
with:
token: ${{ secrets.GITHUB_TOKEN }}
body: |
😭 Deploy PR Preview failed.
<img width="300" src="https://user-images.githubusercontent.com/507615/90250824-4e066700-de6f-11ea-8230-600ecc3d6a6b.png">
<!-- Sticky Pull Request Comment -->
body-include: '<!-- Sticky Pull Request Comment -->'
number: ${{ steps.pr.outputs.id }}
17 changes: 17 additions & 0 deletions .github/workflows/preview-start.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Preview Start

on: pull_request_target

jobs:
preview:
runs-on: ubuntu-latest
steps:
- name: create
uses: actions-cool/maintain-one-comment@v2
with:
token: ${{ secrets.GITHUB_TOKEN }}
body: |
⚡️ Deploying PR Preview...
<img src="https://user-images.githubusercontent.com/507615/90240294-8d2abd00-de5b-11ea-8140-4840a0b2d571.gif" width="300" />
<!-- Sticky Pull Request Comment -->
body-include: '<!-- Sticky Pull Request Comment -->'
20 changes: 0 additions & 20 deletions .github/workflows/preview.yml

This file was deleted.

4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,6 @@ yarn-error.log*
*.sw?

# mockm
httpData
httpData
public/upload/**
!public/upload/*.gitkeep
22 changes: 18 additions & 4 deletions mm.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,22 @@
* @type {import('mockm/@types/config').Config}
*/
module.exports = (util) => {
const port = 9000
return {
port,
api: {
'/upload'(req, res) {
res.json({
msg: `上传成功`,
url: util.libObj.mockjs.mock(`@image`),
async '/upload'(req, res) {
const multiparty = await util.toolObj.generate.initPackge(`multiparty`)
const form = new multiparty.Form({
uploadDir: `./public/upload/`,
})
form.parse(req, (err, fields = [], files) => {
const path = files.file[0].path.replace(/\\/g, `/`)
const url = `http://127.0.0.1:${port}/${path}`
res.json({
msg: `上传成功`,
url,
})
})
},
},
Expand All @@ -21,6 +31,10 @@ module.exports = (util) => {
{ // 测试 gitee/github 部署
fileDir: `./dist`,
path: `/md`,
},,
{ // 访问公共目录
fileDir: `./public`,
path: `/public`,
},
],
}
Expand Down
Empty file added public/upload/.gitkeep
Empty file.

0 comments on commit e4557ce

Please sign in to comment.