-
Notifications
You must be signed in to change notification settings - Fork 242
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
17 changed files
with
1,841 additions
and
200 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
name: Auto Merge Base to Other Branches | ||
|
||
on: | ||
push: | ||
branches: | ||
- base | ||
workflow_dispatch: # 手动触发 | ||
|
||
jobs: | ||
auto-merge: | ||
runs-on: ubuntu-latest | ||
steps: | ||
- name: Checkout repository | ||
uses: actions/checkout@v3 | ||
with: | ||
fetch-depth: 0 | ||
token: ${{ secrets.GH_TOKEN_AUTO_MERGE }} | ||
|
||
- name: Merge base into main | ||
run: | | ||
git config user.name "GitHub Actions" | ||
git config user.email "[email protected]" | ||
git checkout main | ||
git merge base --no-ff -m "Auto merge base into main" | ||
git push origin main | ||
- name: Merge base into i18n | ||
run: | | ||
git config user.name "GitHub Actions" | ||
git config user.email "[email protected]" | ||
git checkout i18n | ||
git merge base --no-ff -m "Auto merge base into i18n" | ||
git push origin i18n | ||
- name: Merge base into tabbar | ||
run: | | ||
git config user.name "GitHub Actions" | ||
git config user.email "[email protected]" | ||
git checkout tabbar | ||
git merge base --no-ff -m "Auto merge base into tabbar" | ||
git push origin tabbar |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,3 +7,6 @@ uni-pages.d.ts | |
# 插件生成的文件 | ||
src/pages.json | ||
src/manifest.json | ||
|
||
# 忽略自动生成文件 | ||
src/service/app/** |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
import type { GenerateServiceProps } from 'openapi-ts-request' | ||
|
||
export default [ | ||
{ | ||
schemaPath: 'http://petstore.swagger.io/v2/swagger.json', | ||
serversPath: './src/service/app', | ||
requestLibPath: `import { request } from '@/utils/http';\n import { CustomRequestOptions } from '@/interceptors/request';`, | ||
requestOptionsType: 'CustomRequestOptions', | ||
isGenJavaScript: false, | ||
}, | ||
] as GenerateServiceProps[] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.