github
/
dev-sidecar
mirror of https://github.com/docmirror/dev-sidecar
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into develop

release-2.0.0.2
王良 2025-03-05 22:52:00 +08:00
parent 1e68ae5a8a fa06a0772e
commit a1767b1ae5
7 changed files with 83 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
.github/workflows/build-and-release.yml vendored
View File

@ -87,7 +87,7 @@ jobs:
restore-keys: | restore-keys: |
${{ runner.os }}-electron-builder-cache- ${{ runner.os }}-electron-builder-cache-
- name: "'pnpm install --force' Because we need to install optional dependencies" - name: "'pnpm install' Because we need to install optional dependencies"
run: | run: |
echo "======================================================================"; echo "======================================================================";
dir || ls -lah; dir || ls -lah;
@ -144,10 +144,15 @@ jobs:
cd packages/gui/dist_electron; cd packages/gui/dist_electron;
mv DevSidecar-${{ steps.package-info.outputs.version }}-amd64.deb DevSidecar-${{ steps.package-info.outputs.version }}-linux-amd64.deb; mv DevSidecar-${{ steps.package-info.outputs.version }}-amd64.deb DevSidecar-${{ steps.package-info.outputs.version }}-linux-amd64.deb;
mv DevSidecar-${{ steps.package-info.outputs.version }}-x86_64.AppImage DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.AppImage; mv DevSidecar-${{ steps.package-info.outputs.version }}-x86_64.AppImage DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.AppImage;
mv DevSidecar-${{ steps.package-info.outputs.version }}-x64.tar.gz DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz;
#-------------------------------------------------------------------------------------------------------------------------
mv DevSidecar-${{ steps.package-info.outputs.version }}-arm64.deb DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.deb; mv DevSidecar-${{ steps.package-info.outputs.version }}-arm64.deb DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.deb;
mv DevSidecar-${{ steps.package-info.outputs.version }}-arm64.AppImage DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.AppImage; mv DevSidecar-${{ steps.package-info.outputs.version }}-arm64.AppImage DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.AppImage;
mv DevSidecar-${{ steps.package-info.outputs.version }}-arm64.tar.gz DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.tar.gz;
#-------------------------------------------------------------------------------------------------------------------------
mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.deb DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.deb; mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.deb DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.deb;
mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.AppImage DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.AppImage; mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.AppImage DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.AppImage;
mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.tar.gz DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.tar.gz;
ls -lah; ls -lah;
- name: 'Rename artifacts - macOS' - name: 'Rename artifacts - macOS'
if: ${{ matrix.os == 'macos' }} if: ${{ matrix.os == 'macos' }}
@ -204,6 +209,14 @@ jobs:
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.AppImage path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.AppImage
name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.AppImage' name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.AppImage'
if-no-files-found: error if-no-files-found: error
- name: 'Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz'
uses: actions/upload-artifact@v4.4.0
if: ${{ matrix.os == 'ubuntu' }}
with:
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz
name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz'
if-no-files-found: error
#-------------------------------------------------------------------------------------------------------------------------
- name: 'Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.deb' - name: 'Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.deb'
uses: actions/upload-artifact@v4.4.0 uses: actions/upload-artifact@v4.4.0
if: ${{ matrix.os == 'ubuntu' }} if: ${{ matrix.os == 'ubuntu' }}
@ -218,6 +231,14 @@ jobs:
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.AppImage path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.AppImage
name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.AppImage' name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.AppImage'
if-no-files-found: error if-no-files-found: error
- name: 'Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.tar.gz'
uses: actions/upload-artifact@v4.4.0
if: ${{ matrix.os == 'ubuntu' }}
with:
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.tar.gz
name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.tar.gz'
if-no-files-found: error
#-------------------------------------------------------------------------------------------------------------------------
- name: 'Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.deb' - name: 'Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.deb'
uses: actions/upload-artifact@v4.4.0 uses: actions/upload-artifact@v4.4.0
if: ${{ matrix.os == 'ubuntu' }} if: ${{ matrix.os == 'ubuntu' }}
@ -232,6 +253,13 @@ jobs:
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.AppImage path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.AppImage
name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.AppImage' name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.AppImage'
if-no-files-found: error if-no-files-found: error
- name: 'Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.tar.gz'
uses: actions/upload-artifact@v4.4.0
if: ${{ matrix.os == 'ubuntu' }}
with:
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.tar.gz
name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.tar.gz'
if-no-files-found: error
#endregion Upload artifacts - Linux #endregion Upload artifacts - Linux
# Upload artifacts - macOS # Upload artifacts - macOS
@ -263,11 +291,6 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: needs:
- build-and-upload - build-and-upload
strategy:
fail-fast: false
matrix:
preReleaseVersion:
- ''
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4.1.7 uses: actions/checkout@v4.1.7
@ -313,6 +336,12 @@ jobs:
with: with:
name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.AppImage' name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.AppImage'
path: release path: release
- name: 'Download DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz'
uses: actions/download-artifact@v4.1.8
with:
name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz'
path: release
#-------------------------------------------------------------------------------------------------------------------------
- name: 'Download DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.deb' - name: 'Download DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.deb'
uses: actions/download-artifact@v4.1.8 uses: actions/download-artifact@v4.1.8
with: with:
@ -323,6 +352,12 @@ jobs:
with: with:
name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.AppImage' name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.AppImage'
path: release path: release
- name: 'Download DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.tar.gz'
uses: actions/download-artifact@v4.1.8
with:
name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.tar.gz'
path: release
#-------------------------------------------------------------------------------------------------------------------------
- name: 'Download DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.deb' - name: 'Download DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.deb'
uses: actions/download-artifact@v4.1.8 uses: actions/download-artifact@v4.1.8
with: with:
@ -333,6 +368,11 @@ jobs:
with: with:
name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.AppImage' name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.AppImage'
path: release path: release
- name: 'Download DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.tar.gz'
uses: actions/download-artifact@v4.1.8
with:
name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.tar.gz'
path: release
- name: 'Download DevSidecar-${{ steps.package-info.outputs.version }}-macos-x64.dmg' - name: 'Download DevSidecar-${{ steps.package-info.outputs.version }}-macos-x64.dmg'
uses: actions/download-artifact@v4.1.8 uses: actions/download-artifact@v4.1.8

30
.github/workflows/test-and-upload.yml vendored
View File

@ -94,7 +94,7 @@ jobs:
restore-keys: | restore-keys: |
${{ runner.os }}-electron-builder-cache- ${{ runner.os }}-electron-builder-cache-
- name: "'pnpm install --force' Because we need to install optional dependencies" - name: "'pnpm install' Because we need to install optional dependencies"
run: | run: |
echo "======================================================================"; echo "======================================================================";
dir || ls -lah; dir || ls -lah;
@ -151,10 +151,15 @@ jobs:
cd packages/gui/dist_electron; cd packages/gui/dist_electron;
mv DevSidecar-${{ steps.package-info.outputs.version }}-amd64.deb DevSidecar-${{ steps.package-info.outputs.version }}-linux-amd64.deb; mv DevSidecar-${{ steps.package-info.outputs.version }}-amd64.deb DevSidecar-${{ steps.package-info.outputs.version }}-linux-amd64.deb;
mv DevSidecar-${{ steps.package-info.outputs.version }}-x86_64.AppImage DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.AppImage; mv DevSidecar-${{ steps.package-info.outputs.version }}-x86_64.AppImage DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.AppImage;
mv DevSidecar-${{ steps.package-info.outputs.version }}-x64.tar.gz DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz;
#-------------------------------------------------------------------------------------------------------------------------
mv DevSidecar-${{ steps.package-info.outputs.version }}-arm64.deb DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.deb; mv DevSidecar-${{ steps.package-info.outputs.version }}-arm64.deb DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.deb;
mv DevSidecar-${{ steps.package-info.outputs.version }}-arm64.AppImage DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.AppImage; mv DevSidecar-${{ steps.package-info.outputs.version }}-arm64.AppImage DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.AppImage;
mv DevSidecar-${{ steps.package-info.outputs.version }}-arm64.tar.gz DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.tar.gz;
#-------------------------------------------------------------------------------------------------------------------------
mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.deb DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.deb; mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.deb DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.deb;
mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.AppImage DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.AppImage; mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.AppImage DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.AppImage;
mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.tar.gz DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.tar.gz;
ls -lah; ls -lah;
- name: 'Rename artifacts - macOS' - name: 'Rename artifacts - macOS'
if: ${{ matrix.os == 'macos' }} if: ${{ matrix.os == 'macos' }}
@ -211,6 +216,14 @@ jobs:
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.AppImage path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.AppImage
name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.AppImage' name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.AppImage'
if-no-files-found: error if-no-files-found: error
- name: 'Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz'
uses: actions/upload-artifact@v4.4.0
if: ${{ matrix.os == 'ubuntu' }}
with:
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz
name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz'
if-no-files-found: error
#-------------------------------------------------------------------------------------------------------------------------
- name: 'Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.deb' - name: 'Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.deb'
uses: actions/upload-artifact@v4.4.0 uses: actions/upload-artifact@v4.4.0
if: ${{ matrix.os == 'ubuntu' }} if: ${{ matrix.os == 'ubuntu' }}
@ -225,6 +238,14 @@ jobs:
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.AppImage path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.AppImage
name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.AppImage' name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.AppImage'
if-no-files-found: error if-no-files-found: error
- name: 'Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.tar.gz'
uses: actions/upload-artifact@v4.4.0
if: ${{ matrix.os == 'ubuntu' }}
with:
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.tar.gz
name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.tar.gz'
if-no-files-found: error
#-------------------------------------------------------------------------------------------------------------------------
- name: 'Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.deb' - name: 'Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.deb'
uses: actions/upload-artifact@v4.4.0 uses: actions/upload-artifact@v4.4.0
if: ${{ matrix.os == 'ubuntu' }} if: ${{ matrix.os == 'ubuntu' }}
@ -239,6 +260,13 @@ jobs:
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.AppImage path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.AppImage
name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.AppImage' name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.AppImage'
if-no-files-found: error if-no-files-found: error
- name: 'Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.tar.gz'
uses: actions/upload-artifact@v4.4.0
if: ${{ matrix.os == 'ubuntu' }}
with:
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.tar.gz
name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.tar.gz'
if-no-files-found: error
#endregion Upload artifacts - Linux #endregion Upload artifacts - Linux
# Upload artifacts - macOS # Upload artifacts - macOS

2
packages/cli/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@docmirror/dev-sidecar-cli", "name": "@docmirror/dev-sidecar-cli",
"version": "2.0.0-RC6", "version": "2.0.0",
"private": false, "private": false,
"description": "给开发者的加速代理工具", "description": "给开发者的加速代理工具",
"author": "docmirror.cn", "author": "docmirror.cn",

2
packages/core/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@docmirror/dev-sidecar", "name": "@docmirror/dev-sidecar",
"version": "2.0.0-RC6", "version": "2.0.0",
"private": false, "private": false,
"description": "给开发者的加速代理工具", "description": "给开发者的加速代理工具",
"author": "docmirror.cn", "author": "docmirror.cn",

2
packages/gui/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@docmirror/dev-sidecar-gui", "name": "@docmirror/dev-sidecar-gui",
"version": "2.0.0-RC6", "version": "2.0.0",
"private": false, "private": false,
"author": { "author": {
"email": "xiaojunnuo@qq.com", "email": "xiaojunnuo@qq.com",

4
packages/gui/vue.config.js
View File

@ -103,6 +103,10 @@ module.exports = defineConfig({
target: 'AppImage', target: 'AppImage',
arch: ['x64', 'arm64', 'armv7l'], arch: ['x64', 'arm64', 'armv7l'],
}, },
{
target: 'tar.gz',
arch: ['x64', 'arm64', 'armv7l'],
},
], ],
category: 'System', category: 'System',
}, },

2
packages/mitmproxy/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@docmirror/mitmproxy", "name": "@docmirror/mitmproxy",
"version": "2.0.0-RC6", "version": "2.0.0",
"private": false, "private": false,
"description": "", "description": "",
"author": "docmirror.cn", "author": "docmirror.cn",