Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/refactor/develop' into adapt-t…
Browse files Browse the repository at this point in the history
…o-unibuy
  • Loading branch information
hexqi committed Sep 3, 2024
2 parents 92e6c30 + 1ed870c commit 81149be
Show file tree
Hide file tree
Showing 146 changed files with 2,765 additions and 2,066 deletions.
23 changes: 23 additions & 0 deletions .github/auto-labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
version: v1

labels:
- label: 'enhancement'
sync: true
matcher:
title: '^feat:.*'
- label: 'document'
sync: true
matcher:
title: '^docs:.*'
- label: 'bug'
sync: true
matcher:
title: '^fix:.*'
- label: 'ospp-2024'
sync: true
matcher:
baseBranch: '^ospp-2024/.*'
- label: 'refactor-main'
sync: true
matcher:
baseBranch: 'refactor/develop'
19 changes: 19 additions & 0 deletions .github/workflows/auto-labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Pull Request Auto Labeler

on:
pull_request_target:
types: [opened, edited]

permissions:
# Setting up permissions in the workflow to limit the scope of what it can do. Optional!
contents: read # the config file
pull-requests: write # for labeling pull requests (on: pull_request_target or on: pull_request)

jobs:
label:
runs-on: ubuntu-latest
steps:
- uses: fuxingloh/multi-labeler@v4
with:
github-token: ${{ secrets.GITHUB_TOKEN }} # optional, default to '${{ github.token }}'
config-path: .github/auto-labeler.yml # optional, default to '.github/labeler.yml'
15 changes: 11 additions & 4 deletions .github/workflows/push-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@ jobs:

steps:
- uses: actions/checkout@v4
- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 9
- uses: actions/setup-node@v4
with:
node-version: 18

- name: Install pnpm
run: npm i -g pnpm

- name: Install dependencies
run: pnpm i
Expand All @@ -33,4 +34,10 @@ jobs:
- name: Run ESLint
run: npx eslint ${{steps.get_changed_files.outputs.all_changed_files}}
- name: Run Build
run: pnpm run build:plugin && pnpm run build:alpha
run: pnpm run build:plugin && pnpm run build:alpha > build-alpha.log 2>&1

- name: Upload build logs
uses: actions/upload-artifact@v4
with:
name: build-alpha-log
path: build-alpha.log
2 changes: 1 addition & 1 deletion designer-demo/env/.env.alpha
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# alpha mode, used by the "build:alpha" script

NODE_ENV=production
VITE_CDN_DOMAIN=https://npm.onmicrosoft.cn
VITE_CDN_DOMAIN=https://unpkg.com
VITE_LOCAL_IMPORT_MAPS=false
VITE_LOCAL_BUNDLE_DEPS=false
# VITE_ORIGIN=
Expand Down
2 changes: 1 addition & 1 deletion designer-demo/env/.env.production
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# prod mode, used by the "build:prod" script

NODE_ENV=production
VITE_CDN_DOMAIN=https://npm.onmicrosoft.cn
VITE_CDN_DOMAIN=https://unpkg.com
VITE_LOCAL_IMPORT_MAPS=false
VITE_LOCAL_BUNDLE_DEPS=false
#VITE_ORIGIN=
2 changes: 1 addition & 1 deletion designer-demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"scripts": {
"dev": "cross-env VITE_THEME=light vite",
"build:alpha": "cross-env NODE_OPTIONS=--max-old-space-size=8192 VITE_THEME=light vite build --mode alpha",
"build": "cross-env NODE_OPTIONS=--max-old-space-size=8192 VITE_THEME=light vite build --mode prod"
"build": "cross-env NODE_OPTIONS=--max-old-space-size=8192 VITE_THEME=light vite build"
},
"dependencies": {
"vue": "^3.4.21",
Expand Down
Loading

0 comments on commit 81149be

Please sign in to comment.